[SCM] live-tools branch, debian-next, updated. debian/3.0.3-1-8-gea3b18c

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 32a6f48f2244a185ee96a56979ec8580d380d65d
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jul 24 18:09:15 2012 +0200

    Also diverting uptime manpage from procps (Closes: #682574).

diff --git a/debian/live-tools.links b/debian/live-tools.links
index 76d2d47..7dc9344 100644
--- a/debian/live-tools.links
+++ b/debian/live-tools.links
@@ -7,3 +7,4 @@
 /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
+/usr/share/man/man7/live-tools.7.gz	/usr/share/man/man1/uptime.1.gz
diff --git a/debian/live-tools.postrm b/debian/live-tools.postrm
index 6618670..aa860ef 100644
--- a/debian/live-tools.postrm
+++ b/debian/live-tools.postrm
@@ -5,6 +5,7 @@ set -e
 case "${1}" in
 	remove)
 		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
 		;;
 
 	purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/live-tools.preinst b/debian/live-tools.preinst
index b505fce..9945fe7 100644
--- a/debian/live-tools.preinst
+++ b/debian/live-tools.preinst
@@ -5,6 +5,7 @@ set -e
 case "${1}" in
 	install|upgrade)
 		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/bin/uptime.procps /usr/bin/uptime
+		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man1/uptime.procps.1.gz /usr/share/man/man1/uptime.1.gz
 		;;
 
 	abort-upgrade)

-- 
live-tools