[Pkg-voip-commits] r10195 - in /mumble-django/trunk/debian: apache2.conf apache2/ apache2/mumble-django.conf changelog control mumble-django.install mumble-django.links mumble-django.postinst rules

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Thu May 23 20:13:55 2013
New Revision: 10195

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10195
Log:
Adapt configs for Apache 2.4 (Closes: 669817).

Added:
    mumble-django/trunk/debian/apache2/
    mumble-django/trunk/debian/apache2/mumble-django.conf
      - copied unchanged from r10188, mumble-django/trunk/debian/apache2.conf
Removed:
    mumble-django/trunk/debian/apache2.conf
Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/control
    mumble-django/trunk/debian/mumble-django.install
    mumble-django/trunk/debian/mumble-django.links
    mumble-django/trunk/debian/mumble-django.postinst
    mumble-django/trunk/debian/rules

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=10195&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Thu May 23 20:13:55 2013
@@ -1,3 +1,9 @@
+mumble-django (2.9-2) UNRELEASED; urgency=low
+
+  * Adapt configs for Apache 2.4 (Closes: 669817).
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 19 May 2013 18:21:53 +0200
+
 mumble-django (2.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: mumble-django/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/control?rev=10195&op=diff
==============================================================================
--- mumble-django/trunk/debian/control (original)
+++ mumble-django/trunk/debian/control Thu May 23 20:13:55 2013
@@ -5,7 +5,7 @@
 Uploaders: Kilian Krause <kilian at debian.org>,
  Michael Ziegler <diese-addy at funzt-halt.net>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends: debhelper (>= 7), po-debconf, apache2-dev
 Build-Depends-Indep: python-support (>= 0.3)
 Homepage: http://www.bitbucket.org/Svedrin/mumble-django/
 Vcs-Svn: svn://anonscm.debian.org/pkg-voip/mumble-django/trunk/

Modified: mumble-django/trunk/debian/mumble-django.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.install?rev=10195&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.install (original)
+++ mumble-django/trunk/debian/mumble-django.install Thu May 23 20:13:55 2013
@@ -16,9 +16,6 @@
 # templates
 pyweb/templates/*	 	/usr/share/mumble-django/pyweb/templates
 
-# Apache2 VHost config
-debian/apache2.conf		/etc/mumble-django
-
 # WSGI conf
 mumble-django.wsgi		/usr/share/mumble-django
 

Modified: mumble-django/trunk/debian/mumble-django.links
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.links?rev=10195&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.links (original)
+++ mumble-django/trunk/debian/mumble-django.links Thu May 23 20:13:55 2013
@@ -1,2 +1,1 @@
 /etc/mumble-django/settings.py					/usr/share/mumble-django/pyweb/settings.py
-/etc/mumble-django/apache2.conf 				/etc/apache2/conf.d/mumble-django

Modified: mumble-django/trunk/debian/mumble-django.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.postinst?rev=10195&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.postinst (original)
+++ mumble-django/trunk/debian/mumble-django.postinst Thu May 23 20:13:55 2013
@@ -16,8 +16,10 @@
 	setperm "/var/lib/mumble-django"   0750
 	setperm "/var/lib/mumble-django/mumble-django.db3" 0640
 	
-	if [ -x /etc/init.d/apache2 ]; then
-		invoke-rc.d --quiet apache2 reload
+	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+		. /usr/share/apache2/apache2-maintscript-helper
+		
+		apache2_invoke enconf mumble-django
 	fi
 	
 	db_input high mumble-django/run-mumble-django-configure || true

Modified: mumble-django/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/rules?rev=10195&op=diff
==============================================================================
--- mumble-django/trunk/debian/rules (original)
+++ mumble-django/trunk/debian/rules Thu May 23 20:13:55 2013
@@ -41,6 +41,7 @@
 	dh_installman
 	dh_installdebconf
 	dh_install
+	dh_apache2
 	rm -f debian/mumble-django/usr/share/mumble-django/htdocs/ext-3.2.0/license.txt
 	dh_pysupport
 	dh_link