[Piuparts-commits] [piuparts] 01/01: remove_exceptions: force removal of usrmerge package. (Closes: #798374)

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 91a22a9661e126337f33bb2f1053ea97da505a47
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jul 6 15:14:24 2016 +0200

    remove_exceptions: force removal of usrmerge package. (Closes: #798374)
---
 custom-scripts/scripts/pre_remove_exceptions | 4 ++++
 debian/changelog                             | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/custom-scripts/scripts/pre_remove_exceptions b/custom-scripts/scripts/pre_remove_exceptions
index 7f5d5d5..173a137 100755
--- a/custom-scripts/scripts/pre_remove_exceptions
+++ b/custom-scripts/scripts/pre_remove_exceptions
@@ -46,6 +46,10 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				mv -v /etc/motd.orig /etc/motd
 			fi
 		fi
+	usrmerge)
+		log_debug
+		# force removal of usrmerge package
+		rm -v /etc/dpkg/dpkg.cfg.d/usrmerge
 		;;
 esac
 
diff --git a/debian/changelog b/debian/changelog
index 7361dd2..2f4a952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ piuparts (0.72) UNRELEASED; urgency=medium
   * instances/piuparts.conf.pejacevic: test jessie2bpo and jessie2bpo2stretch.
   * Fix devpts mounting to use the correct gid=5,mode=620 mount options.
     Patch taken from Adam Conrad. (Closes: #829146)
+  * custom-scripts/scripts/pre_remove_exceptions: force removal of usrmerge
+    package. (Closes: #798374)
 
  -- Holger Levsen <holger at debian.org>  Thu, 05 May 2016 14:04:29 +0200
 

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