[evolvis-commits] r18282: Prepared 1.11.2-2

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:15:59 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:15:59 +0200 (Wed, 11 Apr 2012)
New Revision: 18282

Modified:
   trunk/mediawiki/debian/README.Debian
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/patches/debian_specific_config.patch
   trunk/mediawiki/debian/patches/fix_postgre.patch
   trunk/mediawiki/debian/patches/mimetypes.patch
   trunk/mediawiki/debian/patches/texvc_location.patch
Log:
Prepared 1.11.2-2

Modified: trunk/mediawiki/debian/README.Debian
===================================================================
--- trunk/mediawiki/debian/README.Debian	2012-04-11 09:15:58 UTC (rev 18281)
+++ trunk/mediawiki/debian/README.Debian	2012-04-11 09:15:59 UTC (rev 18282)
@@ -4,9 +4,9 @@
 
 Optional features:
 	- Image thumbnailing :
-	  Install 'php5-gd2' or 'imagemagick' to use this feature.
+	  Install 'php5-gd' or 'imagemagick' to use this feature.
 	- LaTeX-compatible math equations rendering :
-	  Install 'tetex-bin', 'imagemagick' and a Ghostscript interpreter
+	  Install 'texlive-latex-base', 'imagemagick' and a Ghostscript interpreter
 	    ('gs-gpl' or 'gs-esp') to use this feature.
 	  To be able to render non-ASCII characters, also install 'cjk-latex'.
 	  Uncomment the following line in '/etc/mediawiki/LocalSettings.php' :

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:15:58 UTC (rev 18281)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:15:59 UTC (rev 18282)
@@ -1,3 +1,15 @@
+mediawiki (1:1.11.2-2) unstable; urgency=high
+
+  * Added patch to fix pgsql select, thanks to Marc Dequènes
+  Closes: #469841
+  * Upated README.Debian to mention php5-gd instead of php5-gd2
+  and texlive-latex-base instead to tetex-bin.
+  Closes: #469558
+  * still setting urgency to high since previous upload didn't make it
+  to testing.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 03 Mar 2008 13:58:57 +0100
+
 mediawiki (1:1.11.2-1) unstable; urgency=high
 
   * New upstream release

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:15:58 UTC (rev 18281)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:15:59 UTC (rev 18282)
@@ -1,5 +1,7 @@
---- mediawiki-1.11.0/config/index.php	2007-08-22 17:05:30.000000000 +0200
-+++ mediawiki-1.11.0.debian/config/index.php	2007-10-22 01:04:57.000000000 +0200
+Index: mediawiki-1.11.2/config/index.php
+===================================================================
+--- mediawiki-1.11.2.orig/config/index.php	2008-03-15 15:55:50.000000000 +0100
++++ mediawiki-1.11.2/config/index.php	2008-03-15 15:55:56.000000000 +0100
 @@ -212,7 +212,7 @@
  if( !is_writable( "." ) ) {
  	dieout( "<h2>Can't write config file, aborting</h2>

Modified: trunk/mediawiki/debian/patches/fix_postgre.patch
===================================================================
--- trunk/mediawiki/debian/patches/fix_postgre.patch	2012-04-11 09:15:58 UTC (rev 18281)
+++ trunk/mediawiki/debian/patches/fix_postgre.patch	2012-04-11 09:15:59 UTC (rev 18282)
@@ -1,10 +1,55 @@
-Index: includes/DatabasePostgres.php
+Index: mediawiki-1.11.2/includes/DatabasePostgres.php
 ===================================================================
---- mediawiki-1.11.0/includes/DatabasePostgres.php	(révision 26039)
-+++ mediawiki-1.11.0/includes/DatabasePostgres.php	(révision 26040)
-@@ -1148,9 +1148,13 @@
+--- mediawiki-1.11.2.orig/includes/DatabasePostgres.php	2008-03-15 15:55:50.000000000 +0100
++++ mediawiki-1.11.2/includes/DatabasePostgres.php	2008-03-15 15:55:57.000000000 +0100
+@@ -87,6 +87,44 @@
+ 
  	}
  
++	/**
++	 * SELECT wrapper
++	 *
++	 * @param mixed  $table   Array or string, table name(s) (prefix auto-added)
++	 * @param mixed  $vars    Array or string, field name(s) to be retrieved
++	 * @param mixed  $conds   Array or string, condition(s) for WHERE
++	 * @param string $fname   Calling function name (use __METHOD__) for logs/profiling
++	 * @param array  $options Associative array of options (e.g. array('GROUP BY' => 'page_title')),
++	 *                        see Database::makeSelectOptions code for list of supported stuff
++	 * @return mixed Database result resource (feed to Database::fetchObject or whatever), or false on failure
++	 */
++	function select( $table, $vars, $conds='', $fname = 'Database::select', $options = array() )
++	{
++		$noKeyOptions = array();
++		foreach ( $options as $key => $option ) {
++			if ( is_numeric( $key ) ) {
++				$noKeyOptions[$option] = true;
++			}
++		}
++
++		if (is_array($vars) === false) {
++			$vars = (string)$vars;
++			$var_list = explode(',', $vars);
++		}
++		else {
++			$var_list = $vars;
++			$vars = implode(',', $var_list);
++		}
++
++		## in certain conditions with ORDER BY and GROUP BY, the specified fields *MUST* be included in fetched data
++		if (array_key_exists('ORDER BY', $options) && (strpos($vars, '(') === false) && ((stripos($vars, "DISTINCT ") !== false) || (array_key_exists('DISTINCT', $noKeyOptions))))
++			$var_list[] = preg_replace("/ (ASC|DESC|USING .*?)(,| |$)/i", "", $options['ORDER BY']);
++		else if (array_key_exists('GROUP BY', $options))
++			$var_list[] = $options['GROUP BY'];
++
++		return parent::select( $table, $var_list, $conds, $fname, $options );
++	}
++
+ 	function cascadingDeletes() {
+ 		return true;
+ 	}
+@@ -1139,9 +1177,13 @@
+ 	}
+ 
  	function encodeBlob( $b ) {
 -		return pg_escape_bytea( $b );
 +		return new Blob ( pg_escape_bytea( $b ) ) ;
@@ -17,7 +62,7 @@
  		return pg_unescape_bytea( $b );
  	}
  
