[Piuparts-commits] [piuparts] 03/04: post_distupgrade_hack_debsums: merge into post_distupgrade_exceptions

[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 9b4e8cb841121c16012f6fccf42d4f1ea32c2a41
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Jan 25 01:40:01 2017 +0100

    post_distupgrade_hack_debsums: merge into post_distupgrade_exceptions
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/post_distupgrade_exceptions   | 6 ++++++
 custom-scripts/scripts/post_distupgrade_hack_debsums | 8 --------
 debian/changelog                                     | 2 ++
 debian/piuparts.maintscript                          | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/custom-scripts/scripts/post_distupgrade_exceptions b/custom-scripts/scripts/post_distupgrade_exceptions
index 930a02f..44a0909 100755
--- a/custom-scripts/scripts/post_distupgrade_exceptions
+++ b/custom-scripts/scripts/post_distupgrade_exceptions
@@ -22,6 +22,12 @@ fi
 
 if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ]; then
 
+	# https://bugs.debian.org/687611
+	if [ -f /usr/share/keyrings/debian-archive-removed-keys.gpg~ ]; then
+		echo "FIXING /usr/share/keyrings/debian-archive-removed-keys.gpg~"
+		mv -v /usr/share/keyrings/debian-archive-removed-keys.gpg~ /usr/share/keyrings/debian-archive-removed-keys.gpg
+	fi
+
 	case ${PIUPARTS_OBJECTS%%=*} in
 		kismet|\
 		tshark|\
diff --git a/custom-scripts/scripts/post_distupgrade_hack_debsums b/custom-scripts/scripts/post_distupgrade_hack_debsums
deleted file mode 100755
index 1638c47..0000000
--- a/custom-scripts/scripts/post_distupgrade_hack_debsums
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-# https://bugs.debian.org/687611
-if [ -f /usr/share/keyrings/debian-archive-removed-keys.gpg~ ]; then
-	echo "FIXING /usr/share/keyrings/debian-archive-removed-keys.gpg~"
-	mv -v /usr/share/keyrings/debian-archive-removed-keys.gpg~ /usr/share/keyrings/debian-archive-removed-keys.gpg
-fi
diff --git a/debian/changelog b/debian/changelog
index ebc9c53..9dc606b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ piuparts (0.75) UNRELEASED; urgency=medium
     for non-free and downloader packages.
   * scripts/pre_distupgrade_zz_database-server: Run pg_upgradecluster during
     dist-upgrades.
+  * scripts/post_distupgrade_hack_debsums: Limit to squeeze->wheezy and merge
+    into scripts/post_distupgrade_exceptions.
   * scripts/{pre,post}_remove_exceptions: Support removal of essential
     packages with apt-get from stretch onwards.
   * known_problems/piuparts-depends-dummy_error.conf: Recognize the failure
diff --git a/debian/piuparts.maintscript b/debian/piuparts.maintscript
index c7f881b..11015db 100644
--- a/debian/piuparts.maintscript
+++ b/debian/piuparts.maintscript
@@ -4,3 +4,4 @@ mv_conffile /etc/piuparts/scripts/post_install_find_bad_permissions /etc/piupart
 rm_conffile /etc/piuparts/scripts/post_remove_extras 0.61~
 rm_conffile /etc/piuparts/scripts/post_distupgrade_experimental 0.74~
 rm_conffile /etc/piuparts/scripts-debug-prerm/pre_remove_prerm_set-x 0.74~
+rm_conffile /etc/piuparts/scripts/post_distupgrade_hack_debsums 0.75~

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