diff -Nru apache2-2.4.18/debian/apache2.postinst apache2-2.4.18/debian/apache2.postinst --- apache2-2.4.18/debian/apache2.postinst 2016-04-05 16:15:01.000000000 -0500 +++ apache2-2.4.18/debian/apache2.postinst 2016-04-15 10:53:08.000000000 -0500 @@ -111,6 +111,12 @@ fi } +remove_http2_conffile() +{ + dpkg-maintscript-helper rm_conffile \ + /etc/apache2/mods-available/http2.load 2.4.18-2ubuntu3~ apache2 -- "$@" +} + start_htcacheclean () { local action @@ -230,7 +236,9 @@ execute_deferred_actions ;; - + install|upgrade) + remove_http2_conffile $@ + ;; abort-upgrade) start_htcacheclean $@ ;; diff -Nru apache2-2.4.18/debian/apache2.postrm apache2-2.4.18/debian/apache2.postrm --- apache2-2.4.18/debian/apache2.postrm 2016-04-06 04:13:13.000000000 -0500 +++ apache2-2.4.18/debian/apache2.postrm 2016-04-15 10:47:18.000000000 -0500 @@ -35,6 +35,11 @@ EOF } +remove_http2_conffile() +{ + dpkg-maintscript-helper rm_conffile \ + /etc/apache2/mods-available/http2.load 2.4.18-2ubuntu3~ apache2 -- "$@" +} case "$1" in purge) @@ -73,7 +78,10 @@ update-rc.d apache-htcacheclean remove >/dev/null ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + abort-install|abort-upgrade) + remove_http2_conffile $@ + ;; + remove|upgrade|failed-upgrade|disappear) ;; *) diff -Nru apache2-2.4.18/debian/apache2.preinst apache2-2.4.18/debian/apache2.preinst --- apache2-2.4.18/debian/apache2.preinst 1969-12-31 18:00:00.000000000 -0600 +++ apache2-2.4.18/debian/apache2.preinst 2016-04-15 10:44:42.000000000 -0500 @@ -0,0 +1,23 @@ +#! /bin/sh +# preinst script + +set -e + +remove_http2_conffile() +{ + dpkg-maintscript-helper rm_conffile \ + /etc/apache2/mods-available/http2.load 2.4.18-2ubuntu3~ apache2 -- "$@" +} + + +case "$1" in + upgrade|install-upgrade) + remove_http2_conffile $@ + ;; +esac + +#DEBHELPER# + +exit 0 + +# vim: syntax=sh ts=4 sw=4 sts=4 sr noet diff -Nru apache2-2.4.18/debian/changelog apache2-2.4.18/debian/changelog --- apache2-2.4.18/debian/changelog 2016-04-12 05:13:56.000000000 -0500 +++ apache2-2.4.18/debian/changelog 2016-04-15 10:54:29.000000000 -0500 @@ -1,3 +1,13 @@ +apache2 (2.4.18-2ubuntu3) xenial; urgency=medium + + * Really remove http2.load conf file as mentioned + - debian/config-dir/mods-available/http2.load: removed. + - debian/apache2.preinst: add dpkg-mainscript-helper rm_conffile + - debian/apache2.postinst: add dpkg-mainscript-helper rm_conffile + - debian/apache2.postrm: add dpkg-mainscript-helper rm_conffile + + -- Ryan Harper Fri, 15 Apr 2016 09:15:15 -0500 + apache2 (2.4.18-2ubuntu2) xenial; urgency=medium * Correct systemd-sysv-generator behavior by customizing some parameters (LP: #1488962) diff -Nru apache2-2.4.18/debian/config-dir/mods-available/http2.load apache2-2.4.18/debian/config-dir/mods-available/http2.load --- apache2-2.4.18/debian/config-dir/mods-available/http2.load 2016-03-19 04:09:27.000000000 -0500 +++ apache2-2.4.18/debian/config-dir/mods-available/http2.load 1969-12-31 18:00:00.000000000 -0600 @@ -1 +0,0 @@ -LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so