Bug#774915: live-tools: diff for NMU version 4.0.2-1.1

[gaudenz@debian.org]

Control: tags 774915 + patch

Dear maintainer,

I've prepared an NMU for live-tools (versioned as 4.0.2-1.1). The diff
is attached to this message.

Regards.
Gaudenz

diff -Nru live-tools-4.0.2/debian/changelog live-tools-4.0.2/debian/changelog
--- live-tools-4.0.2/debian/changelog	2014-12-10 10:04:17.000000000 +0100
+++ live-tools-4.0.2/debian/changelog	2015-02-01 01:53:42.000000000 +0100
@@ -1,3 +1,10 @@
+live-tools (4.0.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move removal of diversion to postinst (Closes: #774915)
+
+ -- Gaudenz Steinlin <gaudenz@debian.org>  Sun, 01 Feb 2015 01:53:17 +0100
+
 live-tools (4.0.2-1) unstable; urgency=low
 
   * Removing left-over divertion on procps when upgrading from before
diff -Nru live-tools-4.0.2/debian/live-tools.postinst live-tools-4.0.2/debian/live-tools.postinst
--- live-tools-4.0.2/debian/live-tools.postinst	1970-01-01 01:00:00.000000000 +0100
+++ live-tools-4.0.2/debian/live-tools.postinst	2015-02-01 01:40:14.000000000 +0100
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]
+then
+	# upgrade from live-tools >> 4.0.1
+	if dpkg-divert --package live-tools --list | grep -F /usr/bin/uptime.orig.procps
+	then
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.orig.procps /usr/bin/uptime
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man1/uptime.orig.procps.1.gz /usr/share/man/man1/uptime.1.gz
+	fi
+fi
+
+#DEBHELPER#
diff -Nru live-tools-4.0.2/debian/live-tools.preinst live-tools-4.0.2/debian/live-tools.preinst
--- live-tools-4.0.2/debian/live-tools.preinst	2014-12-10 10:04:17.000000000 +0100
+++ live-tools-4.0.2/debian/live-tools.preinst	2015-02-01 01:37:39.000000000 +0100
@@ -8,12 +8,6 @@
 		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
 
-		# upgrade from live-tools >> 4.0.1
-		if [ -e /usr/bin/uptime.orig.procps ]
-		then
-			dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.orig.procps /usr/bin/uptime
-			dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man1/uptime.orig.procps.1.gz /usr/share/man/man1/uptime.1.gz
-		fi
 		;;
 
 	abort-upgrade)