[evolvis-commits] r18273: Some more changes. This seems to install ok

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


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

Modified:
   trunk/mediawiki/debian/README.Debian
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/patches/debian_specific_config.patch
   trunk/mediawiki/debian/patches/series
Log:
Some more changes. This seems to install ok

Modified: trunk/mediawiki/debian/README.Debian
===================================================================
--- trunk/mediawiki/debian/README.Debian	2012-04-11 09:15:43 UTC (rev 18272)
+++ trunk/mediawiki/debian/README.Debian	2012-04-11 09:15:45 UTC (rev 18273)
@@ -43,7 +43,7 @@
 	following in LocalSettings.php:
 		$wgAntivirus = 'clamav';
 
-Upgrading from:
+Upgrading from mediawiki1.x packages:
 	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

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:15:43 UTC (rev 18272)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:15:45 UTC (rev 18273)
@@ -1,4 +1,4 @@
-mediawiki (1:1.11.0-1) unstable; urgency=low
+mediawiki (1:1.11.0-1) experimental; urgency=low
 
   * Removed mediawikiX versioned packages
   * Updated to mediawiki 1.11

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:15:43 UTC (rev 18272)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:15:45 UTC (rev 18273)
@@ -1,14 +1,15 @@
 --- 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-21 21:28:34.000000000 +0200
-@@ -213,6 +213,7 @@
++++ mediawiki-1.11.0.debian/config/index.php	2007-10-22 01:04:57.000000000 +0200
+@@ -212,7 +212,7 @@
+ if( !is_writable( "." ) ) {
  	dieout( "<h2>Can't write config file, aborting</h2>
  
- 	<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
-+	- /var/lib/mediawiki/config for normal install, custom for multisite - 
+-	<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
++	<p>In order to configure the wiki you have to make the <tt>/var/lib/mediawiki/config</tt> subdirectory
  	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 +1437,7 @@
+@@ -1436,16 +1436,7 @@
  <div class="success-box">
  <p>Installation successful!</p>
  <p>To complete the installation, please do the following:
@@ -22,20 +23,20 @@
 -remotely. LocalSettings.php is currently owned by the user your webserver is running under,
 -which means that anyone on the same server can read your database password! Downloading
 -it and uploading it again will hopefully change the ownership to a user ID specific to you.</p>
-+<p>Move <tt>/config/LocalSettings.php</tt> to <tt>/etc/mediawiki/LocalSettings.php</tt> for normal install, root of your install for multisite, with rights 640</p>
++<p>Move <tt>/var/lib/mediawiki/config/LocalSettings.php</tt> to <tt>/etc/mediawiki/LocalSettings.php</tt> for normal install, root of your install for multisite, with rights 640</p>
  </div>
  EOT;
  	} else {
-@@ -1453,7 +1445,7 @@
+@@ -1453,7 +1444,7 @@
  <div class="success-box">
  <p>
  <span class="success-message">Installation successful!</span>
 -Move the <tt>config/LocalSettings.php</tt> file to the parent directory, then follow
-+Move the <tt>config/LocalSettings.php</tt> file to /etc/mediawiki, then follow
++Move <tt>/var/lib/mediawiki/config/LocalSettings.php</tt> to /etc/mediawiki, then follow
  <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 +1546,12 @@
+@@ -1554,6 +1545,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.
@@ -48,7 +49,7 @@
  if( defined( 'MW_INSTALL_PATH' ) ) {
  	\$IP = MW_INSTALL_PATH;
  } else {
-@@ -1664,6 +1662,11 @@
+@@ -1664,6 +1661,11 @@
  
  \$wgDiff3 = \"{$slconf['diff3']}\";
  

Modified: trunk/mediawiki/debian/patches/series
===================================================================
--- trunk/mediawiki/debian/patches/series	2012-04-11 09:15:43 UTC (rev 18272)
+++ trunk/mediawiki/debian/patches/series	2012-04-11 09:15:45 UTC (rev 18273)
@@ -1,3 +1,3 @@
 texvc_location.patch
-#mimetypes.patch
+mimetypes.patch
 debian_specific_config.patch



More information about the evolvis-commits mailing list