[Pkg-mediawiki-commits] r197 - in mediawiki-extensions/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2010-06-30 14:35:17 +0000 (Wed, 30 Jun 2010)
New Revision: 197

Added:
   mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
   mediawiki-extensions/trunk/debian/patches/series
Log:
next round of fixing


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-06-30 13:44:50 UTC (rev 196)
+++ mediawiki-extensions/trunk/debian/changelog	2010-06-30 14:35:17 UTC (rev 197)
@@ -1,4 +1,4 @@
-mediawiki-extensions (2.3~test+3) unstable; urgency=low
+mediawiki-extensions (2.3~test+4) unstable; urgency=low
 
   * debian/control: add Vcs-SVN and Vcs-Browser
   * debian/copyright: correct FCKeditor author information
@@ -19,14 +19,15 @@
   * Remove all mentions of SpecialLastUserLogin because
     it is not included (any more?) in the package
   * Make buggy extensions (LanguageSelector, NewestPages,
-    RSS_Reader) work by patching
+    RSS_Reader) work and PHP 5.3 compatible by patching
   * Replace embedded JQuery and JQueryUI code copies from
     Collection with links to the Debian packages thereof
   * Bump Standards-Version to 3.9.0.0
     - use Breaks instead of Conflicts (splitting package, §7.4)
   * Fix Lintian warnings
+  * Correct path to the dot command in GraphViz extension
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Jun 2010 15:44:19 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Jun 2010 16:34:53 +0200
 
 mediawiki-extensions (2.2) unstable; urgency=high
 

Added: mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch	2010-06-30 14:35:17 UTC (rev 197)
@@ -0,0 +1,17 @@
+$Id$
+
+Fix path to dot.
+
+Index: trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php
+===================================================================
+--- trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/Graphviz.php	(revision 196)
++++ trunk/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";
+ 
+ $wgExtensionFunctions[] = "wfGraphVizExtension";
+ 


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

Modified: mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-06-30 13:44:50 UTC (rev 196)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-06-30 14:35:17 UTC (rev 197)
@@ -5,13 +5,16 @@
   cache directory, and I don't think we want it
 * add $egCacheDir which can be overridden by people who like to cache
 * fix rendering path to CSS
+* make work with PHP 5.3
 
 Also add documentation of these changes as README.Debian and point to
 upstream's documentation in form of a wikipage.
 
---- mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php~	2010-06-25 13:31:55.000000000 +0200
-+++ mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	2010-06-25 15:25:55.000000000 +0200
-@@ -22,10 +22,11 @@ if ( !defined('MEDIAWIKI') ) {
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
+===================================================================
+--- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(revision 196)
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(working copy)
+@@ -22,10 +22,11 @@
  }
  
  $wgExtensionFunctions[] = 'efRSSReader';
@@ -24,7 +27,7 @@
  	'author' => 'Artem Kaznatcheev',
  	'description' => 'Adds <tt>&lt;rss&gt;</tt> tag',
  	'url' => 'http://www.mediawiki.org/wiki/Extension:RSS_Reader'
-@@ -37,7 +38,8 @@ $egRSSReaderPath  = $wgScriptPath."/exte
+@@ -37,7 +38,8 @@
  $egCacheTime      = 3600; //default cache time in seconds
  $egCacheTimeMin   = 1800; //minimum cache time in seconds
  $egCacheTimeMax   = 7200; //maximum cache time in seconds
@@ -34,15 +37,18 @@
  //boolean to determine if links created should have rel="nofollow"
  $egNoFollow       = false;
  $egWidthMin       = 200;  //minimim width in pixels
-@@ -69,6 +71,7 @@ function efRSSReader() {
+@@ -67,8 +69,9 @@
+   $wgParser->setHook( 'rss', 'efCreateRSSReader' );
+ }
  
- function efCreateRSSReader($input, $argv, &$parser){
+-function efCreateRSSReader($input, $argv, &$parser){
++function efCreateRSSReader($input, $argv, $parser){
    global $wgOut, $egRSSReaderPath, $egCacheTime, $egCacheTimeMin,
-+    $egCacheDir,
++    $egCacheDir, $wgRSSReaderExtVersion,
      $egCacheTimeMax, $egCache, $rssType, $egNoFollow, $egWidthMin,
      $egWidthMax;
  
-@@ -152,8 +155,11 @@ function efCreateRSSReader($input, $argv
+@@ -152,8 +155,11 @@
        if ($argv["title"]=="off") $dispTitle = false;
      }
  
@@ -56,7 +62,7 @@
  
      if (!$width) {
        $output = '
-@@ -174,7 +180,7 @@ function efCreateRSSReader($input, $argv
+@@ -174,7 +180,7 @@
      $rss = new $rssType; //initialize an object of rssType
      // Set public variables
      if (is_a($rssType, 'lastRSS') && $egCache) {

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2010-06-30 13:44:50 UTC (rev 196)
+++ mediawiki-extensions/trunk/debian/patches/series	2010-06-30 14:35:17 UTC (rev 197)
@@ -1,5 +1,6 @@
 fix_472283.patch
 fix_fckeditor.patch
+fix_graphviz.patch
 fix_languageselector.patch
 fix_newestpages.patch
 fix_rssreader.patch