[Pkg-mediawiki-commits] r481 - in mediawiki/trunk/debian: . etc

[Jonathan Wiltshire]

Author: jmw
Date: 2013-09-18 12:56:11 +0000 (Wed, 18 Sep 2013)
New Revision: 481

Modified:
   mediawiki/trunk/debian/NEWS
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/etc/apache.conf
Log:
Update apache.conf for Apache 2.4 syntax changes

Modified: mediawiki/trunk/debian/NEWS
===================================================================
--- mediawiki/trunk/debian/NEWS	2013-09-08 19:45:51 UTC (rev 480)
+++ mediawiki/trunk/debian/NEWS	2013-09-18 12:56:11 UTC (rev 481)
@@ -1,3 +1,11 @@
+mediawiki (1:1.19.8+dfsg-2) UNRELEASED; urgency=low
+
+  Debian MediaWiki packages have been updated for Apache 2.4 compatibility.
+  Because of this change, you may need to re-activate configuration by
+  running `a2enconf mediawiki'.
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Wed, 18 Sep 2013 13:52:28 +0100
+
 mediawiki (1:1.19.2-2) unstable; urgency=low
 
   The mediawiki-extensions-fckeditor package has been

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-08 19:45:51 UTC (rev 480)
+++ mediawiki/trunk/debian/changelog	2013-09-18 12:56:11 UTC (rev 481)
@@ -1,9 +1,14 @@
 mediawiki (1:1.19.8+dfsg-2) UNRELEASED; urgency=low
 
+  [ Thorsten Glaser ]
   * debian/rules: get-orig-source now leaves the repacked origtgz
     in ./ ipv in ./debian/ according to Policy §4.9 (noticed by
     Natureshadow)
 
+  [ Jonathan Wiltshire ]
+  * Update apache.conf for Apache 2.4 syntax changes, and document
+    in debian/NEWS (Closes: #723620, #669832)
+
  -- Thorsten Glaser <tg at mirbsd.de>  Sun, 08 Sep 2013 16:40:45 +0200
 
 mediawiki (1:1.19.8+dfsg-1) unstable; urgency=low

Modified: mediawiki/trunk/debian/etc/apache.conf
===================================================================
--- mediawiki/trunk/debian/etc/apache.conf	2013-09-08 19:45:51 UTC (rev 480)
+++ mediawiki/trunk/debian/etc/apache.conf	2013-09-18 12:56:11 UTC (rev 481)
@@ -5,8 +5,7 @@
 <Directory /var/lib/mediawiki/>
 	Options +FollowSymLinks
 	AllowOverride All
-	order allow,deny
-	allow from all
+	Require all granted
 </Directory>
 
 # some directories must be protected