[Pkg-mediawiki-commits] r253 - in mediawiki-extensions/trunk: . debian/patches
Thorsten Glaser
tg at alioth.debian.org
Tue Apr 12 12:27:08 UTC 2011
Author: tg
Date: 2011-04-12 12:27:06 +0000 (Tue, 12 Apr 2011)
New Revision: 253
Modified:
mediawiki-extensions/trunk/
mediawiki-extensions/trunk/debian/patches/fix_472283.patch
mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch
mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
mediawiki-extensions/trunk/debian/patches/fix_interwiki.patch
mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
mediawiki-extensions/trunk/debian/patches/fix_newestpages.patch
mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
Log:
now that I learned quilt a bit, refresh all patches
Property changes on: mediawiki-extensions/trunk
___________________________________________________________________
Added: svn:ignore
+ .pc
Modified: mediawiki-extensions/trunk/debian/patches/fix_472283.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_472283.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_472283.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -1,9 +1,9 @@
Prevent searches with empty search string.
-Index: mediawiki-extensions-2.0/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
+Index: trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
===================================================================
---- mediawiki-extensions-2.0.orig/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2009-05-06 12:24:47.000000000 -0500
-+++ mediawiki-extensions-2.0/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2009-08-14 00:23:07.000000000 -0500
+--- trunk.orig/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2011-04-12 14:24:27.000000000 +0200
@@ -131,7 +131,8 @@
}
Modified: mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_createbox.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_createbox.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -6,8 +6,8 @@
Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php (revision 222)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php 2011-04-12 14:24:28.000000000 +0200
@@ -90,7 +90,7 @@
return $value;
}
Modified: mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_fckeditor.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -1,9 +1,9 @@
Quick and dirty fix for #579822
-Index: mediawiki-extensions-2.2/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
+Index: trunk/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
===================================================================
---- mediawiki-extensions-2.2.orig/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php 2010-05-04 15:20:15.000000000 -0500
-+++ mediawiki-extensions-2.2/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php 2010-05-04 15:20:34.000000000 -0500
+--- trunk.orig/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php 2011-04-12 14:24:28.000000000 +0200
@@ -203,7 +203,7 @@
}
}
Modified: mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_footnote.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_footnote.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -4,10 +4,10 @@
* API impropriety
* XHTML/1.0 Transitional validity of output
-Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
===================================================================
---- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php (revision 200)
-+++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php 2011-04-12 14:24:28.000000000 +0200
@@ -56,8 +56,7 @@
$ret = "" ;
Modified: mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -4,27 +4,45 @@
* path to dot
* XHTML/1.0 Transitional validity of output
-Index: mwe/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php
+Index: trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php
===================================================================
---- mwe/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php (revision 200)
-+++ mwe/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php (working copy)
-@@ -9,7 +9,7 @@
- var $dotCommand;
- };
- $wgGraphVizSettings = new GraphVizSettings;
--$wgGraphVizSettings->dotCommand = "/usr/local/bin/dot";
-+$wgGraphVizSettings->dotCommand = "/usr/bin/dot";
+--- trunk.orig/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php 2011-04-12 14:24:28.000000000 +0200
+@@ -20,7 +20,7 @@
+ * Describes where your actual (dot) executable remains.
+ *
+ * Windows Default: C:/Programme/ATT/Graphviz/bin/
+- * Other Platform : /usr/local/bin/dot
++ * Other Platform : /usr/bin/dot
+ *
+ * $wgGraphVizSettings->mscgenPath
+ * Describes where your actual mscgen-executable remains
+@@ -449,9 +449,10 @@
+ {
+ $txt = imageAtrributes( $args, $storagename, $map, $outputType, $wgUploadPath ); // if we want borders/position/...
+ } else {
+- $txt = '<map name="' . $storagename . '">' . $map . '</map>' .
+- '<img src="' . $wgUploadPath . '/graphviz/' . $storagename . '.' . $outputType . '"' .
+- ' usemap="#' . $storagename . '" />';
++ $txt = '<map id="map-' . $storagename . '" name="' . $storagename . '">' . $map . '</map>' .
++ '<img alt="map-' . $storagename . '"' .
++ ' src="' . $wgUploadPath . '/graphviz/' . $storagename . '.' . $outputType . '"' .
++ ' usemap="#' . $storagename . '" />';
+ }
- $wgExtensionFunctions[] = "wfGraphVizExtension";
-@@ -75,8 +75,8 @@
- $ext = "png";
+@@ -622,10 +623,10 @@
}
-
-- $txt = "<map name=\"$hash\">{$map}</map>".
-- "<img usemap=\"#{$hash}\" src=\"{$wgUploadPath}/graphviz/{$hash}.{$ext}\">";
-+ $txt = "<map id=\"map-$hash\" name=\"$hash\"><p>{$map}</p></map>".
-+ "<img alt=\"map-$hash\" usemap=\"#{$hash}\" src=\"{$wgUploadPath}/graphviz/{$hash}.{$ext}\" />";
- }
- return $txt;
- }
+
+ // Produce the basic html
+- $txt = '<map name="' . $storagename . '">' . $map . '</map>' .
+- '<img class="' . $imageClass . '" style="' . $imageStyle . '"' .
+- 'alt="' . $alt . '" src="' . $wgUploadPath . '/graphviz/' . $storagename . '.' . $outputType . '"' .
+- ' usemap="#' . $storagename . '" />';
++ $txt = '<map id="map-' . $storagename . '" name="' . $storagename . '">' . $map . '</map>' .
++ '<img class="' . $imageClass . '" style="' . $imageStyle . '"' .
++ ' alt="' . $alt . '" src="' . $wgUploadPath . '/graphviz/' . $storagename . '.' . $outputType . '"' .
++ ' usemap="#' . $storagename . '" />';
+
+ // Add necessary containers
+ if ( $caption != null ) {
Modified: mediawiki-extensions/trunk/debian/patches/fix_interwiki.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_interwiki.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_interwiki.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -5,8 +5,8 @@
Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php
===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php (revision 224)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php 2011-04-12 14:24:29.000000000 +0200
@@ -188,9 +188,9 @@
'iw_local' => $local, 'iw_trans' => $trans );
Modified: mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -5,8 +5,8 @@
Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php (revision 222)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php 2011-04-12 14:24:28.000000000 +0200
@@ -351,7 +351,7 @@
$code = $wgLang->getCode();
Modified: mediawiki-extensions/trunk/debian/patches/fix_newestpages.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_newestpages.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_newestpages.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -6,8 +6,8 @@
Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php
===================================================================
---- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php (revision 195)
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php 2011-04-12 14:24:29.000000000 +0200
@@ -33,7 +33,7 @@
$page = $dbr->tableName( 'page' );
$nsf = $this->getNsFragment();
Modified: mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch 2011-04-12 12:12:56 UTC (rev 252)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch 2011-04-12 12:27:06 UTC (rev 253)
@@ -13,10 +13,10 @@
Also add documentation of these changes as README.Debian and point to
upstream's documentation in form of a wikipage.
-Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
===================================================================
---- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php (revision 202)
-+++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php 2011-04-12 14:24:29.000000000 +0200
@@ -22,10 +22,11 @@
}
@@ -40,9 +40,7 @@
//boolean to determine if links created should have rel="nofollow"
$egNoFollow = false;
$egWidthMin = 200; //minimim width in pixels
-@@ -67,8 +69,9 @@
- $wgParser->setHook( 'rss', 'efCreateRSSReader' );
- }
+@@ -69,6 +71,7 @@
function efCreateRSSReader($input, $argv, $parser){
global $wgOut, $egRSSReaderPath, $egCacheTime, $egCacheTimeMin,
@@ -95,10 +93,10 @@
if ($dispTitle) { //check if title should be displayed
$output .=
'<div class="RSSReader-head">'.
-Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php
===================================================================
---- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php (revision 227)
-+++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php (working copy)
+--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php 2011-04-12 14:24:26.000000000 +0200
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php 2011-04-12 14:24:29.000000000 +0200
@@ -149,14 +149,14 @@
{ $this->rsscp = $this->default_cp; } // This is used in my_preg_match()
@@ -125,8 +123,10 @@
// convert pubDate to specified date format
$result['items'][$i]['pubDate'] = date($this->date_format, $timestamp);
}
---- /dev/null
-+++ mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian 2010-06-25 15:44:30.000000000 +0200
+Index: trunk/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian 2011-04-12 14:24:29.000000000 +0200
@@ -0,0 +1,10 @@
+User-visible changes to the RSS_Reader extension:
+* set $egCache to false by default, since we have no www-data writable
More information about the Pkg-mediawiki-commits
mailing list