[Pkg-mediawiki-commits] r450 - in mediawiki: tarballs trunk/debian trunk/debian/patches
Thorsten Glaser
tg at alioth.debian.org
Thu May 23 12:12:36 UTC 2013
Author: tg
Date: 2013-05-23 12:12:35 +0000 (Thu, 23 May 2013)
New Revision: 450
Added:
mediawiki/tarballs/mediawiki_1.19.7.orig.tar.xz
mediawiki/trunk/debian/cc-0.png
mediawiki/trunk/debian/cc-by-nc-sa.png
mediawiki/trunk/debian/cc-by-sa.png
mediawiki/trunk/debian/cc-by.png
Removed:
mediawiki/tarballs/mediawiki_1.19.7.orig.tar.gz
Modified:
mediawiki/trunk/debian/changelog
mediawiki/trunk/debian/copyright
mediawiki/trunk/debian/mediawiki.install
mediawiki/trunk/debian/patches/suppress_warnings.patch
mediawiki/trunk/debian/rules
mediawiki/trunk/debian/watch
Log:
prepare new upstream version
Deleted: mediawiki/tarballs/mediawiki_1.19.7.orig.tar.gz
===================================================================
(Binary files differ)
Added: mediawiki/tarballs/mediawiki_1.19.7.orig.tar.xz
===================================================================
(Binary files differ)
Property changes on: mediawiki/tarballs/mediawiki_1.19.7.orig.tar.xz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: mediawiki/trunk/debian/cc-0.png
===================================================================
(Binary files differ)
Property changes on: mediawiki/trunk/debian/cc-0.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: mediawiki/trunk/debian/cc-by-nc-sa.png
===================================================================
(Binary files differ)
Property changes on: mediawiki/trunk/debian/cc-by-nc-sa.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: mediawiki/trunk/debian/cc-by-sa.png
===================================================================
(Binary files differ)
Property changes on: mediawiki/trunk/debian/cc-by-sa.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: mediawiki/trunk/debian/cc-by.png
===================================================================
(Binary files differ)
Property changes on: mediawiki/trunk/debian/cc-by.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog 2013-05-23 10:53:21 UTC (rev 449)
+++ mediawiki/trunk/debian/changelog 2013-05-23 12:12:35 UTC (rev 450)
@@ -1,3 +1,12 @@
+mediawiki (1:1.19.7+dfsg-1) unstable; urgency=low
+
+ * New low-impact upstream security release
+ * Refresh patches
+ * Change watch file to track upstream LTS version
+ * Replace trademarked image files by self-drawn Free ones
+
+ -- Thorsten Glaser <tg at mirbsd.de> Thu, 23 May 2013 11:03:39 +0000
+
mediawiki (1:1.19.6-1) unstable; urgency=low
* New upstream security release (Closes: #706601):
Modified: mediawiki/trunk/debian/copyright
===================================================================
--- mediawiki/trunk/debian/copyright 2013-05-23 10:53:21 UTC (rev 449)
+++ mediawiki/trunk/debian/copyright 2013-05-23 12:12:35 UTC (rev 450)
@@ -1,7 +1,7 @@
This package was debianized by Marc Dequènes <Duck at DuckCorp.org> on
Fri, 31 Dec 2004 00:11:42 +0100.
-It was downloaded from http://wikipedia.sourceforge.net/
+It was downloaded from http://dumps.wikimedia.org/mediawiki/
Upstream Authors: Mediawiki Development Team <mediawiki-l at Wikimedia.org>
@@ -68,16 +68,36 @@
File button_S_italic.png is licensed under the public domain.
- Images found on the common skins icons images are licensed under
+ MediaWiki makes use of the Sajax Toolkit by modernmethod,
+ http://www.modernmethod.com/sajax/ which has the following license:
+
+ 'This work is licensed under the Creative Commons Attribution
+ License. To view a copy of this license, visit
+ http://creativecommons.org/licenses/by/2.0/ or send a letter
+ to Creative Commons, 559 Nathan Abbott Way,
+ Stanford, California 94305, USA.'
+
+ MediaWiki use Creative Commons license marks to points to their online
+ licenses. This content is trademarked and used under a specific license
+ available at http://creativecommons.org/policies#trademark
+ The restricted content is:
+ * skins/common/images/cc-0.png
+ * skins/common/images/cc-by-nc-sa.png
+ * skins/common/images/cc-by-sa.png
+ * skins/common/images/cc-by.png
+ These images have been removed from the +dfsg tarball and replaced by
+ Free versions drawn by Thorsten Glaser in xpaint, optimised with GIMP.
+
+ Images found on the common skins icons images are licensed under
GNU LGPL License.
-
+
Everything else is under the following copyright/license.
- Copyright (C) 2003-2004 Mediawiki Development Team
+ Copyright (C) 2003-2013 Mediawiki Development Team
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
+ the Free Software Foundation; version 2 or later.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -91,4 +111,3 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
Modified: mediawiki/trunk/debian/mediawiki.install
===================================================================
--- mediawiki/trunk/debian/mediawiki.install 2013-05-23 10:53:21 UTC (rev 449)
+++ mediawiki/trunk/debian/mediawiki.install 2013-05-23 12:12:35 UTC (rev 450)
@@ -1,3 +1,4 @@
+debian/cc-* usr/share/mediawiki/skins/common/images
debian/etc/* etc/mediawiki
*.php *.phtml includes index.php languages maintenance mw-config resources skins usr/share/mediawiki
cache extensions images var/lib/mediawiki
Modified: mediawiki/trunk/debian/patches/suppress_warnings.patch
===================================================================
--- mediawiki/trunk/debian/patches/suppress_warnings.patch 2013-05-23 10:53:21 UTC (rev 449)
+++ mediawiki/trunk/debian/patches/suppress_warnings.patch 2013-05-23 12:12:35 UTC (rev 450)
@@ -2,9 +2,9 @@
Suppress warnings from being run within FusionForge’s gforge-plugin-mediawiki
---- mediawiki-1.19.6.orig/includes/GlobalFunctions.php
-+++ mediawiki-1.19.6/includes/GlobalFunctions.php
-@@ -2199,7 +2199,9 @@
+--- a/includes/GlobalFunctions.php
++++ b/includes/GlobalFunctions.php
+@@ -2199,7 +2199,9 @@ function wfNegotiateType( $cprefs, $spre
*
* @param $end Bool
*/
@@ -14,7 +14,7 @@
static $suppressCount = 0;
static $originalLevel = false;
-@@ -2208,6 +2210,7 @@
+@@ -2208,6 +2210,7 @@ function wfSuppressWarnings( $end = fals
--$suppressCount;
if ( !$suppressCount ) {
error_reporting( $originalLevel );
@@ -22,7 +22,7 @@
}
}
} else {
-@@ -2220,6 +2223,7 @@
+@@ -2220,6 +2223,7 @@ function wfSuppressWarnings( $end = fals
define( 'E_USER_DEPRECATED', 16384 );
}
$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED | E_USER_DEPRECATED | E_STRICT ) );
@@ -30,7 +30,7 @@
}
++$suppressCount;
}
-@@ -3374,7 +3378,7 @@
+@@ -3374,7 +3378,7 @@ function wfSetupSession( $sessionId = fa
wfFixSessionID();
}
wfSuppressWarnings();
Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules 2013-05-23 10:53:21 UTC (rev 449)
+++ mediawiki/trunk/debian/rules 2013-05-23 12:12:35 UTC (rev 450)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
-DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_VERSION:=$(shell dpkg-parsechangelog -n1 | sed -n '/^Version: /s///p')
+DEB_NOEPOCH_VERSION:=$(shell DEB_VERSION=${DEB_VERSION}; echo $${DEB_VERSION\#*:})
+DEB_UPSTREAM_VERSION:=$(shell DEB_NOEPOCH_VERSION=${DEB_NOEPOCH_VERSION}; echo $${DEB_NOEPOCH_VERSION%+dfsg-*})
override_dh_install:
dh_install
@@ -47,5 +47,22 @@
find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".gitignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
dh_installdeb
+# DevRef §6.7.8.2.
+.PHONY: get-orig-source
+get-orig-source:
+ mksh -o pipefail -e -x -c 'DEB_UPSTREAM_VERSION=${DEB_UPSTREAM_VERSION}; \
+ rm -rf debian/tmp; mkdir debian/tmp; cd debian/tmp; \
+ [[ -s ../../../mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz ]] && \
+ ln -s ../../../mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz || \
+ wget http://dumps.wikimedia.org/mediawiki/$${DEB_UPSTREAM_VERSION%.*}/mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz; \
+ paxtar xzf mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz; \
+ rm -f mediawiki-${DEB_UPSTREAM_VERSION}/skins/common/images/cc-*; \
+ mv mediawiki-${DEB_UPSTREAM_VERSION} mediawiki-${DEB_UPSTREAM_VERSION}.orig; \
+ find mediawiki-${DEB_UPSTREAM_VERSION}.orig -type f | \
+ sort | paxcpio -oC512 -Hustar -Mdist | \
+ xz -6e >../mediawiki_${DEB_UPSTREAM_VERSION}.orig.tar.xz; \
+ cd ..; rm -rf tmp'
+ @ls -l debian/mediawiki_${DEB_UPSTREAM_VERSION}.orig.tar.xz
+
%:
dh $@
Modified: mediawiki/trunk/debian/watch
===================================================================
--- mediawiki/trunk/debian/watch 2013-05-23 10:53:21 UTC (rev 449)
+++ mediawiki/trunk/debian/watch 2013-05-23 12:12:35 UTC (rev 450)
@@ -1,6 +1,4 @@
-# Compulsory line, this is a version 3 file
version=3
-opts="dversionmangle=s/^[0-9]+://" \
-http://www.mediawiki.org/wiki/Download http://download.wikimedia.org/mediawiki/.*/mediawiki-(.*).tar.gz
-
+opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//" \
+http://dumps.wikimedia.org/mediawiki/1.19/ mediawiki-([0-9.]*).tar.gz
More information about the Pkg-mediawiki-commits
mailing list