[SCM] live-tools branch, debian-next, updated. debian/3.0.2-1-2-gcadb635

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e44b3bc75e4dfc1385f34ff10c249ce7c1942b47
Author: Evgeni Golov <evgeni at debian.org>
Date:   Thu Jul 5 16:17:06 2012 +0200

    Installing the uptime to live-uptime link in the package, not in preinst (Closes: #679704).

diff --git a/debian/live-tools.links b/debian/live-tools.links
index 5a18980..76d2d47 100644
--- a/debian/live-tools.links
+++ b/debian/live-tools.links
@@ -5,3 +5,5 @@
 /usr/share/man/de/man7/live-tools.7.gz	/usr/share/man/de/man1/live-system.1.gz
 /usr/share/man/de/man7/live-tools.7.gz	/usr/share/man/de/man1/live-toram.1.gz
 /usr/share/man/de/man7/live-tools.7.gz	/usr/share/man/de/man1/live-uptime.1.gz
+
+/usr/bin/live-uptime			/usr/bin/uptime
diff --git a/debian/live-tools.postrm b/debian/live-tools.postrm
index 6c06daa..6618670 100644
--- a/debian/live-tools.postrm
+++ b/debian/live-tools.postrm
@@ -4,8 +4,6 @@ set -e
 
 case "${1}" in
 	remove)
-		rm -f /usr/bin/uptime
-
 		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.procps /usr/bin/uptime
 		;;
 
diff --git a/debian/live-tools.preinst b/debian/live-tools.preinst
index 8b02200..b505fce 100644
--- a/debian/live-tools.preinst
+++ b/debian/live-tools.preinst
@@ -5,8 +5,6 @@ set -e
 case "${1}" in
 	install|upgrade)
 		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/bin/uptime.procps /usr/bin/uptime
-
-		ln -s /usr/bin/live-uptime /usr/bin/uptime
 		;;
 
 	abort-upgrade)

-- 
live-tools