Bug#669841: Fix install issue after Apache2 2.4 migration

[Jean Baptiste Favre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi,
I modified both postinst and postrm scripts so that package can be
installed without errors with Apache2 2.4.

Please find patch attached,
Regards,
Jean Baptiste
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQJ8BAEBCgBmBQJUZgwgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RTg0NUJBMjMwQ0I0RDQ0ODkwNjk4NDdC
NERENTM2QUNGN0Q4NzM3AAoJELTdU2rPfYc3y34P/0ZQZeIEr3mspnUN+RGg6mjy
CDppdsz5LrzXiBx3Y0PJG1CAIqHOZ4Q+yMSI2076tNFUIVsmxhRIHYmvLO3PdFXF
oqvcVCXVaY6KiBYyuOHMk5MR1Yp7NF7iwlzzk57qhUuEafv9onkGjqNaJXoVye4l
D6+6mMSZlSbFnpaZsEL6AM6WIujmWcWZ5WK9SBfT/yHlY26Dc6ZBQsQztyQZUDvw
vKxsVhpvdP46VeS1z2SEafahR9MoWuBvjvtLBtAMvBqmKX4YSuURJadz46dKqnK3
ekpXFrgHEruPJwg9p8VCtO75egROARzy1NCswv0yvdJq+buHFVWQXIAhxbpT5AGg
7Db0UEYCRKigqXcFueMoluDEODAx/fBJlRa+Sd4HyI7OrGujaGjJOaIMHEFKBpXo
yuqaIp5+3DwX7DPUJdHzfygV5l75Xc9Z7hkGfAUlwsF7Iqsf94LrPmkY9Nj1FEqd
wll5YLtssY6x3yr7E/cYLoJt+4Xido7OhOse04jrymhOD5BbsymBUUGOHnK7aYE2
+pnK0pWPWmCyD++EcWdLcwuPgeUFd3Sn2K9OGeDP6bjFi4ugu2EKtU2qpOXcCv/C
jdgxvZ9yG1wrm68V40scPUvo9iJV4AnOxl09ZiWOu+pL2csQ/tBeeWKUdUBjNOu9
Ybt8/7IOrt3u95e9UNsD
=dlim
-----END PGP SIGNATURE-----

diff -Nru phamm-0.6.2/debian/changelog phamm-0.6.2/debian/changelog
--- phamm-0.6.2/debian/changelog	2014-07-15 08:04:53.000000000 +0200
+++ phamm-0.6.2/debian/changelog	2014-11-14 14:59:35.000000000 +0100
@@ -1,3 +1,10 @@
+phamm (0.6.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix postinst and postrm scripts to follow apache2 2.4 migration (Closes: #669841)
+
+ --  <deb...@jbfavre.org>  Fri, 14 Nov 2014 14:54:18 +0100
+
 phamm (0.6.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #750518)
diff -Nru phamm-0.6.2/debian/phamm.postinst phamm-0.6.2/debian/phamm.postinst
--- phamm-0.6.2/debian/phamm.postinst	2010-03-29 15:50:59.000000000 +0200
+++ phamm-0.6.2/debian/phamm.postinst	2014-11-14 14:43:44.000000000 +0100
@@ -128,8 +128,10 @@
                 ;;
         esac
 
-        if [ ! -f /etc/$webserver/conf.d/phamm ] && [ ! -h /etc/$webserver/conf.d/phamm ]; then
-            ln -s /etc/phamm/apache.conf /etc/$webserver/conf.d/phamm
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+            . /usr/share/apache2/apache2-maintscript-helper
+            ln -sf /etc/phamm/apache.conf /etc/apache2/conf-available/phamm.conf
+            apache2_invoke enconf phamm.conf || exit $?
 	    restart="$restart $webserver"
         fi
     done
diff -Nru phamm-0.6.2/debian/phamm.postrm phamm-0.6.2/debian/phamm.postrm
--- phamm-0.6.2/debian/phamm.postrm	2008-07-26 12:32:26.000000000 +0200
+++ phamm-0.6.2/debian/phamm.postrm	2014-11-14 13:51:12.000000000 +0100
@@ -19,7 +19,12 @@
 
         case "$webserver" in
             apache|apache-perl|apache-ssl|apache2)
-                rm -f /etc/$webserver/conf.d/phamm
+                if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+                    . /usr/share/apache2/apache2-maintscript-helper
+                    apache2_invoke disconf phamm.conf || exit $?
+                else
+                    rm -f /etc/$webserver/conf.d/phamm.conf
+                fi
                 test -x /usr/sbin/$webserver || continue
                 restart="$restart $webserver"
                 ;;

phamm_0.6.2-1.1.diff.sig
Description: PGP signature