[Pkg-mediawiki-devel] unblock: mediawiki-extensions/2.9, mediawiki/1:1.19.2-2

Thorsten Glaser t.glaser at tarent.de
Tue Oct 2 12:38:08 UTC 2012


Dear Release Team,

please extend the courtesy to unblock the MediaWiki packages
to today’s uploads: mediawiki-extensions/2.9, mediawiki/1:1.19.2-2

The reason behind this is the removal of the FCKeditor extension
which works only up to and including MediaWiki 1.17 and has been
deprecated by the Wikimedia Foundation in favour of another, not
yet packaged, extension (see #689375 for the full details). We
would like to have this, now non-working, extension removed from
src:mediawiki-extensions and broken by mediawiki, in wheezy too,
and have added appropriate NEWS entries.

Furthermore, there’s a small fix for the Collection extension
regarding downloading the generated PDFs from the "PDF Export"
link and for Wikibooks in PDF format, which was broken depending
on the version or configuration of the render server (affecting
one of two possible codepaths). This basically inlines a bit of
code from two “convenience wrapper” functions in order to access
the HTTP Response headers.

The debdiffs (attached) are relatively short (I have represented
file removals as comment in the top instead of including their
full diff):

mediawiki:
- add NEWS entry, break any version of mediawiki-extensions-fckeditor
- adjust debian/watch file for DDPO vs. uscan behaviour difference:
  patch (dversionmangle) away the epoch, which DDPO doesn’t like,
  as done for src:cvs

mediawiki-extensions:
- remove all files related to the FCKeditor extension
- add NEWS entry
- remove debian/{control{,.in},copyright,patches/series,rules}
  entries related to the FCKeditor extension
- debian/patches/fix_collection.patch: add fix for downloading
  generated PDFs
- remove svn-revisions entries related to the FCKeditor extension

Thanks in advance,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-314
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Boris Esser, Sebastian Mancke
-------------- next part --------------
deleted:
- mediawiki-extensions-2.8/debian/mediawiki-extensions-fckeditor.links
- mediawiki-extensions-2.8/debian/patches/fix_fckeditor.patch
- mediawiki-extensions-2.8/dist/mediawiki-extensions-fckeditor/

--- mediawiki-extensions-2.8/debian/NEWS	1970-01-01 01:00:00.000000000 +0100
+++ mediawiki-extensions-2.9/debian/NEWS	2012-10-02 14:09:51.000000000 +0200
@@ -0,0 +1,11 @@
+mediawiki-extensions (2.9) unstable; urgency=low
+
+  The mediawiki-extensions-fckeditor package has been
+  deprecated by the Wikimedia foundation and is thus
+  no longer included in the packaging, so if your wikis
+  have been using this extension, please remove it from
+  their configuration to avoid breakage. This can be
+  done using "sudo mwdisext FCKeditor.php" if installed
+  from Debian packaging.
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 14:09:42 +0200
--- mediawiki-extensions-2.8/debian/changelog	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-extensions-2.9/debian/changelog	2012-10-02 14:09:51.000000000 +0200
@@ -1,3 +1,10 @@
+mediawiki-extensions (2.9) unstable; urgency=low
+
+  * Collection: fix downloading generated PDFs from the render server
+  * FCKeditor: remove, no longer works with MW 1.19 (Closes: #689375)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 14:09:42 +0200
+
 mediawiki-extensions (2.8) unstable; urgency=low
 
   * Remove dependency of mw-ext-collection on various ECMAscript
--- mediawiki-extensions-2.8/debian/control	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-extensions-2.9/debian/control	2012-10-02 12:13:31.000000000 +0200
@@ -91,17 +91,6 @@
  This extension is set for the Debian mediawiki
  package, but it may also be used separately.
 
-Package: mediawiki-extensions-fckeditor
-Architecture: all
-Depends: ${misc:Depends}, mediawiki-extensions-base,
- fckeditor
-Description: Extensions for MediaWiki -- FCKeditor extension
- This package provides the mediawiki extensions for
- FCKeditor wysiwyg editor.
- .
- This extension is set for the Debian mediawiki
- package, but it may also be used separately.
-
 Package: mediawiki-extensions-collection
 Architecture: all
 Depends: ${misc:Depends}, mediawiki-extensions-base, php5-curl
@@ -130,7 +119,6 @@
  mediawiki-extensions-ldapauth,
  mediawiki-extensions-openid,
  mediawiki-extensions-confirmedit,
- mediawiki-extensions-fckeditor,
  mediawiki-extensions-collection,
  mediawiki-extensions-graphviz,
  ${misc:Depends}
--- mediawiki-extensions-2.8/debian/control.in	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-extensions-2.9/debian/control.in	2012-10-02 12:13:31.000000000 +0200
@@ -91,17 +91,6 @@
  This extension is set for the Debian mediawiki
  package, but it may also be used separately.
 
-Package: mediawiki-extensions-fckeditor
-Architecture: all
-Depends: ${misc:Depends}, mediawiki-extensions-base,
- fckeditor
-Description: Extensions for MediaWiki -- FCKeditor extension
- This package provides the mediawiki extensions for
- FCKeditor wysiwyg editor.
- .
- This extension is set for the Debian mediawiki
- package, but it may also be used separately.
-
 Package: mediawiki-extensions-collection
 Architecture: all
 Depends: ${misc:Depends}, mediawiki-extensions-base, php5-curl
@@ -130,7 +119,6 @@
  mediawiki-extensions-ldapauth,
  mediawiki-extensions-openid,
  mediawiki-extensions-confirmedit,
- mediawiki-extensions-fckeditor,
  mediawiki-extensions-collection,
  mediawiki-extensions-graphviz,
  ${misc:Depends}
--- mediawiki-extensions-2.8/debian/copyright	2011-04-12 15:16:51.000000000 +0200
+++ mediawiki-extensions-2.9/debian/copyright	2012-10-02 12:13:31.000000000 +0200
@@ -7,7 +7,6 @@
 It was downloaded from
 <http://meta.wikimedia.org/wiki/Category:Mediawiki_Extensions> and
 <http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/>.
-<http://svn.fckeditor.net/MediaWiki/trunk>
 
 Upstream Author: Mediawiki Maintenance Team
                  <pkg-mediawiki-devel at lists.alioth.debian.org>
@@ -43,8 +42,6 @@
 ExtensionFunctions is Copyright 2007 Mediawiki Development Team <mediawiki-l at Wikimedia.org>.
 This file is a part of the mediawiki software.
 
-FCKeditor was written by the Wikimedia user Mafs.
-
 OpenID is: Copyright 2006,2007 Internet Brands (http://www.internetbrands.com/)
            Copyright 2007,2008 Evan Prodromou <evan at prodromou.name>
 
@@ -106,10 +103,6 @@
 Poem is released under the following terms: "Anyone is allowed to use
 this code for any purpose."
 
-FCKeditor is GNU Lesser General Public License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-GNU Lesser General Public License can be found in '/usr/share/common-licenses/LGPL-2.1'.
-
 ImageMap is available under any OSI certified Open Source Licence,
 at the option of the licensee. Preferred choices include the GNU
 GPL, any version, dual-licenced with one of the less restrictive
--- mediawiki-extensions-2.8/debian/patches/fix_collection.patch	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-extensions-2.9/debian/patches/fix_collection.patch	2012-10-02 12:03:58.000000000 +0200
@@ -1,8 +1,9 @@
-$Id: fix_collection.patch 379 2012-09-20 11:45:26Z tg $
+$Id: fix_collection.patch 383 2012-10-02 10:03:58Z tg $
 
 Fix Collection extension:
 • Invalid XHTML nesting
 • Empty ul element
+• Fix downloading generated PDFs
 
 --- a/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
 +++ b/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
@@ -60,3 +61,45 @@
  
  </div>
  
+--- a/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.body.php
++++ b/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.body.php
+@@ -1092,13 +1092,34 @@ class SpecialCollection extends SpecialP
+ 			$content_length = $r['content_length'];
+ 			$content_disposition = $r['content_disposition'];
+ 		} else {
+-			$info = self::mwServeCommand( 'download', array(
++			global $wgCollectionMWServeURL, $wgCollectionFormatToServeURL, $wgCollectionMWServeCredentials;
++
++			$args = array(
++				'command' => 'download',
+ 				'collection_id' => $wgRequest->getVal( 'collection_id' ),
+ 				'writer' => $wgRequest->getVal( 'writer' ),
+-			) );
+-			$content_type = $info['content_type'];
+-			$content_length = $info['download_content_length'];
+-			$content_disposition = null;
++			    );
++			$serveURL = $wgCollectionMWServeURL;
++			if ( array_key_exists( $args['writer'], $wgCollectionFormatToServeURL ) )
++				$serveURL = $wgCollectionFormatToServeURL[ $args['writer'] ];
++			if ( $wgCollectionMWServeCredentials ) {
++				$args['login_credentials'] = $wgCollectionMWServeCredentials;
++			}
++			$options = array(
++				'postData' => $args,
++				'method' => 'POST',
++				'timeout' => 'default',
++			    );
++			$req = MWHttpRequest::factory($serveURL, $options);
++			$status = $req->execute();
++			$result = $status->isOK() ? $req->getContent() : false;
++			if ($result) {
++				fwrite($tempfile, $result);
++				$info = true;
++			}
++			$content_type = $req->getResponseHeader('content-type');
++			$content_length = $req->getResponseHeader('content-length');
++			$content_disposition = $req->getResponseHeader('content-disposition');
+ 		}
+ 		if ( !$info ) {
+ 			$wgOut->showErrorPage( 'coll-download_notfound_title', 'coll-download_notfound_text' );
--- mediawiki-extensions-2.8/debian/patches/series	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-extensions-2.9/debian/patches/series	2012-10-02 12:13:31.000000000 +0200
@@ -1,7 +1,6 @@
 fix_472283.patch
 fix_collection.patch
 fix_createbox.patch
-fix_fckeditor.patch
 fix_footnote.patch
 fix_graphviz.patch
 fix_inputbox.patch
--- mediawiki-extensions-2.8/debian/rules	2010-08-12 12:42:53.000000000 +0200
+++ mediawiki-extensions-2.9/debian/rules	2012-10-02 12:13:31.000000000 +0200
@@ -26,8 +26,5 @@
 	dh_link -pmediawiki-extensions-base usr/share/man/man8/mwenext.8 usr/share/man/man8/mwdisext.8
 	chmod +x debian/mediawiki-extensions-base/usr/sbin/*
 
-binary-install/mediawiki-extensions-fckeditor::
-	dh_link -pmediawiki-extensions-fckeditor usr/share/fckeditor usr/share/mediawiki-extensions/fckeditor/fckeditor
-
 binary-install/mediawiki-extensions-confirmedit::
 	chmod +x debian/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/captcha.py
--- mediawiki-extensions-2.8/svn-revisions	2012-06-29 16:46:19.000000000 +0200
+++ mediawiki-extensions-2.9/svn-revisions	2012-10-02 12:13:31.000000000 +0200
@@ -1,39 +1,5 @@
 # svn-revisions, generated by check_version.pl
 # Format is: URL - name - package - basedir - link - revision
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.body.php - FCKeditor - fckeditor - usr/share - no - 3279
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.ar.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.de.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.en.php - FCKeditor - fckeditor - usr/share - no - 2388
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.es.php - FCKeditor - fckeditor - usr/share - no - 3235
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.fa.php - FCKeditor - fckeditor - usr/share - no - 2409
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.fr.php - FCKeditor - fckeditor - usr/share - no - 3237
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.gl.php - FCKeditor - fckeditor - usr/share - no - 3236
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.he.php - FCKeditor - fckeditor - usr/share - no - 3363
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.hsb.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.ko.php - FCKeditor - fckeditor - usr/share - no - 3366
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.nl.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.no.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.oc.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.pl.php - FCKeditor - fckeditor - usr/share - no - 2388
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.pms.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.pt.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.sk.php - FCKeditor - fckeditor - usr/share - no - 1833
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.sv.php - FCKeditor - fckeditor - usr/share - no - 3365
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.i18n.zh-tw.php - FCKeditor - fckeditor - usr/share - no - 3248
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.php - FCKeditor - fckeditor - usr/share - yes - 3217
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditor.popup.html - FCKeditor - fckeditor - usr/share - no - 2388
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditorEditPage.body.php - FCKeditor - fckeditor - usr/share - no - 5577
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditorParser.body.php - FCKeditor - fckeditor - usr/share - no - 3280
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditorParserOptions.body.php - FCKeditor - fckeditor - usr/share - no - 2077
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditorSajax.body.php - FCKeditor - fckeditor - usr/share - no - 3361
-http://svn.fckeditor.net/MediaWiki/trunk/FCKeditorSkin.body.php - FCKeditor - fckeditor - usr/share - no - 3224
-http://svn.fckeditor.net/MediaWiki/trunk/css/ - FCKeditor - fckeditor - usr/share - no - 3279
-http://svn.fckeditor.net/MediaWiki/trunk/fckeditor/ - none - none - none - no - -1
-http://svn.fckeditor.net/MediaWiki/trunk/fckeditor_config.js - FCKeditor - fckeditor - usr/share - no - 3277
-http://svn.fckeditor.net/MediaWiki/trunk/mw11/ - FCKeditor - fckeditor - usr/share - no - 3217
-http://svn.fckeditor.net/MediaWiki/trunk/mw12/ - FCKeditor - fckeditor - usr/share - no - 3241
-http://svn.fckeditor.net/MediaWiki/trunk/mw14/ - FCKeditor - fckeditor - usr/share - no - 3177
-http://svn.fckeditor.net/MediaWiki/trunk/plugins/ - FCKeditor - fckeditor - usr/share - no - 3366
 http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_16/extensions/ExtensionFunctions.php - extensions - base - usr/share - no - 41796
 http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/CategoryTree/CategoryPageSubclass.php - CategoryTree - base - usr/share - no - 113037
 http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/CategoryTree/CategoryTree.alias.php - CategoryTree - base - usr/share - no - 107294
-------------- next part --------------
--- mediawiki-1.19.2/debian/NEWS	2012-06-18 17:17:58.000000000 +0200
+++ mediawiki-1.19.2/debian/NEWS	2012-10-02 14:09:51.000000000 +0200
@@ -1,3 +1,15 @@
+mediawiki (1:1.19.2-2) unstable; urgency=low
+
+  The mediawiki-extensions-fckeditor package has been
+  deprecated by the Wikimedia foundation and will not
+  work with this version of MediaWiki. If your wikis
+  have been using this extension, please remove it from
+  their configuration to avoid breakage. This can be
+  done using "sudo mwdisext FCKeditor.php" if installed
+  from Debian packaging.
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 14:09:42 +0200
+
 mediawiki (1:1.19.1-1) unstable; urgency=low
 
   SQL structure changes are required for this release of mediawiki.
--- mediawiki-1.19.2/debian/changelog	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-1.19.2/debian/changelog	2012-10-02 14:09:51.000000000 +0200
@@ -1,3 +1,10 @@
+mediawiki (1:1.19.2-2) unstable; urgency=low
+
+  * debian/watch: mangle the epoch away so DDPO is green again
+  * Break mw-ext-fckeditor, it doesn’t work with 1.19 (Closes: #689375)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 14:09:42 +0200
+
 mediawiki (1:1.19.2-1) unstable; urgency=low
 
   [ Thorsten Glaser ]
--- mediawiki-1.19.2/debian/control	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-1.19.2/debian/control	2012-10-02 12:13:31.000000000 +0200
@@ -22,7 +22,7 @@
  mediawiki-extensions-ldapauth (<< 2.8~),
  mediawiki-extensions-openid (<< 2.8~),
  mediawiki-extensions-confirmedit (<< 2.8~),
- mediawiki-extensions-fckeditor (<< 2.8~),
+ mediawiki-extensions-fckeditor,
  mediawiki-extensions-collection (<< 2.8~),
  mediawiki-extensions-graphviz (<< 2.8~),
  mediawiki-extensions (<< 2.8~)
--- mediawiki-1.19.2/debian/watch	2012-09-20 13:45:26.000000000 +0200
+++ mediawiki-1.19.2/debian/watch	2012-09-29 16:44:01.000000000 +0200
@@ -1,6 +1,6 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webserver directory
+opts="dversionmangle=s/^[0-9]+://" \
 http://www.mediawiki.org/wiki/Download http://download.wikimedia.org/mediawiki/.*/mediawiki-(.*).tar.gz
 


More information about the Pkg-mediawiki-devel mailing list