Bug#669841: phamm: diff for NMU version 0.6.2-1.1

[Julien Cristau]

Control: tags 669841 + pending

Dear maintainer,

I've prepared an NMU for phamm (versioned as 0.6.2-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Cheers,
Julien

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 16:30:05.000000000 +0100
@@ -1,3 +1,11 @@
+phamm (0.6.2-1.1) unstable; urgency=medium
+
+  [ Jean Baptiste Favre ]
+  * Non-maintainer upload.
+  * Fix postinst and postrm scripts to follow apache2 2.4 migration (Closes: #669841)
+
+ -- Julien Cristau <jcris...@debian.org>  Fri, 14 Nov 2014 16:30:02 +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 16:30:21.000000000 +0100
@@ -128,10 +128,16 @@
                 ;;
         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
+        # delete old configuration symlink
+        if [ -f /etc/$webserver/conf.d/phamm ]; then
+            rm -f /etc/$webserver/conf.d/phamm
+        fi
     done
 
     db_get phamm/restart-webserver || true
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 16:29:24.000000000 +0100
@@ -19,7 +19,13 @@
 
         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 $?
+                    rm -f /etc/apache2/conf-available/phamm.conf
+                else
+                    rm -f /etc/$webserver/conf.d/phamm.conf
+                fi
                 test -x /usr/sbin/$webserver || continue
                 restart="$restart $webserver"
                 ;;

signature.asc
Description: Digital signature