[Pkg-mediawiki-commits] r432 - in mediawiki/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2013-03-25 09:39:41 +0000 (Mon, 25 Mar 2013)
New Revision: 432

Added:
   mediawiki/trunk/debian/patches/debian_specific_config.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
bring back LocalSettings generation of mw-ext snippet (Closes: #703852)


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-03-25 09:23:04 UTC (rev 431)
+++ mediawiki/trunk/debian/changelog	2013-03-25 09:39:41 UTC (rev 432)
@@ -3,8 +3,12 @@
   [ Platonides ]
   * Update config URL in README.Debian (Closes: #703804)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Mon, 25 Mar 2013 10:22:21 +0100
+  [ Thorsten Glaser ]
+  * Re-add LocalSettings creation snippet for support of the
+    mediawiki-extensions Debian packaging (Closes: #703852)
 
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 25 Mar 2013 10:38:35 +0100
+
 mediawiki (1:1.19.4-1) unstable; urgency=high
 
   * Urgency high for security fix

Added: mediawiki/trunk/debian/patches/debian_specific_config.patch
===================================================================
--- mediawiki/trunk/debian/patches/debian_specific_config.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/debian_specific_config.patch	2013-03-25 09:39:41 UTC (rev 432)
@@ -0,0 +1,18 @@
+$Id$
+
+Support mediawiki-extensions Debian packaging (see #703852).
+
+--- a/includes/installer/LocalSettingsGenerator.php
++++ b/includes/installer/LocalSettingsGenerator.php
+@@ -333,6 +333,11 @@ if ( !defined( 'MEDIAWIKI' ) ) {
+ # Path to the GNU diff3 utility. Used for conflict resolution.
+ \$wgDiff3 = \"{$this->values['wgDiff3']}\";
+ 
++# debian-specific include:
++if (is_file(\"/etc/mediawiki-extensions/extensions.php\")) {
++	include(\"/etc/mediawiki-extensions/extensions.php\");
++}
++
+ # Query string length limit for ResourceLoader. You should only set this if
+ # your web server has a query string length limit (then set it to that limit),
+ # or if you have suhosin.get.max_value_length set in php.ini (then set it to


Property changes on: mediawiki/trunk/debian/patches/debian_specific_config.patch
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2013-03-25 09:23:04 UTC (rev 431)
+++ mediawiki/trunk/debian/patches/series	2013-03-25 09:39:41 UTC (rev 432)
@@ -6,3 +6,4 @@
 bz29635.patch
 bz40889.patch
 bz39635.patch
+debian_specific_config.patch