[Piuparts-commits] [piuparts] 02/02: revert the systemd-shim/sysvinit-core 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 fcef71a2c9a77275c41241477f938fe9b1f48c82
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Nov 19 15:08:49 2014 +0100

    revert the systemd-shim/sysvinit-core exceptions
    
    does not seem to be needed any longer
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts/post_purge_exceptions | 12 ------------
 custom-scripts/scripts/pre_remove_exceptions | 13 -------------
 debian/changelog                             |  2 --
 3 files changed, 27 deletions(-)

diff --git a/custom-scripts/scripts/post_purge_exceptions b/custom-scripts/scripts/post_purge_exceptions
index e71a6ba..695edbd 100755
--- a/custom-scripts/scripts/post_purge_exceptions
+++ b/custom-scripts/scripts/post_purge_exceptions
@@ -29,16 +29,4 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 		esac
 		;;
-	gdm3|gnome-session|gnome-shell*|gnome-core|gnome|gnome-desktop-environment|task-gnome-desktop|razorqt|sucrose-0.96|xfswitch-plugin|mate-core|mate-desktop-environment*|task-kde-desktop|kde-standard|kde-plasma-desktop|kde-plasma-netbook|ltsp-server-standalone)
-		# see pre_remove_exceptions for why this is needed
-		log_debug
-		case ${PIUPARTS_DISTRIBUTION} in
-			lenny*|squeeze*|wheezy*)
-				echo "PIUPARTS_DISTRIBUTION=$PIUPARTS_DISTRIBUTION, not applying systemd-sysv removal workaround"
-				;;
-			*)
-				dpkg --purge systemd-shim
-				;;
-		esac
-		;;
 esac
diff --git a/custom-scripts/scripts/pre_remove_exceptions b/custom-scripts/scripts/pre_remove_exceptions
index edd24ba..ed56aa0 100755
--- a/custom-scripts/scripts/pre_remove_exceptions
+++ b/custom-scripts/scripts/pre_remove_exceptions
@@ -19,19 +19,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
 		rm -f /usr/sbin/apt-listbugs
 		dpkg-divert --remove --rename /usr/sbin/apt-listbugs
 		;;
-	gdm3|gnome-session|gnome-shell*|gnome-core|gnome|gnome-desktop-environment|task-gnome-desktop|razorqt|sucrose-0.96|xfswitch-plugin|mate-core|mate-desktop-environment*|task-kde-desktop|kde-standard|kde-plasma-desktop|kde-plasma-netbook|ltsp-server-standalone)
-		# these packages cause installation of systemd-sysv which (currently) needs this help for removing it again
-		# also see post_purge_exceptions for further cleanup
-		log_debug
-		case ${PIUPARTS_DISTRIBUTION} in
-			lenny*|squeeze*|wheezy*)
-				echo "PIUPARTS_DISTRIBUTION=$PIUPARTS_DISTRIBUTION, not applying systemd-sysv removal workaround"
-				;;
-			*)
-				apt-get -y install sysvinit-core
-				;;
-		esac
-		;;
 esac
 
 # Allow removal of the kernel running on the host from the chroot.
diff --git a/debian/changelog b/debian/changelog
index 248915d..241d4fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,6 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * distros.conf: Remove unneeded URI for squeeze-lts, it just uses the
     default repository.
   * instances/pejacevic+slaves: Do not reschedule passed squeeze logs anymore.
-  * custom-scripts/scripts/post_purge_exceptions and pre_remove_exceptions:
-    Skip systemd exceptions for wheezy* and not only wheezy.
 
   [ Andreas Beckmann ]
   * piuparts.py:

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