[evolvis-commits] r18278: Prepared 1.11.0-3

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


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

Added:
   trunk/mediawiki/debian/patches/fix_postgre_unserialize.patch
   trunk/mediawiki/debian/po/fi.po
Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/control.in
   trunk/mediawiki/debian/mediawiki.dirs
   trunk/mediawiki/debian/rules
Log:
Prepared 1.11.0-3

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:15:51 UTC (rev 18277)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:15:54 UTC (rev 18278)
@@ -1,9 +1,20 @@
-mediawiki (1:1.11.0-2) experimental; urgency=low
+mediawiki (1:1.11.0-3) unstable; urgency=low
 
-  * Really remove debian-scripts
+  * Really remove debian specific scripts
+  * Backported patch to fix unserialize with postgre
+    Closes: #459312
+  * Added finnish translation of the debconf templates, thanks to Esko
+    Arajärvi. Closes: #456983
+  * Updated standards to 3.7.3 (no changes)
 
- -- Romain Beauxis <toots at rastageeks.org>  Mon, 22 Oct 2007 03:21:56 +0200
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 07 Jan 2008 15:03:15 +0100
 
+mediawiki (1:1.11.0-2) unstable; urgency=low
+
+  * Initial upload of 1.11.0 to unstable
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 03 Nov 2007 16:39:47 +0100
+
 mediawiki (1:1.11.0-1) experimental; urgency=low
 
   * Removed mediawikiX versioned packages

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-04-11 09:15:51 UTC (rev 18277)
+++ trunk/mediawiki/debian/control	2012-04-11 09:15:54 UTC (rev 18278)
@@ -4,14 +4,14 @@
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
-Standards-Version: 3.7.2
+Homepage: http://www.mediawiki.org/
+Standards-Version: 3.7.3
 
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, mime-support, ${misc:Depends} 
 Recommends: mysql-server | postgresql-8.1, php5-cli
 Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
-Homepage: http://www.mediawiki.org/
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing
@@ -26,9 +26,8 @@
 Package: mediawiki-math
 Architecture: any
 Depends: ${interpreter:Depends}, tetex-bin | texlive-latex-base, gs-gpl | gs-esp, imagemagick, ${shlibs:Depends}
-Replaces: mediawiki1.5-math, mediawiki1.9-math
+Replaces: mediawiki1.5-math, mediawiki1.9-math, mediawiki1.10-math
 Recommends: mediawiki, latex-cjk-all, tetex-extra
-Homepage: http://www.mediawiki.org/
 Description: math rendering plugin for MediaWiki
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing

Modified: trunk/mediawiki/debian/control.in
===================================================================
--- trunk/mediawiki/debian/control.in	2012-04-11 09:15:51 UTC (rev 18277)
+++ trunk/mediawiki/debian/control.in	2012-04-11 09:15:54 UTC (rev 18278)
@@ -4,14 +4,14 @@
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: @cdbs@, ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
-Standards-Version: 3.7.2
+Homepage: http://www.mediawiki.org/
+Standards-Version: 3.7.3
 
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, mime-support, ${misc:Depends} 
 Recommends: mysql-server | postgresql-8.1, php5-cli
 Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
-Homepage: http://www.mediawiki.org/
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing
@@ -26,9 +26,8 @@
 Package: mediawiki-math
 Architecture: any
 Depends: ${interpreter:Depends}, tetex-bin | texlive-latex-base, gs-gpl | gs-esp, imagemagick, ${shlibs:Depends}
-Replaces: mediawiki1.5-math, mediawiki1.9-math
+Replaces: mediawiki1.5-math, mediawiki1.9-math, mediawiki1.10-math
 Recommends: mediawiki, latex-cjk-all, tetex-extra
-Homepage: http://www.mediawiki.org/
 Description: math rendering plugin for MediaWiki
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing

