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

[Thorsten Glaser]

Author: tg
Date: 2014-02-28 17:49:48 +0000 (Fri, 28 Feb 2014)
New Revision: 519

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/rules
Log:
lintian 1, upstream 0

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2014-02-28 17:36:00 UTC (rev 518)
+++ mediawiki/trunk/debian/changelog	2014-02-28 17:49:48 UTC (rev 519)
@@ -12,8 +12,9 @@
   * New upstream security fix release:
     - (bug 60771) disallow iframe and unusual namespaces in SVG
     - (bug 61346) make token comparison use constant time
+  * Fix stuff lintian pointed out (thanks)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 28 Feb 2014 18:33:48 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 28 Feb 2014 18:49:08 +0100
 
 mediawiki (1:1.19.11+dfsg-1) unstable; urgency=medium
 

Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules	2014-02-28 17:36:00 UTC (rev 518)
+++ mediawiki/trunk/debian/rules	2014-02-28 17:49:48 UTC (rev 519)
@@ -31,14 +31,6 @@
 	done
 	# Remove Makefiles
 	find debian/mediawiki/ -iname makefile -exec rm {} \;
-	# License added to copyright file:
-	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
-	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/cyrl/LICENSE
-	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/ksh/LICENSE
-	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/COPYING
-	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/LICENSE
-	rm -f debian/mediawiki/var/lib/mediawiki/extensions/ParserFunctions/COPYING
-	rm -f debian/mediawiki/var/lib/mediawiki/extensions/Nuke/COPYING
 	# Put debian version for mediawiki version..
 	sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
 			-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
@@ -56,6 +48,19 @@
 	done
 	# includes/libs is provided by mediawiki-classes
 	rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs
+	# licences added to debian/copyright file
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/Gadgets/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/Nuke/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/ParserFunctions/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/Renameuser/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/WikiEditor/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/LICENSE
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/cyrl/LICENSE
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/ksh/LICENSE
+	# fixup permissions
+	chmod a-x debian/mediawiki/usr/share/mediawiki/extensions-core/Nuke/Nuke*.php
 
 override_dh_installdeb:
 	find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".gitignore" -o -name ".arch-ids" \) -exec rm -rf {} \;