[evolvis-commits] r18292: Prepared new upstream release..

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


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

Modified:
   trunk/mediawiki/debian/README.Debian
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/compat
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/control.in
   trunk/mediawiki/debian/copyright
   trunk/mediawiki/debian/patches/debian_specific_config.patch
   trunk/mediawiki/debian/patches/mimetypes.patch
   trunk/mediawiki/debian/patches/texvc_location.patch
Log:
Prepared new upstream release..

Modified: trunk/mediawiki/debian/README.Debian
===================================================================
--- trunk/mediawiki/debian/README.Debian	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/README.Debian	2012-04-11 09:16:11 UTC (rev 18292)
@@ -63,6 +63,10 @@
 	This shall need a proper php5 binary, as provided in php5-cli
 
 Upgrading from mediawiki1.x packages:
+        This part is only useful for upgrading from old mediawiki1.x packages.
+        Starting with debian lenny, upgrade are done using the previous 
+        method.
+        .
 	A rapid sketch of what you need to do is as follow:
 	1) Dump your database to a text file.
 		mysqldump --add-drop-table -u <user> -p <my-database> > /path/to/file.sql
@@ -70,7 +74,7 @@
 	     your webserver user -- usualy www-data.
 		cp /var/lib/mediawiki1.x/LocalSettings.php /etc/mediawiki
 		cp /var/lib/mediawiki1.x/AdminSettings.php /etc/mediawiki (if exists)
-	3) Add the following line at the begining of your /etc/mediawiki/LocalSettings.php if it does not exist:
+	3) Add the following line at the beginning of your /etc/mediawiki/LocalSettings.php if it does not exist:
 		define(MW_INSTALL_PATH,"/var/lib/mediawiki");
 	4) Execute the update script:
 	   You will need an AdminSettings.php file.

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:16:11 UTC (rev 18292)
@@ -1,3 +1,19 @@
+mediawiki (1:1.15.0-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Upstream added support for OASIS documents.
+  Closes: #530328
+  * Refreshed quilt patches
+  * Bumped standards versions to 3.8.2
+  * Bumped compat to 7
+  * Pointed to GPL-2 in debian/copyright
+  * Added php5-sqlite to possible DB backend dependencies.
+  Closes: #501569
+  * Proofread README.Debian, upgrade is documented there.
+  Closes: #520121
+
+ -- Romain Beauxis <toots at rastageeks.org>  Fri, 19 Jun 2009 01:38:50 +0200
+
 mediawiki (1:1.14.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/mediawiki/debian/compat
===================================================================
--- trunk/mediawiki/debian/compat	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/compat	2012-04-11 09:16:11 UTC (rev 18292)
@@ -1 +1 @@
-4
+7

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/control	2012-04-11 09:16:11 UTC (rev 18292)
@@ -3,13 +3,13 @@
 Priority: optional
 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), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
+Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 
 Package: mediawiki
 Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, mime-support, ${misc:Depends} 
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends} 
 Recommends: mysql-server | postgresql-contrib, php5-cli
 Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
 Description: website engine for collaborative work

Modified: trunk/mediawiki/debian/control.in
===================================================================
--- trunk/mediawiki/debian/control.in	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/control.in	2012-04-11 09:16:11 UTC (rev 18292)
@@ -5,11 +5,11 @@
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: @cdbs@, ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 
 Package: mediawiki
 Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, mime-support, ${misc:Depends} 
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends} 
 Recommends: mysql-server | postgresql-contrib, php5-cli
 Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
 Description: website engine for collaborative work

Modified: trunk/mediawiki/debian/copyright
===================================================================
--- trunk/mediawiki/debian/copyright	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/copyright	2012-04-11 09:16:11 UTC (rev 18292)
@@ -90,5 +90,5 @@
    02110-1301, USA.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:11 UTC (rev 18292)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.14.0/config/index.php
+Index: mediawiki-1.15.0/config/index.php
 ===================================================================
---- mediawiki-1.14.0.orig/config/index.php	2009-02-20 15:17:47.000000000 +0100
-+++ mediawiki-1.14.0/config/index.php	2009-03-06 20:46:47.000000000 +0100
-@@ -226,7 +226,7 @@
+--- mediawiki-1.15.0.orig/config/index.php	2009-06-19 01:51:35.000000000 +0200
++++ mediawiki-1.15.0/config/index.php	2009-06-19 01:52:30.000000000 +0200
+@@ -232,7 +232,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>
-@@ -1512,16 +1512,7 @@
+@@ -1602,16 +1602,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 {
-@@ -1529,7 +1520,7 @@
+@@ -1619,7 +1610,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>
-@@ -1677,6 +1668,12 @@
+@@ -1773,6 +1764,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 {
-@@ -1776,6 +1773,11 @@
+@@ -1872,6 +1869,11 @@
  
  \$wgDiff3 = \"{$slconf['diff3']}\";
  

Modified: trunk/mediawiki/debian/patches/mimetypes.patch
===================================================================
--- trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:11 UTC (rev 18292)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.14.0/includes/DefaultSettings.php
+Index: mediawiki-1.15.0/includes/DefaultSettings.php
 ===================================================================
---- mediawiki-1.14.0.orig/includes/DefaultSettings.php	2009-03-06 20:46:45.000000000 +0100
-+++ mediawiki-1.14.0/includes/DefaultSettings.php	2009-03-06 20:46:46.000000000 +0100
-@@ -345,8 +345,8 @@
+--- mediawiki-1.15.0.orig/includes/DefaultSettings.php	2009-06-19 01:52:28.000000000 +0200
++++ mediawiki-1.15.0/includes/DefaultSettings.php	2009-06-19 01:52:29.000000000 +0200
+@@ -350,8 +350,8 @@
  $wgVerifyMimeType= true;
  
  /** Sets the mime type definition 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:16:10 UTC (rev 18291)
+++ trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:16:11 UTC (rev 18292)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.14.0/includes/DefaultSettings.php
+Index: mediawiki-1.15.0/includes/DefaultSettings.php
 ===================================================================
---- mediawiki-1.14.0.orig/includes/DefaultSettings.php	2009-02-22 11:27:52.000000000 +0100
-+++ mediawiki-1.14.0/includes/DefaultSettings.php	2009-03-06 20:46:55.000000000 +0100
-@@ -1714,7 +1714,7 @@
+--- mediawiki-1.15.0.orig/includes/DefaultSettings.php	2009-06-19 01:51:39.000000000 +0200
++++ mediawiki-1.15.0/includes/DefaultSettings.php	2009-06-19 01:52:39.000000000 +0200
+@@ -1737,7 +1737,7 @@
   */
  $wgUseTeX = false;
  /** Location of the texvc binary */



More information about the evolvis-commits mailing list