[Pkg-javascript-commits] [SCM] javascript-common branch, master, updated. 7-22-g2d7cc38

[Jean-Michel Vourgère]

The following commit has been merged in the master branch:
commit 0a74ffed99448c1144b7bc1dc5850d09f5e7b88e
Author: Jean-Michel Vourgère <jmv_deb at nirgal.com>
Date:   Fri Jul 19 13:12:00 2013 +0200

    Change setup for apache2.4
    
    . Build-Depends on dh-apache2.
    . New debian/apache2 file with dh_apache2 settings.
    . Added --with apache2 to debian/rules.
    . Changed Suggests: into Recommends: httpd.
    
    This closes #710475
    
    Note that bug dh_apache2 bug #717299 results in lighttpd being droped from
    Suggests:
    Since apache2 maintainers are very active right now, I expect this to be fixed
    soon. But package will need a rebuild then.

diff --git a/debian/changelog b/debian/changelog
index 1a9bec8..9de5fb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ javascript-common (9) UNRELEASED; urgency=low
     . Adjusted Depends on debhelper >= 9
   * Add copyright format version.
   * Only disable in postrm on remove|purge, not on upgrades.
+  * Changed set up for apache2.4 (Closes: #710475)
+    . Build-Depends on dh-apache2.
+    . New debian/apache2 file with dh_apache2 settings.
+    . Added --with apache2 to debian/rules.
+    . Changed Suggests: into Recommends: http.
 
  -- Jean-Michel Vourgère <jmv_deb at nirgal.com>  Thu, 18 Jul 2013 20:41:16 +0200
 
diff --git a/debian/control b/debian/control
index a19b7da..9f5dc06 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.deb
 Uploaders:
  Marcelo Jorge Vieira (metal) <metal at debian.org>,
  Steve Kemp <skx at debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), dh-apache2
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-javascript/javascript-common.git
 Vcs-Browser: http://anonscm.debian.org/?p=pkg-javascript/javascript-common.git
@@ -13,7 +13,7 @@ Vcs-Browser: http://anonscm.debian.org/?p=pkg-javascript/javascript-common.git
 Package: javascript-common
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: apache2 | httpd
+Recommends: ${misc:Recommends}
 Description: Base support for JavaScript library packages
  Web applications that use JavaScript need to distribute it through HTTP. Using
  a common path for every script avoids the need to enable this path in the HTTP
diff --git a/debian/javascript-common.apache2 b/debian/javascript-common.apache2
new file mode 100644
index 0000000..a4bdd9c
--- /dev/null
+++ b/debian/javascript-common.apache2
@@ -0,0 +1 @@
+conf javascript-common.conf lighttpd
diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst
index 7053bde..0c1dd94 100644
--- a/debian/javascript-common.postinst
+++ b/debian/javascript-common.postinst
@@ -16,13 +16,6 @@ set -e
 
 case "${1}" in
 	configure)
-		mkdir -p /etc/apache2/conf.d
-		if [ ! -e /etc/apache2/conf.d/javascript-common.conf ]
-		then
-			ln -s ../conf-available/javascript-common.conf /etc/apache2/conf.d/javascript-common.conf
-			invoke-rc.d apache2 reload || true
-		fi
-
 		mkdir -p /etc/lighttpd/conf-enabled
 		if [ ! -e /etc/lighttpd/conf-enabled/90-javascript-alias.conf ]
 		then
diff --git a/debian/javascript-common.postrm b/debian/javascript-common.postrm
index 6503496..2e3e3ae 100644
--- a/debian/javascript-common.postrm
+++ b/debian/javascript-common.postrm
@@ -17,12 +17,6 @@ set -e
 
 case "${1}" in
 	remove|purge)
-		if [ -L /etc/apache2/conf.d/javascript-common.conf ]
-		then
-			rm -f /etc/apache2/conf.d/javascript-common.conf
-			invoke-rc.d apache2 reload || true
-		fi
-		
 		if [ -L /etc/lighttpd/conf-enabled/90-javascript-alias.conf ]
 		then
 			rm -f /etc/lighttpd/conf-enabled/90-javascript-alias.conf
diff --git a/debian/rules b/debian/rules
index 000210b..fa58064 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh ${@}
+	dh ${@} --with apache2

-- 
javascript-common