[Pkg-mediawiki-commits] r214 - mediawiki/exp-1.16/debian/patches
Jonathan Wiltshire
jmw-guest at alioth.debian.org
Wed Jul 28 21:28:03 UTC 2010
Author: jmw-guest
Date: 2010-07-28 21:28:03 +0000 (Wed, 28 Jul 2010)
New Revision: 214
Modified:
mediawiki/exp-1.16/debian/patches/backup_documentation.patch
mediawiki/exp-1.16/debian/patches/debian_specific_config.patch
mediawiki/exp-1.16/debian/patches/mimetypes.patch
mediawiki/exp-1.16/debian/patches/series
mediawiki/exp-1.16/debian/patches/texvc_location.patch
Log:
Refresh patches for new upstream
Modified: mediawiki/exp-1.16/debian/patches/backup_documentation.patch
===================================================================
--- mediawiki/exp-1.16/debian/patches/backup_documentation.patch 2010-07-28 20:48:08 UTC (rev 213)
+++ mediawiki/exp-1.16/debian/patches/backup_documentation.patch 2010-07-28 21:28:03 UTC (rev 214)
@@ -3,20 +3,8 @@
Bug: https://bugzilla.wikimedia.org/show_bug.cgi?id=24132
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572355
Last-Update: 2010-06-26
---- mediawiki-1.15.4.orig/maintenance/commandLine.inc
-+++ mediawiki-1.15.4/maintenance/commandLine.inc
-@@ -188,7 +188,8 @@
-
- if ( ! is_readable( $settingsFile ) ) {
- print "A copy of your installation's LocalSettings.php\n" .
-- "must exist and be readable in the source directory.\n";
-+ "must exist and be readable in the source directory.\n" .
-+ "Use --conf to specify it.\n";
- exit( 1 );
- }
- $wgCommandLineMode = true;
---- mediawiki-1.15.4.orig/maintenance/dumpBackup.php
-+++ mediawiki-1.15.4/maintenance/dumpBackup.php
+--- mediawiki-1.16.0.orig/maintenance/dumpBackup.php
++++ mediawiki-1.16.0/maintenance/dumpBackup.php
@@ -91,6 +91,13 @@
--skip-footer Don't output the </mediawiki> footer
--stub Don't perform old_text lookups; for 2-pass dump
@@ -29,5 +17,17 @@
+
+ --wiki=<wiki> Only back up the specified <wiki>
- Fancy stuff:
+ Fancy stuff: (Works? Add examples please.)
--plugin=<class>[:<file>] Load a dump plugin class
+--- mediawiki-1.16.0.orig/maintenance/Maintenance.php
++++ mediawiki-1.16.0/maintenance/Maintenance.php
+@@ -741,7 +741,8 @@
+
+ if ( !is_readable( $settingsFile ) ) {
+ $this->error( "A copy of your installation's LocalSettings.php\n" .
+- "must exist and be readable in the source directory.", true );
++ "must exist and be readable in the source directory.\n" .
++ "Use --conf to specify it.\n", true );
+ }
+ $wgCommandLineMode = true;
+ $DP = $IP;
Modified: mediawiki/exp-1.16/debian/patches/debian_specific_config.patch
===================================================================
--- mediawiki/exp-1.16/debian/patches/debian_specific_config.patch 2010-07-28 20:48:08 UTC (rev 213)
+++ mediawiki/exp-1.16/debian/patches/debian_specific_config.patch 2010-07-28 21:28:03 UTC (rev 214)
@@ -1,6 +1,6 @@
---- mediawiki-1.15.4.orig/config/index.php
-+++ mediawiki-1.15.4/config/index.php
-@@ -28,7 +28,6 @@
+--- mediawiki-1.16.0.orig/config/index.php
++++ mediawiki-1.16.0/config/index.php
+@@ -21,7 +21,6 @@
# Attempt to set up the include path, to fix problems with relative includes
$IP = dirname( dirname( __FILE__ ) );
@@ -8,7 +8,9 @@
# Define an entry point and include some files
define( "MEDIAWIKI", true );
-@@ -232,7 +231,7 @@
+--- mediawiki-1.16.0.orig/config/Installer.php
++++ mediawiki-1.16.0/config/Installer.php
+@@ -258,7 +258,7 @@
if( !is_writable( "." ) ) {
dieout( "<h2>Can't write config file, aborting</h2>
@@ -17,7 +19,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>
-@@ -1602,16 +1601,7 @@
+@@ -1742,16 +1742,7 @@
<div class="success-box">
<p>Installation successful!</p>
<p>To complete the installation, please do the following:
@@ -33,9 +35,9 @@
-it and uploading it again will hopefully change the ownership to a user ID specific to you.</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;
+ HTML;
} else {
-@@ -1619,7 +1609,7 @@
+@@ -1759,7 +1750,7 @@
<div class="success-box">
<p>
<span class="success-message">Installation successful!</span>
@@ -44,7 +46,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>
-@@ -1773,6 +1763,12 @@
+@@ -1921,6 +1912,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.
@@ -57,7 +59,7 @@
if( defined( 'MW_INSTALL_PATH' ) ) {
\$IP = MW_INSTALL_PATH;
} else {
-@@ -1872,6 +1868,11 @@
+@@ -2029,6 +2026,11 @@
\$wgDiff3 = \"{$slconf['diff3']}\";
Modified: mediawiki/exp-1.16/debian/patches/mimetypes.patch
===================================================================
--- mediawiki/exp-1.16/debian/patches/mimetypes.patch 2010-07-28 20:48:08 UTC (rev 213)
+++ mediawiki/exp-1.16/debian/patches/mimetypes.patch 2010-07-28 21:28:03 UTC (rev 214)
@@ -1,8 +1,6 @@
-Index: mediawiki-1.15.2/includes/DefaultSettings.php
-===================================================================
---- mediawiki-1.15.2.orig/includes/DefaultSettings.php 2010-03-15 12:01:58.000000000 -0500
-+++ mediawiki-1.15.2/includes/DefaultSettings.php 2010-03-15 12:01:58.000000000 -0500
-@@ -350,8 +350,8 @@
+--- mediawiki-1.16.0.orig/includes/DefaultSettings.php
++++ mediawiki-1.16.0/includes/DefaultSettings.php
+@@ -379,8 +379,8 @@
$wgVerifyMimeType= true;
/** Sets the mime type definition file to use by MimeMagic.php. */
@@ -10,6 +8,6 @@
-#$wgMimeTypeFile= "/etc/mime.types";
+#$wgMimeTypeFile= "includes/mime.types";
+$wgMimeTypeFile= "/etc/mime.types";
- #$wgMimeTypeFile= NULL; #use built-in defaults only.
+ #$wgMimeTypeFile= null; #use built-in defaults only.
/** Sets the mime type info file to use by MimeMagic.php. */
Modified: mediawiki/exp-1.16/debian/patches/series
===================================================================
--- mediawiki/exp-1.16/debian/patches/series 2010-07-28 20:48:08 UTC (rev 213)
+++ mediawiki/exp-1.16/debian/patches/series 2010-07-28 21:28:03 UTC (rev 214)
@@ -1,7 +1,7 @@
texvc_location.patch
mimetypes.patch
debian_specific_config.patch
-detect_invalid_titles.patch
-add_rss_guid.patch
+#detect_invalid_titles.patch
+#add_rss_guid.patch
backup_documentation.patch
suppress_warnings.patch
Modified: mediawiki/exp-1.16/debian/patches/texvc_location.patch
===================================================================
--- mediawiki/exp-1.16/debian/patches/texvc_location.patch 2010-07-28 20:48:08 UTC (rev 213)
+++ mediawiki/exp-1.16/debian/patches/texvc_location.patch 2010-07-28 21:28:03 UTC (rev 214)
@@ -1,13 +1,11 @@
-Index: mediawiki-1.15.2/includes/DefaultSettings.php
-===================================================================
---- mediawiki-1.15.2.orig/includes/DefaultSettings.php 2010-03-08 16:52:50.000000000 -0600
-+++ mediawiki-1.15.2/includes/DefaultSettings.php 2010-03-15 12:03:01.000000000 -0500
-@@ -1737,7 +1737,7 @@
+--- mediawiki-1.16.0.orig/includes/DefaultSettings.php
++++ mediawiki-1.16.0/includes/DefaultSettings.php
+@@ -1957,7 +1957,7 @@
*/
$wgUseTeX = false;
/** Location of the texvc binary */
-$wgTexvc = './math/texvc';
+$wgTexvc = '/usr/bin/texvc';
-
- #
- # Profiling / debugging
+ /**
+ * Texvc background color
+ * use LaTeX color format as used in \special function
More information about the Pkg-mediawiki-commits
mailing list