-@@ -1161,11 +1165,10 @@
+@@ -1152,11 +1194,10 @@
  	function addQuotes( $s ) {
  		if ( is_null( $s ) ) {
  			return 'NULL';
@@ -31,10 +76,10 @@
  	}
  
  	function quote_ident( $s ) {
-Index: includes/Database.php
+Index: mediawiki-1.11.2/includes/Database.php
 ===================================================================
---- mediawiki-1.11.0/includes/Database.php	(révision 26039)
-+++ mediawiki-1.11.0/includes/Database.php	(révision 26040)
+--- mediawiki-1.11.2.orig/includes/Database.php	2008-03-15 15:55:50.000000000 +0100
++++ mediawiki-1.11.2/includes/Database.php	2008-03-15 15:55:57.000000000 +0100
 @@ -36,6 +36,22 @@
  };
  
@@ -58,10 +103,10 @@
   * Utility class.
   * @addtogroup Database
   */
-Index: mediawiki-1.11.0/maintenance/postgres/tables.sql
+Index: mediawiki-1.11.2/maintenance/postgres/tables.sql
 ===================================================================
---- mediawiki-1.11.0/maintenance/postgres/tables.sql	(révision 26041)
-+++ mediawiki-1.11.0/maintenance/postgres/tables.sql	(révision 26044)
+--- mediawiki-1.11.2.orig/maintenance/postgres/tables.sql	2008-03-15 15:55:50.000000000 +0100
++++ mediawiki-1.11.2/maintenance/postgres/tables.sql	2008-03-15 15:55:57.000000000 +0100
 @@ -243,7 +243,7 @@
    img_size         INTEGER   NOT NULL,
    img_width        INTEGER   NOT NULL,
@@ -105,10 +150,10 @@
    fa_bits               SMALLINT,
    fa_media_type         TEXT,
    fa_major_mime         TEXT                   DEFAULT 'unknown',
-Index: maintenance/updaters.inc
+Index: mediawiki-1.11.2/maintenance/updaters.inc
 ===================================================================
---- mediawiki-1.11.0/maintenance/updaters.inc	(révision 26041)
-+++ mediawiki-1.11.0/maintenance/updaters.inc	(révision 26044)
+--- mediawiki-1.11.2.orig/maintenance/updaters.inc	2008-03-15 15:55:50.000000000 +0100
++++ mediawiki-1.11.2/maintenance/updaters.inc	2008-03-15 15:55:57.000000000 +0100
 @@ -1351,6 +1351,9 @@
  
  	# table, column, desired type, USING clause if needed

Modified: trunk/mediawiki/debian/patches/mimetypes.patch
===================================================================
--- trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:15:58 UTC (rev 18281)
+++ trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:15:59 UTC (rev 18282)
@@ -1,7 +1,8 @@
-diff -urN mediawiki-1.10.0/includes/DefaultSettings.php mediawiki-1.10.0.new/includes/DefaultSettings.php
---- mediawiki-1.10.0/includes/DefaultSettings.php       2007-05-11 15:38:37.000000000 +0200
-+++ mediawiki-1.10.0.new/includes/DefaultSettings.php   2007-05-11 15:39:12.000000000 +0200
-@@ -306,8 +306,8 @@
+Index: mediawiki-1.11.2/includes/DefaultSettings.php
+===================================================================
+--- mediawiki-1.11.2.orig/includes/DefaultSettings.php	2008-03-15 15:55:52.000000000 +0100
++++ mediawiki-1.11.2/includes/DefaultSettings.php	2008-03-15 15:55:55.000000000 +0100
+@@ -348,8 +348,8 @@
  /** Sets the mime type definition file to use by MimeMagic.php.
  * @global string $wgMimeTypeFile
  */
@@ -10,6 +11,5 @@
 +#$wgMimeTypeFile= "includes/mime.types";
 +$wgMimeTypeFile= "/etc/mime.types";
  #$wgMimeTypeFile= NULL; #use built-in defaults only.
-
+ 
  /** Sets the mime type info file to use by MimeMagic.php.
-

Modified: trunk/mediawiki/debian/patches/texvc_location.patch
===================================================================
--- trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:15:58 UTC (rev 18281)
+++ trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:15:59 UTC (rev 18282)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.6.2/includes/DefaultSettings.php
+Index: mediawiki-1.11.2/includes/DefaultSettings.php
 ===================================================================
---- mediawiki-1.6.2.orig/includes/DefaultSettings.php	2006-04-09 11:35:54.000000000 +0200
-+++ mediawiki-1.6.2/includes/DefaultSettings.php	2006-04-09 11:37:05.342940840 +0200
-@@ -1083,7 +1083,7 @@
+--- mediawiki-1.11.2.orig/includes/DefaultSettings.php	2008-03-15 15:55:50.000000000 +0100
++++ mediawiki-1.11.2/includes/DefaultSettings.php	2008-03-15 15:56:21.000000000 +0100
+@@ -1410,7 +1410,7 @@
   */
  $wgUseTeX = false;
  /** Location of the texvc binary */



More information about the evolvis-commits mailing list