[SCM] live-tools branch, debian-next, updated. debian/3.0.9-1-1-g99a4fa7

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 99a4fa75681e030211e48eab4bb2a82c156774e0
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 27 16:52:56 2012 +0200

    Removing old diversions from live-tools <= 3.0.8 on upgrade (Closes: #685810).

diff --git a/debian/live-tools.preinst b/debian/live-tools.preinst
index cfce37e..9a61dc1 100644
--- a/debian/live-tools.preinst
+++ b/debian/live-tools.preinst
@@ -3,7 +3,7 @@
 set -e
 
 case "${1}" in
-	install|upgrade)
+	install)
 		# initramfs-tools: update-initramfs
 		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/sbin/update-initramfs.orig.initramfs-tools /usr/sbin/update-initramfs
 		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man8/update-initramfs.orig.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
@@ -13,6 +13,14 @@ case "${1}" in
 		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man1/uptime.orig.procps.1.gz /usr/share/man/man1/uptime.1.gz
 		;;
 
+	upgrade)
+		# removing old divertions from live-tools <= 3.0.8
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/sbin/update-initramfs.initramfs-tools /usr/sbin/update-initramfs
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man8/update-initramfs.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.procps /usr/bin/uptime
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man1/uptime.procps.1.gz /usr/share/man/man1/uptime.1.gz
+		;;
+
 	abort-upgrade)
 
 		;;

-- 
live-tools