summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2016-08-12 21:44:24 +0200
committerStefan Fritsch <sf@sfritsch.de>2016-08-12 21:44:24 +0200
commite020e24005eb2ac9dcc6763f05e5dc77544f1f08 (patch)
tree000f9abac4013d6fb80df64d4e98b311a026f8fc
parentad916216322deced5baa9eeae9a27a559cd8dcf9 (diff)
downloadapache2-e020e24005eb2ac9dcc6763f05e5dc77544f1f08.tar.gz
Fix pre-inst script for new installations.
-rw-r--r--debian/apache2.preinst.in2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/apache2.preinst.in b/debian/apache2.preinst.in
index 301eab7e..ebd9fe54 100644
--- a/debian/apache2.preinst.in
+++ b/debian/apache2.preinst.in
@@ -85,7 +85,7 @@ revert_broken_conffiles () {
}
case "$1" in
- upgrade)
+ upgrade|install)
if dpkg --compare-versions "$2" lt-nl "2.4.23-3~" ; then
list_fixup_conffiles | replace_broken_conffiles
diff --git a/debian/changelog b/debian/changelog
index 9be675dd..5b218be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache2 (2.4.23-4) UNRELEASED; urgency=medium
+
+ * Fix pre-inst script for new installations. Closes: #834169
+
+ -- Stefan Fritsch <sf@debian.org> Fri, 12 Aug 2016 21:43:43 +0200
+
apache2 (2.4.23-3) unstable; urgency=low
* Fix conffiles that may have got the wrong content during upgrade from