[Pkg-mediawiki-commits] r472 - mediawiki/trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2013-09-04 15:23:12 +0000 (Wed, 04 Sep 2013)
New Revision: 472

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/copyright
Log:
update licence information for several files

References the thread at <E1V6qFX-0003Ap-LE at franck.debian.org>


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-04 15:03:08 UTC (rev 471)
+++ mediawiki/trunk/debian/changelog	2013-09-04 15:23:12 UTC (rev 472)
@@ -7,8 +7,9 @@
   * Secure the default images directory (Closes: #716884)
   * Allow PDF upload (Closes: #716957)
   * Nuke ref to ENOENT dir (Closes: #705107)
+  * Update debian/copyright information
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 04 Sep 2013 17:02:21 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 04 Sep 2013 17:22:26 +0200
 
 mediawiki (1:1.19.7+dfsg-1) unstable; urgency=low
 

Modified: mediawiki/trunk/debian/copyright
===================================================================
--- mediawiki/trunk/debian/copyright	2013-09-04 15:03:08 UTC (rev 471)
+++ mediawiki/trunk/debian/copyright	2013-09-04 15:23:12 UTC (rev 472)
@@ -66,8 +66,23 @@
 // |   client logic under 2-clause BSD license.                                |
 // +---------------------------------------------------------------------------+
 
-   File button_S_italic.png is licensed under the public domain.
+   File includes/libs/CSSMin.php is under the Apache License, Version 2.0,
+   which can be found in /usr/share/common-licenses/Apache-2.0 on Debian
+   systems, and is compatible with the GNU GPLv3.
+   WARNING: This makes MediaWiki “net” GNU GPLv3 or later!
 
+   Files includes/libs/IEContentAnalyzer.php and IEUrlExtension.php were
+   written by Tim Starling who permits any OSI approved licence to be used
+   for them: http://www.mediawiki.org/wiki/User:Tim_Starling
+
+   File includes/libs/JavaScriptMinifier.php is available under any of
+   the Apache, MIT, GPL, LGPL licences.
+
+   File includes/libs/jsminplus.php is available under the MPL 1.1 or
+   the GNU GPLv2 or later or LGPLv2.1 or later.
+
+   File button_S_italic.png is in the public domain.
+
    MediaWiki makes use of the Sajax Toolkit by modernmethod,
    http://www.modernmethod.com/sajax/ which has the following license: