(no commit message)

[git.ikiwiki.info.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 5dacdc4bdc1e7f23a79ca39fbf97b96ab4c10322..bcd9642b6e54eee679bdc60c0544b0df950a6e3a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -98,7 +98,7 @@ License: GPL-2+
 
 Files: plugins/rst plugins/proxy.py plugins/pythondemo
 Copyright: © martin f. krafft <madduck@madduck.net>
 
 Files: plugins/rst plugins/proxy.py plugins/pythondemo
 Copyright: © martin f. krafft <madduck@madduck.net>

-License: GPL-2
+License: BSD-2-clause

 
 Files: IkiWiki/Plugin/calendar.pm
 Copyright: (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org>
 
 Files: IkiWiki/Plugin/calendar.pm
 Copyright: (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org>


@@ -203,10 +203,27 @@ Comment:
  From http://code.google.com/p/openid-selector/
 License: BSD-2-clause
 
  From http://code.google.com/p/openid-selector/
 License: BSD-2-clause
 

-Files: underlays/openid-selector/ikiwiki/openid/jquery.js
-Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
+Files: underlays/jquery/*
+Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
+           © 2011 The Dojo Foundation
+License: GPL-2
+
+Files: underlays/attachments/ikiwiki/jquery-ui*
+Copyright: © 2008 Paul Bakaus
+           © 2011 the jQuery UI Authors (http://jqueryui.com/about)

 License: GPL-2
 
 License: GPL-2
 

+Files: underlays/attachments/ikiwiki/jquery.tmpl.min.js
+Copyright: © Boris Moore
+License: GPL-2
+
+Files: underlays/attachments/ikiwiki/
+Copyright: 2010, 2011 Sebastian Tschan
+Comment:
+ blueimp / jQuery-File-Upload widget,
+ from https://github.com/blueimp/jQuery-File-Upload
+License: Expat
+

 Files: underlays/themes/blueview/style.css
 Copyright: © 2009,2010 Bernd Zeimetz
            © 2008 Yahoo! Inc.
 Files: underlays/themes/blueview/style.css
 Copyright: © 2009,2010 Bernd Zeimetz
            © 2008 Yahoo! Inc.