[evolvis-commits] r18284: Prepared 1.12.0-1

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:16:04 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:16:03 +0200 (Wed, 11 Apr 2012)
New Revision: 18284

Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/control.in
   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
   trunk/mediawiki/debian/rules
Log:
Prepared 1.12.0-1

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:16:03 UTC (rev 18284)
@@ -1,3 +1,14 @@
+mediawiki (1:1.12.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated patch for postfix support: dropped what 
+    has been implemented upstream
+  * Refreshed other patches, thanks to quilt
+  * Changed postgresql recommends to "postgresql" package
+  Closes: #469582
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 24 Mar 2008 02:20:12 +0100
+
 mediawiki (1:1.11.2-2) unstable; urgency=high
 
   * Added patch to fix pgsql select, thanks to Marc Dequènes

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/control	2012-04-11 09:16:03 UTC (rev 18284)
@@ -10,7 +10,7 @@
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, mime-support, ${misc:Depends} 
-Recommends: mysql-server | postgresql-8.1, php5-cli
+Recommends: mysql-server | postgresql, php5-cli
 Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively

Modified: trunk/mediawiki/debian/control.in
===================================================================
--- trunk/mediawiki/debian/control.in	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/control.in	2012-04-11 09:16:03 UTC (rev 18284)
@@ -10,7 +10,7 @@
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, mime-support, ${misc:Depends} 
-Recommends: mysql-server | postgresql-8.1, php5-cli
+Recommends: mysql-server | postgresql, php5-cli
 Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:03 UTC (rev 18284)
@@ -1,7 +1,7 @@
-Index: mediawiki-1.11.2/config/index.php
+Index: mediawiki-1.12.0/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
+--- mediawiki-1.12.0.orig/config/index.php	2008-03-20 23:08:49.000000000 +0100
++++ mediawiki-1.12.0/config/index.php	2008-03-24 02:31:45.000000000 +0100
 @@ -212,7 +212,7 @@
  if( !is_writable( "." ) ) {
  	dieout( "<h2>Can't write config file, aborting</h2>
@@ -11,7 +11,7 @@
  	writable by the web server. Once configuration is done you'll move the created
  	<tt>LocalSettings.php</tt> to the parent directory, and for added safety you can
  	then remove the <tt>config</tt> subdirectory entirely.</p>
-@@ -1436,16 +1436,7 @@
+@@ -1454,16 +1454,7 @@
  <div class="success-box">
  <p>Installation successful!</p>
  <p>To complete the installation, please do the following:
@@ -29,7 +29,7 @@
  </div>
  EOT;
  	} else {
-@@ -1453,7 +1444,7 @@
+@@ -1471,7 +1462,7 @@
  <div class="success-box">
  <p>
  <span class="success-message">Installation successful!</span>
@@ -38,7 +38,7 @@
  <a href="../$script"> this link</a> to your wiki.</p>
  <p>You should change file permissions for <tt>LocalSettings.php</tt> as required to
  prevent other users on the server reading passwords and altering configuration data.</p>
-@@ -1554,6 +1545,12 @@
+@@ -1579,6 +1570,12 @@
  
  # If you customize your file layout, set \$IP to the directory that contains
  # the other MediaWiki files. It will be used as a base to locate files.
@@ -51,7 +51,7 @@
  if( defined( 'MW_INSTALL_PATH' ) ) {
  	\$IP = MW_INSTALL_PATH;
  } else {
-@@ -1664,6 +1661,11 @@
+@@ -1689,6 +1686,11 @@
  
  \$wgDiff3 = \"{$slconf['diff3']}\";
  
@@ -62,4 +62,4 @@
 +
  # When you make changes to this configuration file, this will make
  # sure that cached pages are cleared.
- \$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) );
+ \$wgCacheEpoch = max( \$wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );

Modified: trunk/mediawiki/debian/patches/fix_postgre.patch
===================================================================
--- trunk/mediawiki/debian/patches/fix_postgre.patch	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/patches/fix_postgre.patch	2012-04-11 09:16:03 UTC (rev 18284)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.11.2/includes/DatabasePostgres.php
+Index: mediawiki-1.12.0/includes/DatabasePostgres.php
 ===================================================================
---- 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 @@
+--- mediawiki-1.12.0.orig/includes/DatabasePostgres.php	2008-03-20 23:08:48.000000000 +0100
++++ mediawiki-1.12.0/includes/DatabasePostgres.php	2008-03-24 02:30:29.000000000 +0100
+@@ -93,6 +93,44 @@
  
  	}
  
@@ -47,134 +47,3 @@
  	function cascadingDeletes() {
  		return true;
  	}
-@@ -1139,9 +1177,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 );
- 	}
- 
-@@ -1152,11 +1194,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: mediawiki-1.11.2/includes/Database.php
-===================================================================
---- 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 @@
- };
- 
- /**
-+ * 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
-  */
-Index: mediawiki-1.11.2/maintenance/postgres/tables.sql
-===================================================================
---- 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,
-   img_height       INTEGER   NOT NULL,
--  img_metadata     TEXT,
-+  img_metadata     BYTEA     NOT NULL  DEFAULT '',
-   img_bits         SMALLINT,
-   img_media_type   TEXT,
-   img_major_mime   TEXT                DEFAULT 'unknown',
-@@ -259,7 +259,7 @@
- CREATE INDEX img_sha1          ON image (img_sha1);
- 
- CREATE TABLE oldimage (
--  oi_name          TEXT         NOT NULL  REFERENCES image(img_name),
-+  oi_name          TEXT         NOT NULL,
-   oi_archive_name  TEXT         NOT NULL,
-   oi_size          INTEGER      NOT NULL,
-   oi_width         INTEGER      NOT NULL,
-@@ -276,6 +276,7 @@
-   oi_deleted       CHAR         NOT NULL DEFAULT '0',
-   oi_sha1          TEXT         NOT NULL DEFAULT ''
- );
-+ALTER TABLE oldimage ADD CONSTRAINT oldimage_oi_name_fkey_cascade FOREIGN KEY (oi_name) REFERENCES image(img_name) ON DELETE CASCADE;
- CREATE INDEX oi_name_timestamp    ON oldimage (oi_name,oi_timestamp);
- CREATE INDEX oi_name_archive_name ON oldimage (oi_name,oi_archive_name);
- CREATE INDEX oi_sha1              ON oldimage (oi_sha1);
-@@ -286,14 +287,14 @@
-   fa_name               TEXT         NOT NULL,
-   fa_archive_name       TEXT,
-   fa_storage_group      VARCHAR(16),
--  fa_storage_key        CHAR(64),
-+  fa_storage_key        TEXT,
-   fa_deleted_user       INTEGER          NULL  REFERENCES mwuser(user_id) ON DELETE SET NULL,
-   fa_deleted_timestamp  TIMESTAMPTZ  NOT NULL,
-   fa_deleted_reason     TEXT,
-   fa_size               SMALLINT     NOT NULL,
-   fa_width              SMALLINT     NOT NULL,
-   fa_height             SMALLINT     NOT NULL,
--  fa_metadata           TEXT,
-+  fa_metadata           BYTEA        NOT NULL  DEFAULT '',
-   fa_bits               SMALLINT,
-   fa_media_type         TEXT,
-   fa_major_mime         TEXT                   DEFAULT 'unknown',
-Index: mediawiki-1.11.2/maintenance/updaters.inc
-===================================================================
---- 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
- 	$typechanges = array(
-+		array("filearchive",  "fa_metadata",     "bytea", "decode(fa_metadata,'escape')"),
-+		array("filearchive",  "fa_storage_key",  "text",  ""),
-+		array("image",        "img_metadata",    "bytea", "decode(img_metadata,'escape')"),
- 		array("image",        "img_size",        "int4",  ""),
- 		array("image",        "img_width",       "int4",  ""),
- 		array("image",        "img_height",      "int4",  ""),
-@@ -1457,6 +1460,13 @@
- 		dbsource(archive($nr[2]));
- 	}
- 
-+	if ($wgDatabase->hasConstraint("oldimage_oi_name_fkey")) {
-+		echo "... change oldimage to CASCADE DELETE on image deletion\n";
-+		$wgDatabase->query("ALTER TABLE oldimage DROP CONSTRAINT oldimage_oi_name_fkey");
-+		$wgDatabase->query("ALTER TABLE oldimage ADD CONSTRAINT oldimage_oi_name_fkey_cascade ".
-+			"FOREIGN KEY (oi_name) REFERENCES image(img_name) ON DELETE CASCADE");
-+	}
-+
- 	if (!$wgDatabase->triggerExists("page", "page_deleted")) {
- 		echo "... create page_deleted trigger\n";
- 		dbsource(archive('patch-page_deleted.sql'));

Modified: trunk/mediawiki/debian/patches/mimetypes.patch
===================================================================
--- trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:03 UTC (rev 18284)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.11.2/includes/DefaultSettings.php
+Index: mediawiki-1.12.0/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 @@
+--- mediawiki-1.12.0.orig/includes/DefaultSettings.php	2008-03-24 02:30:29.000000000 +0100
++++ mediawiki-1.12.0/includes/DefaultSettings.php	2008-03-24 02:30:29.000000000 +0100
+@@ -349,8 +349,8 @@
  /** Sets the mime type definition file to use by MimeMagic.php.
  * @global string $wgMimeTypeFile
  */

Modified: trunk/mediawiki/debian/patches/texvc_location.patch
===================================================================
--- trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:16:03 UTC (rev 18284)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.11.2/includes/DefaultSettings.php
+Index: mediawiki-1.12.0/includes/DefaultSettings.php
 ===================================================================
---- 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 @@
+--- mediawiki-1.12.0.orig/includes/DefaultSettings.php	2008-03-20 23:08:48.000000000 +0100
++++ mediawiki-1.12.0/includes/DefaultSettings.php	2008-03-24 02:32:07.000000000 +0100
+@@ -1530,7 +1530,7 @@
   */
  $wgUseTeX = false;
  /** Location of the texvc binary */

Modified: trunk/mediawiki/debian/rules
===================================================================
--- trunk/mediawiki/debian/rules	2012-04-11 09:16:00 UTC (rev 18283)
+++ trunk/mediawiki/debian/rules	2012-04-11 09:16:03 UTC (rev 18284)
@@ -28,6 +28,7 @@
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/fetchInterwiki.pl
 	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
+	chmod -x debian/mediawiki/usr/share/mediawiki/includes/SpecialProtectedtitles.php
 	find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
 	while read i; do \
 		dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \



More information about the evolvis-commits mailing list