[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 59c46b95cf9f41d8deef4dfac8ee64be73e1e786
Author: Jean-Michel Vourgère <jmv_deb at nirgal.com>
Date:   Fri Jul 19 00:24:38 2013 +0200

    Drop dependency on obsolete wwwconfig-common
    
    Reload apache2/lighttpd ourself. Ignore errors such as invalid configuration
    from other packages.

diff --git a/debian/changelog b/debian/changelog
index e4ae92b..fee50d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 javascript-common (9) UNRELEASED; urgency=low
 
   * Fixed lighttpd test of preexisting link. (Closes: #712072)
+  * Reload apache2/lighttpd ourself, drop dependency on wwwconfig-common.
+   (Closes: #638200)
 
  -- 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 6848157..8996cb0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.org/git/pkg-javascript/javascript-common.git
 
 Package: javascript-common
 Architecture: all
-Depends: ${misc:Depends}, wwwconfig-common
+Depends: ${misc:Depends}
 Suggests: apache2 | httpd
 Description: Base support for JavaScript library packages
  Web applications that use JavaScript need to distribute it through HTTP. Using
diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst
index 3beae6e..ad8c6bd 100644
--- a/debian/javascript-common.postinst
+++ b/debian/javascript-common.postinst
@@ -5,22 +5,18 @@ set -e
 case "${1}" in
 	configure)
 		mkdir -p /etc/apache2/conf.d
-
 		if [ ! -e /etc/apache2/conf.d/javascript-common.conf ]
 		then
 			ln -s /etc/javascript-common/javascript-common.conf /etc/apache2/conf.d/javascript-common.conf
-			restart="apache2"
+			invoke-rc.d apache2 reload || true
 		fi
 
 		mkdir -p /etc/lighttpd/conf-enabled
 		if [ ! -e /etc/lighttpd/conf-enabled/90-javascript-alias.conf ]
 		then
 			ln -s /etc/javascript-common/lighttpd.conf /etc/lighttpd/conf-enabled/90-javascript-alias.conf
-			restart="lighttpd"
+			invoke-rc.d lighttpd reload || true
 		fi
-
-		servers="apache2 lighttpd"
-		. /usr/share/wwwconfig-common/restart.sh
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/javascript-common.postrm b/debian/javascript-common.postrm
index 60da95a..d37ae50 100644
--- a/debian/javascript-common.postrm
+++ b/debian/javascript-common.postrm
@@ -5,19 +5,13 @@ set -e
 if [ -L /etc/apache2/conf.d/javascript-common.conf ]
 then
 	rm -f /etc/apache2/conf.d/javascript-common.conf
-	restart="apache2"
+	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
-	restart="lighttpd"
-fi
-
-if [ -e /usr/share/wwwconfig-common/restart.sh ]
-then
-	servers="apache2 lighttpd"
-	. /usr/share/wwwconfig-common/restart.sh
+	invoke-rc.d lighttpd reload || true
 fi
 
 #DEBHELPER#

-- 
javascript-common