[Pkg-mediawiki-commits] r184 - in mediawiki-extensions/trunk: . debian debian/patches dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap

Tue Jun 29 13:11:04 UTC 2010

Author: tg
Date: 2010-06-29 13:10:45 +0000 (Tue, 29 Jun 2010)
New Revision: 184

Added:
   mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
   mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc-20.png
   mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc.svg
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/control.in
   mediawiki-extensions/trunk/debian/patches/series
   mediawiki-extensions/trunk/debian/rules
   mediawiki-extensions/trunk/svn-revisions
Log:
build on lenny (with debian/control regen, of course) and test these exts:
?\226?\128?\162 Collection
?\226?\128?\162 GraphViz
?\226?\128?\162 ImageMap
?\226?\128?\162 LanguageSelector
?\226?\128?\162 News
?\226?\128?\162 ParserFunctions (just that it shows up in Special:Version tho?\226?\128?\166)
?\226?\128?\162 Polyglot (just that it shows up in Special:Version tho?\226?\128?\166)
?\226?\128?\162 RSS_Reader (yay, Pl?\195?\164net Debian on the wiki Main_Page ?\226?\152?\186)
?\226?\128?\162 SyntaxHighlight

Next steps: Policy bump, Lintian fixes, testing on sid


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================

--- mediawiki-extensions/trunk/debian/changelog	2010-06-29 08:59:18 UTC (rev 183)
+++ mediawiki-extensions/trunk/debian/changelog	2010-06-29 13:10:45 UTC (rev 184)
@@ -16,8 +16,12 @@
     - Polyglot
     - RSS_Reader
   * debian/copyright: add information for new extensions
+  * Remove all mentions of SpecialLastUserLogin because
+    it is not included (any more?) in the package
+  * Make buggy extensions (RSS_Reader, LanguageSelector) work
+    by patching
 
- -- Thorsten Glaser <tg at mirbsd.de>  Mon, 28 Jun 2010 16:22:52 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 29 Jun 2010 14:58:05 +0200
 
 mediawiki-extensions (2.2) unstable; urgency=high
 

Modified: mediawiki-extensions/trunk/debian/control.in
===================================================================
--- mediawiki-extensions/trunk/debian/control.in	2010-06-29 08:59:18 UTC (rev 183)
+++ mediawiki-extensions/trunk/debian/control.in	2010-06-29 13:10:45 UTC (rev 184)
@@ -3,7 +3,7 @@
 Priority: optional
 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@
+Build-Depends: debhelper (>= 7.0.1), @cdbs@
 Standards-Version: 3.8.4
 Vcs-SVN: svn://svn.debian.org/svn/pkg-mediawiki/mediawiki-extensions/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-mediawiki/mediawiki-extensions/trunk/

