[Piuparts-commits] [piuparts] 02/03: treat install-info as fake-essential for all tests ending in squeeze

[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 3d88372432cd9a1f3c22b37c22806a89a2e55467
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Sep 9 22:33:42 2017 +0200

    treat install-info as fake-essential for all tests ending in squeeze
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../post_distupgrade_squeeze-fake-essential              |  8 ++------
 .../scripts-squeeze/post_setup_squeeze-fake-essential    | 16 ++++++++--------
 debian/changelog                                         |  2 ++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/custom-scripts/scripts-squeeze/post_distupgrade_squeeze-fake-essential b/custom-scripts/scripts-squeeze/post_distupgrade_squeeze-fake-essential
index 1089a2d..eefdb79 100755
--- a/custom-scripts/scripts-squeeze/post_distupgrade_squeeze-fake-essential
+++ b/custom-scripts/scripts-squeeze/post_distupgrade_squeeze-fake-essential
@@ -3,9 +3,5 @@ set -e
 
 test "$PIUPARTS_DISTRIBUTION" = "squeeze" || exit 0
 
-case ${PIUPARTS_OBJECTS%%=*} in
-	kmplayer-plugin|kde-core|konqueror|konq-plugins|kwin-baghira|mozart-doc|smb4k|strigi-applet|texlive-full)
-		# work around #601961: apt: wrongly thinks install-info is essential
-		apt-get -y install install-info
-		;;
-esac
+# work around #601961: apt: wrongly thinks install-info is essential
+apt-get -y install install-info
diff --git a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
index 838e8eb..a69dfcc 100755
--- a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
+++ b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
@@ -19,14 +19,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
 		# allow testing of the fake essential packages
 		exit 0
 		;;
-	gosa-desktop|kde-core|kde-full|kde-plasma-desktop|kde-standard|kdebase-apps|konqueror|konq-plugins|mozart-doc|texlive-full)
-		# work around #601961: apt: wrongly thinks install-info is essential
-		case ${PIUPARTS_DISTRIBUTION} in
-			squeeze|squeeze-lts)
-				FAILS_TO_REMOVE="$FAILS_TO_REMOVE install-info"
-				;;
-		esac
-		;;
 	phpbb3)
 		USED_DURING_PURGE="$USED_DURING_PURGE dbconfig-common"
 		;;
@@ -36,5 +28,13 @@ case ${PIUPARTS_OBJECTS%%=*} in
 		;;
 esac
 
+# work around #601961: apt: wrongly thinks install-info is essential
+case ${PIUPARTS_DISTRIBUTION} in
+	squeeze|squeeze-lts)
+		# there is no install-info in lenny
+		FAILS_TO_REMOVE="$FAILS_TO_REMOVE install-info"
+		;;
+esac
+
 echo "*** Adding fake essential packages ***"
 apt-get install -yf $USED_DURING_PURGE $FAILS_TO_REMOVE
diff --git a/debian/changelog b/debian/changelog
index e9dc4ad..da3fe66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ piuparts (0.81) UNRELEASED; urgency=medium
 
   [ Andreas Beckmann ]
   * Separate scripts-lenny/ from scripts-squeeze/.
+  * scripts-squeeze/post_{setup,distupgrade}_squeeze-fake-essential:
+    - Treat install-info as fake-essential for all tests ending in squeeze.
   * master-bin/distill_alternatives_log: Parse piuparts.conf to find the
     sections that use scripts-log-alternatives.
   * Use copyright notices without FSF street address.

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