[SCM] live-build branch, debian-next, updated. debian/3.0_a17-1-1-g3f36f6b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3f36f6ba4b513c892cb3b6f9f7da696ec357f49f
Author: Colin Watson <cjwatson at canonical.com>
Date:   Sat May 21 10:50:09 2011 +0200

    Fix duplicate deconfiguration of apt, upstart, and sysv-rc if build-with-chroot is false (Closes: #627406).

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 0b48941..738363d 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -93,15 +93,15 @@ if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Deconfiguring chroot
 	rm -f .stage/chroot_sources
+	lb chroot_apt remove ${*}
+	lb chroot_upstart remove ${*}
+	lb chroot_sysv-rc remove ${*}
 	lb chroot_hostname remove ${*}
 	lb chroot_resolv remove ${*}
 	lb chroot_hosts remove ${*}
 fi
 
-lb chroot_apt remove ${*}
-lb chroot_sysv-rc remove ${*}
 lb chroot_sysfs remove ${*}
-lb chroot_upstart remove ${*}
 lb chroot_selinuxfs remove ${*}
 lb chroot_proc remove ${*}
 lb chroot_devpts remove ${*}

-- 
live-build