Added: mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-06-29 13:10:45 UTC (rev 184)
@@ -0,0 +1,16 @@
+$Id$
+
+Fix LanguageSelector extension:
+* API impropriety
+
+--- mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php~	2010-06-29 09:49:00.000000000 +0200
++++ mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	2010-06-29 14:52:52.000000000 +0200
+@@ -200,7 +200,7 @@ function wfLanguageSelectorBeforePageDis
+ 	return true;
+ }
+ 
+-function wfLanguageSelectorGetCacheVaryCookies( &$cookies ) {
++function wfLanguageSelectorGetCacheVaryCookies( $out, &$cookies ) {
+ 	global $wgCookiePrefix;
+ 
+ 	$cookies[] = $wgCookiePrefix.'LanguageSelectorLanguage';


Property changes on: mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2010-06-29 08:59:18 UTC (rev 183)
+++ mediawiki-extensions/trunk/debian/patches/series	2010-06-29 13:10:45 UTC (rev 184)
@@ -1,2 +1,4 @@
 fix_472283.patch
 fix_fckeditor.patch
+fix_languageselector.patch
+fix_rssreader.patch

Modified: mediawiki-extensions/trunk/debian/rules
===================================================================
--- mediawiki-extensions/trunk/debian/rules	2010-06-29 08:59:18 UTC (rev 183)
+++ mediawiki-extensions/trunk/debian/rules	2010-06-29 13:10:45 UTC (rev 184)
@@ -11,6 +11,8 @@
 configure/mediawiki-extensions::
 	cp -rf dist/* debian
 	-find debian -name .createme -print0 | xargs -0r rm
+	# for now (empty directory, no idea why)
+	rmdir debian/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/collection
 
 binary-install/mediawiki-extensions-geshi::
 	sed -e 's#geshi/geshi.php#/usr/share/php-geshi/geshi.php#g' \

Added: mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc-20.png
===================================================================
(Binary files differ)


Property changes on: mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc-20.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc.svg
===================================================================
--- mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc.svg	                        (rev 0)
+++ mediawiki-extensions/trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/desc.svg	2010-06-29 13:10:45 UTC (rev 184)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   sodipodi:docbase="C:\htdocs\w2\extensions\ImageMap"
+   sodipodi:docname="desc.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="796.52647"
+     inkscape:cy="480.05164"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="853"
+     inkscape:window-height="609"
+     inkscape:window-x="307"
+     inkscape:window-y="247" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3657"
+       transform="translate(-99.99995,-350.0001)">
+      <path
+         transform="matrix(1.014493,0,0,1.029412,-27.53629,174.9305)"
+         d="M 717.14285 463.79074 A 295.71429 291.42856 0 1 1  125.71426,463.79074 A 295.71429 291.42856 0 1 1  717.14285 463.79074 z"
+         sodipodi:ry="291.42856"
+         sodipodi:rx="295.71429"
+         sodipodi:cy="463.79074"
+         sodipodi:cx="421.42856"
+         id="path1872"
+         style="opacity:1;fill:blue;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <flowRoot
+         transform="matrix(6.2409,0,0,4.446071,-1211.524,-1867.093)"
+         style="font-size:144px;fill:white;fill-opacity:1;stroke:none;stroke-opacity:1;font-family:Times New Roman"
+         id="flowRoot2764"
+         xml:space="preserve"><flowRegion
+           id="flowRegion2766"><rect
+             style="font-size:144px;fill:white;fill-opacity:1;stroke:none;stroke-opacity:1;font-family:Times New Roman"
+             y="495.21933"
+             x="234.28572"
+             height="297.14285"
+             width="354.28571"
+             id="rect2768" /></flowRegion><flowPara
+           style="font-size:144px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:white;fill-opacity:1;stroke:none;stroke-opacity:1;font-family:Times New Roman"
+           id="flowPara2770">i</flowPara></flowRoot>    </g>
+  </g>
+</svg>

Modified: mediawiki-extensions/trunk/svn-revisions
===================================================================
--- mediawiki-extensions/trunk/svn-revisions	2010-06-29 08:59:18 UTC (rev 183)
+++ mediawiki-extensions/trunk/svn-revisions	2010-06-29 13:10:45 UTC (rev 184)
@@ -179,8 +179,8 @@
 http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/NewUserNotif/README - NewUserNotif - base - usr/share/doc - no - 68270
 http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/CreateBox/CreateBox.i18n.php - CreateBox - base - usr/share - no - 68632
 http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/CreateBox/CreateBox.php - CreateBox - base - usr/share - yes - 68355
-http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/desc-20.png - none - none - none - no - -1
-http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/desc.svg - none - none - none - no - -1
+http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/desc-20.png - ImageMap - base - usr/share - no - 18304
+http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/desc.svg - ImageMap - base - usr/share - no - 30294
 http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/ImageMap.i18n.php - ImageMap - base - usr/share - no - 68528
 http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/ImageMap.php - ImageMap - base - usr/share - yes - 62858
 http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/ImageMap/ImageMap_body.php - ImageMap - base - usr/share - no - 66970