Modified: trunk/mediawiki/debian/mediawiki.dirs
===================================================================
--- trunk/mediawiki/debian/mediawiki.dirs	2012-04-11 09:15:51 UTC (rev 18277)
+++ trunk/mediawiki/debian/mediawiki.dirs	2012-04-11 09:15:54 UTC (rev 18278)
@@ -1,4 +1,3 @@
 var/lib/mediawiki/images
 etc/mediawiki
-usr/share/mediawiki/debian-scripts
 usr/share/linda/overrides/

Added: trunk/mediawiki/debian/patches/fix_postgre_unserialize.patch
===================================================================
--- trunk/mediawiki/debian/patches/fix_postgre_unserialize.patch	                        (rev 0)
+++ trunk/mediawiki/debian/patches/fix_postgre_unserialize.patch	2012-04-11 09:15:54 UTC (rev 18278)
@@ -0,0 +1,60 @@
+Index: 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 @@
+ 	}
+ 
+ 	function encodeBlob( $b ) {
+-		return pg_escape_bytea( $b );
++		return new Blob ( pg_escape_bytea( $b ) ) ;
+ 	}
++
+ 	function decodeBlob( $b ) {
++		if ($b instanceof Blob) {
++			$b = $b->fetch();
++		}
+ 		return pg_unescape_bytea( $b );
+ 	}
+ 
+@@ -1161,11 +1165,10 @@
+ 	function addQuotes( $s ) {
+ 		if ( is_null( $s ) ) {
+ 			return 'NULL';
+-		} else if (is_array( $s )) { ## Assume it is bytea data
+-			return "E'$s[1]'";
++		} else if ($s instanceof Blob) {
++			return "'".$s->fetch($s)."'";
+ 		}
+ 		return "'" . pg_escape_string($s) . "'";
+-		// Unreachable: return "E'" . pg_escape_string($s) . "'";
+ 	}
+ 
+ 	function quote_ident( $s ) {
+Index: includes/Database.php
+===================================================================
+--- mediawiki-1.11.0/includes/Database.php	(révision 26039)
++++ mediawiki-1.11.0/includes/Database.php	(révision 26040)
+@@ -36,6 +36,22 @@
+ };
+ 
+ /**
++ * Utility class
++ * @addtogroup Database
++ *
++ * This allows us to distinguish a blob from a normal string and an array of strings
++ */
++class Blob {
++	var $data;
++	function __construct($data) {
++		$this->mData = $data;
++	}
++	function fetch() {
++		return $this->mData;
++	}
++};
++
++/**
+  * Utility class.
+  * @addtogroup Database
+  */

Added: trunk/mediawiki/debian/po/fi.po
===================================================================
--- trunk/mediawiki/debian/po/fi.po	                        (rev 0)
+++ trunk/mediawiki/debian/po/fi.po	2012-04-11 09:15:54 UTC (rev 18278)
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: mediawiki_1:1.11.0-2\n"
+"Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-22 02:37+0200\n"
+"PO-Revision-Date: 2007-12-18 22:37+0200\n"
+"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: Finland\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:2001
+msgid "Web server(s) to configure automatically:"
+msgstr "Automaattisesti asetettavat verkkopalvelimet:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:2001
+msgid "Please select the web server(s) that should be configured automatically for MediaWiki."
+msgstr "Valitse verkkopalvelimet, joille tulisi automaattisesti tehdä asetukset MediaWikiä varten."
+

Modified: trunk/mediawiki/debian/rules
===================================================================
--- trunk/mediawiki/debian/rules	2012-04-11 09:15:51 UTC (rev 18277)
+++ trunk/mediawiki/debian/rules	2012-04-11 09:15:54 UTC (rev 18278)
@@ -26,7 +26,6 @@
 binary-install/mediawiki::
 	cp -rf $(CURDIR)/debian/etc/* $(CURDIR)/debian/mediawiki/etc/mediawiki
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/fetchInterwiki.pl
-	chmod a+x debian/mediawiki/usr/share/mediawiki/debian-scripts/*
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/compare_schemas.pl
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/mediawiki_mysql2postgres.pl
 	find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|images\|extensions\|config\)" | \



More information about the evolvis-commits mailing list