[apache2] 01/01: Don't run upgrade logic again after 2.4

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch jessie
in repository apache2.

commit eba1bb5292b0fe4a32a6a4fe0bd54d1eafe73760
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Sep 5 22:33:50 2016 +0200

    Don't run upgrade logic again after 2.4
---
 debian/apache2.preinst | 2 +-
 debian/changelog       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/apache2.preinst b/debian/apache2.preinst
index 1adc647..32d82ae 100644
--- a/debian/apache2.preinst
+++ b/debian/apache2.preinst
@@ -125,7 +125,7 @@ case "$1" in
 	fi
 	# 2) an apache2.2-common conffiles exists or the 2.2 apache2 package is
 	# installed
-	if [ -n "$2" ] || obsolete_conffile_exists ; then
+	if dpkg --compare-versions "$2" lt-nl 2.4 || ( [ -z "$2" ] && obsolete_conffile_exists ) ; then
 		prepare_rm_conffile
 		prepare_mv_conffile
 	fi
diff --git a/debian/changelog b/debian/changelog
index a98bf3d..705bc4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.10-10+deb8u8) UNRELEASED; urgency=medium
+
+  * Don't run 2.2 to 2.4 upgrade logic again when upgrading from
+    2.4.10-10+deb8u*. Closes: #836818
+
+ -- Stefan Fritsch <sf at debian.org>  Fri, 30 Dec 2016 09:58:13 +0100
+
 apache2 (2.4.10-10+deb8u7) jessie; urgency=medium
 
   * Fix installation of /lib/systemd/system/apache2.service.d/forking.conf.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git