[Pkg-mediawiki-commits] r474 - mediawiki/trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2013-09-05 15:08:54 +0000 (Thu, 05 Sep 2013)
New Revision: 474

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/mediawiki.postinst
   mediawiki/trunk/debian/mediawiki.postrm
Log:
Thijs says this should work


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-04 15:28:18 UTC (rev 473)
+++ mediawiki/trunk/debian/changelog	2013-09-05 15:08:54 UTC (rev 474)
@@ -1,4 +1,4 @@
-mediawiki (1:1.19.8+dfsg-1) UNRELEASED; urgency=low
+mediawiki (1:1.19.8+dfsg-1) unstable; urgency=low
 
   * mediawiki-math is now called mediawiki-extensions-math
     ⇒ update the package relationship fields
@@ -10,8 +10,9 @@
   * Update debian/copyright information
   * Pull upstream patch to fix variables (Closes: #709943)
   * Sort patches ASCIIbetically; refresh them against new version
+  * For Apache 2.4, move configuration file (Closes: #669832)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 04 Sep 2013 17:26:52 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 05 Sep 2013 17:07:53 +0200
 
 mediawiki (1:1.19.7+dfsg-1) unstable; urgency=low
 

Modified: mediawiki/trunk/debian/mediawiki.postinst
===================================================================
--- mediawiki/trunk/debian/mediawiki.postinst	2013-09-04 15:28:18 UTC (rev 473)
+++ mediawiki/trunk/debian/mediawiki.postinst	2013-09-05 15:08:54 UTC (rev 474)
@@ -17,12 +17,22 @@
 
 	for i in $webserver; do
 	    if [ "$webserver" != "cherokee" ]; then
-		if [ ! -d /etc/$i/conf.d/ ]; then
-			install -d -m755 /etc/$i/conf.d/
+		if [ "$webserver" = "apache2" ]; then
+			dst=/etc/apache2/conf-available
+		else
+			dst=/etc/$i/conf.d
 		fi
-		if [ ! -e /etc/$i/conf.d/mediawiki.conf ]; then
+		if [ ! -d $dst/ ]; then
+			install -d -m755 $dst/
+		fi
+		if [ "$webserver" = "apache2" ]; then
+			if [ -e /etc/$i/conf.d/mediawiki.conf ]; then
+				mv /etc/$i/conf.d/mediawiki.conf $dst/
+			fi
+		fi
+		if [ ! -e $dst/mediawiki.conf ]; then
 			ln -s /etc/mediawiki/apache.conf \
-			/etc/$i/conf.d/mediawiki.conf
+			$dst/mediawiki.conf
 			if [ -f /etc/init.d/$i ]; then
 				if which invoke-rc.d >/dev/null 2>&1; then
                 			invoke-rc.d $i reload
@@ -43,7 +53,7 @@
                 			invoke-rc.d $i reload
         			else
                 			/etc/init.d/$i reload
-        			fi	
+        			fi
 			fi
 		fi
 	     fi
@@ -56,7 +66,7 @@
 
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
-    
+
     ;;
 
     *)

Modified: mediawiki/trunk/debian/mediawiki.postrm
===================================================================
--- mediawiki/trunk/debian/mediawiki.postrm	2013-09-04 15:28:18 UTC (rev 473)
+++ mediawiki/trunk/debian/mediawiki.postrm	2013-09-05 15:08:54 UTC (rev 474)
@@ -6,12 +6,15 @@
 set -e
 
 if [ -f /usr/share/debconf/confmodule ]; then
-. /usr/share/debconf/confmodule 
+. /usr/share/debconf/confmodule
 fi
 
 case "$1" in
     purge)
-	rm -rf /etc/mediawiki /var/lib/mediawiki /etc/apache*/conf.d/mediawiki.conf  /etc/cherokee/sites-available/mediawiki
+	rm -rf /etc/mediawiki /var/lib/mediawiki \
+	    /etc/apache*/conf.d/mediawiki.conf \
+	    /etc/apache2/conf-available/mediawiki.conf \
+	    /etc/cherokee/sites-available/mediawiki
     ;;
     *)
     ;;