[Pkg-mediawiki-commits] r496 - mediawiki/trunk/debian mediawiki/trunk/debian/source mediawiki-extensions/trunk/debian

Thorsten Glaser tg at moszumanska.debian.org
Tue Dec 31 11:09:48 UTC 2013 

Author: tg
Date: 2013-12-31 11:09:48 +0000 (Tue, 31 Dec 2013)
New Revision: 496

Added:
   mediawiki/trunk/debian/upstream-signing-key.pgp
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/control
   mediawiki-extensions/trunk/debian/control.in
   mediawiki/trunk/debian/NEWS
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/control
   mediawiki/trunk/debian/mediawiki.lintian-overrides
   mediawiki/trunk/debian/rules
   mediawiki/trunk/debian/source/include-binaries
   mediawiki/trunk/debian/watch
Log:
address lintian concerns
?\226?\128?\162 Policy 3.9.5 (no changes)
?\226?\128?\162 override a conflicts-with-version as we cannot use Breaks here
  because this is due to a file overwrite conflict
?\226?\128?\162 check pgp signature in uscan
fix broken symlinks


Modified: mediawiki/trunk/debian/NEWS
===================================================================
--- mediawiki/trunk/debian/NEWS	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/NEWS	2013-12-31 11:09:48 UTC (rev 496)
@@ -1,4 +1,4 @@
-mediawiki (1:1.19.8+dfsg-2) UNRELEASED; urgency=low
+mediawiki (1:1.19.8+dfsg-2) unstable; urgency=low
 
   Debian MediaWiki packages have been updated for Apache 2.4 compatibility.
   Because of this change, you may need to re-activate configuration by

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/changelog	2013-12-31 11:09:48 UTC (rev 496)
@@ -12,8 +12,9 @@
   * Refresh patches against 1.19.9
   * Handle /var/lib/mediawiki/extensions/* always as symlinks, for
     both core and extra extensions, with upgrade path (Closes: #719208)
+  * Address updated lintian tags
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:37:38 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:56:21 +0100
 
 mediawiki (1:1.19.8+dfsg-2.2) unstable; urgency=high
 

Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/control	2013-12-31 11:09:48 UTC (rev 496)
@@ -7,7 +7,7 @@
  dh-buildinfo,
  ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-SVN: svn://anonscm.debian.org/pkg-mediawiki/mediawiki/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-mediawiki/mediawiki/trunk/
 

Modified: mediawiki/trunk/debian/mediawiki.lintian-overrides
===================================================================
--- mediawiki/trunk/debian/mediawiki.lintian-overrides	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/mediawiki.lintian-overrides	2013-12-31 11:09:48 UTC (rev 496)
@@ -4,6 +4,9 @@
 # this is ok, a Conflicts is not needed
 mediawiki: breaks-without-version mediawiki-extensions-fckeditor
 
+# this is a file conflict
+mediawiki: conflicts-with-version mediawiki-extensions-base (<< 3.5~)
+
 # it's a heavily patched version way too removed from
 # the one available in Debian
 mediawiki: embedded-javascript-library usr/share/mediawiki/resources/jquery/jquery.tablesorter.js

Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/rules	2013-12-31 11:09:48 UTC (rev 496)
@@ -43,12 +43,14 @@
 	sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
 			-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
 	# Move extensions
+	mkdir -p debian/mediawiki/usr/share/doc/mediawiki
 	mv debian/mediawiki/var/lib/mediawiki/extensions/README \
 	    debian/mediawiki/usr/share/doc/mediawiki/README.extensions
 	mv debian/mediawiki/var/lib/mediawiki/extensions \
 	    debian/mediawiki/usr/share/mediawiki/extensions-core
 	mkdir debian/mediawiki/var/lib/mediawiki/extensions
-	for coreextension in debian/mediawiki/usr/share/mediawiki/extensions-core/*; do \
+	coreextensions=$$(cd debian/mediawiki/usr/share/mediawiki/extensions-core; \
+	    echo *); for coreextension in $$coreextensions; do \
 		dh_link usr/share/mediawiki/extensions-core/"$$coreextension" \
 		    var/lib/mediawiki/extensions/"$$coreextension"; \
 	done

Modified: mediawiki/trunk/debian/source/include-binaries
===================================================================
--- mediawiki/trunk/debian/source/include-binaries	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/source/include-binaries	2013-12-31 11:09:48 UTC (rev 496)
@@ -2,3 +2,4 @@
 debian/cc-by-nc-sa.png
 debian/cc-by-sa.png
 debian/cc-by.png
+debian/upstream-signing-key.pgp

Added: mediawiki/trunk/debian/upstream-signing-key.pgp
===================================================================
(Binary files differ)


Property changes on: mediawiki/trunk/debian/upstream-signing-key.pgp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: mediawiki/trunk/debian/watch
===================================================================
--- mediawiki/trunk/debian/watch	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki/trunk/debian/watch	2013-12-31 11:09:48 UTC (rev 496)
@@ -1,4 +1,4 @@
 version=3
 
-opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//" \
+opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
 http://dumps.wikimedia.org/mediawiki/1.19/ mediawiki-([0-9.]*).tar.gz

Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki-extensions/trunk/debian/changelog	2013-12-31 11:09:48 UTC (rev 496)
@@ -3,8 +3,9 @@
   * Remove old (harmful) mediawiki-extensions postrm in
     new mediawiki-extensions-base preinst (Closes: #698438)
   * Stop shipping extensions that moved to core in 1.19
+  * Policy 3.9.5 (no changes)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 10:43:14 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:44:58 +0100
 
 mediawiki-extensions (3.4) unstable; urgency=low
 

Modified: mediawiki-extensions/trunk/debian/control
===================================================================
--- mediawiki-extensions/trunk/debian/control	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki-extensions/trunk/debian/control	2013-12-31 11:09:48 UTC (rev 496)
@@ -8,7 +8,7 @@
  dh-buildinfo,
  quilt,
  patchutils (>= 0.2.25)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-SVN: svn://anonscm.debian.org/pkg-mediawiki/mediawiki-extensions/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-mediawiki/mediawiki-extensions/trunk/
 

Modified: mediawiki-extensions/trunk/debian/control.in
===================================================================
--- mediawiki-extensions/trunk/debian/control.in	2013-12-31 10:38:13 UTC (rev 495)
+++ mediawiki-extensions/trunk/debian/control.in	2013-12-31 11:09:48 UTC (rev 496)
@@ -4,7 +4,7 @@
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>, Thorsten Glaser <tg at mirbsd.de>
 Build-Depends: @cdbs@
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-SVN: svn://anonscm.debian.org/pkg-mediawiki/mediawiki-extensions/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-mediawiki/mediawiki-extensions/trunk/

More information about the Pkg-mediawiki-commits mailing list