[Pkg-mediawiki-commits] r384 - mediawiki/trunk/debian mediawiki-extensions/trunk mediawiki-extensions/trunk/debian mediawiki-extensions/trunk/debian/patches mediawiki-extensions/trunk/dist

Thorsten Glaser tg at alioth.debian.org
Tue Oct 2 10:13:31 UTC 2012


Author: tg
Date: 2012-10-02 10:13:31 +0000 (Tue, 02 Oct 2012)
New Revision: 384

Added:
   mediawiki-extensions/trunk/debian/NEWS
Removed:
   mediawiki-extensions/trunk/debian/mediawiki-extensions-fckeditor.links
   mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch
   mediawiki-extensions/trunk/dist/mediawiki-extensions-fckeditor/
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/control
   mediawiki-extensions/trunk/debian/control.in
   mediawiki-extensions/trunk/debian/copyright
   mediawiki-extensions/trunk/debian/patches/series
   mediawiki-extensions/trunk/debian/rules
   mediawiki-extensions/trunk/svn-revisions
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/control
Log:
kill mediawiki-extensions-fckeditor (Closes: #689375)


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki/trunk/debian/changelog	2012-10-02 10:13:31 UTC (rev 384)
@@ -1,8 +1,9 @@
-mediawiki (1:1.19.2-2) UNRELEASED; urgency=low
+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>  Sat, 29 Sep 2012 16:43:25 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 12:12:40 +0200
 
 mediawiki (1:1.19.2-1) unstable; urgency=low
 

Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki/trunk/debian/control	2012-10-02 10:13:31 UTC (rev 384)
@@ -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~)

Added: mediawiki-extensions/trunk/debian/NEWS
===================================================================
--- mediawiki-extensions/trunk/debian/NEWS	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/NEWS	2012-10-02 10:13:31 UTC (rev 384)
@@ -0,0 +1,9 @@
+mediawiki-extensions (2.9) unstable; urgency=low
+
+  The mediawiki-extensions-fckeditor package is gone, as
+  it works only with MediaWiki versions up to 1.17 whereas
+  the current version targetted is 1.19, so if your wikis
+  have been using this extension, please remove it from
+  their configuration to avoid breakage.
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 12:07:29 +0200

Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/changelog	2012-10-02 10:13:31 UTC (rev 384)
@@ -1,8 +1,9 @@
-mediawiki-extensions (2.9) UNRELEASED; urgency=low
+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 12:01:42 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 02 Oct 2012 12:12:40 +0200
 
 mediawiki-extensions (2.8) unstable; urgency=low
 

Modified: mediawiki-extensions/trunk/debian/control
===================================================================
--- mediawiki-extensions/trunk/debian/control	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/control	2012-10-02 10:13:31 UTC (rev 384)
@@ -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}

Modified: mediawiki-extensions/trunk/debian/control.in
===================================================================
--- mediawiki-extensions/trunk/debian/control.in	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/control.in	2012-10-02 10:13:31 UTC (rev 384)
@@ -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}

Modified: mediawiki-extensions/trunk/debian/copyright
===================================================================
--- mediawiki-extensions/trunk/debian/copyright	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/copyright	2012-10-02 10:13:31 UTC (rev 384)
@@ -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

Deleted: mediawiki-extensions/trunk/debian/mediawiki-extensions-fckeditor.links
===================================================================
--- mediawiki-extensions/trunk/debian/mediawiki-extensions-fckeditor.links	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/mediawiki-extensions-fckeditor.links	2012-10-02 10:13:31 UTC (rev 384)
@@ -1,2 +0,0 @@
-usr/share/mediawiki-extensions/fckeditor var/lib/mediawiki/extensions/FCKeditor
-usr/share/mediawiki-extensions/fckeditor/FCKeditor.php etc/mediawiki-extensions/extensions-available/FCKeditor.php

Deleted: mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch	2012-10-02 10:13:31 UTC (rev 384)
@@ -1,13 +0,0 @@
-Quick and dirty fix for #579822
-
---- a/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
-+++ b/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
-@@ -203,7 +203,7 @@ class FCKeditor_MediaWiki {
- 		}
- 	}
- 
--	public function onCustomEditor(&$article, &$user) {
-+	public function onCustomEditor($article, $user) {
- 		global $wgRequest, $mediaWiki;
- 
- 		$action = $mediaWiki->getVal('Action');

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/patches/series	2012-10-02 10:13:31 UTC (rev 384)
@@ -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

Modified: mediawiki-extensions/trunk/debian/rules
===================================================================
--- mediawiki-extensions/trunk/debian/rules	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/debian/rules	2012-10-02 10:13:31 UTC (rev 384)
@@ -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

Modified: mediawiki-extensions/trunk/svn-revisions
===================================================================
--- mediawiki-extensions/trunk/svn-revisions	2012-10-02 10:03:58 UTC (rev 383)
+++ mediawiki-extensions/trunk/svn-revisions	2012-10-02 10:13:31 UTC (rev 384)
@@ -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




More information about the Pkg-mediawiki-commits mailing list