[SCM] live-build branch, debian-next, updated. debian/3.0_a51-1-30-g4abb4a4

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 14a43495cabfe99a05d601353e34b5a5eb0317ed
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 18 22:44:05 2012 +0200

    Correcting some distribution specific checks to make them derivatives compliant.

diff --git a/scripts/build/lb_binary_hdd b/scripts/build/lb_binary_hdd
index c1cd042..13f3f18 100755
--- a/scripts/build/lb_binary_hdd
+++ b/scripts/build/lb_binary_hdd
@@ -50,7 +50,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_DISTRIBUTION}" in
+		case "${LB_PARENT_DISTRIBUTION}" in
 			squeeze)
 				Check_package chroot/sbin/mkfs.ntfs ntfsprogs
 				;;
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index e4257ce..99a7695 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -357,9 +357,13 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		case "${LB_DISTRIBUTION}" in
-			wheezy|sid)
-				# FIXME: artax-backports once d-i has catched up
+		case "${LB_PARENT_DISTRIBUTION}" in
+			squeeze)
+
+				;;
+
+			*)
+				# FIXME: artax-backports too, once d-i has catched up
 				MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
 				;;
 		esac
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 0058f8e..f2540f8 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -88,7 +88,7 @@ EOF
 			case "${LB_MODE}" in
 				debian|progress)
 					case "${LB_PARENT_DISTRIBUTION}" in
-						sid|wheezy)
+						wheezy|sid)
 
 							;;
 
@@ -657,7 +657,7 @@ EOF
 			case "${LB_MODE}" in
 				debian|progress)
 					case "${LB_PARENT_DISTRIBUTION}" in
-						sid|wheezy)
+						wheezy|sid)
 
 							;;
 
diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian
index dcde7a4..910bef4 100755
--- a/scripts/build/lb_source_debian
+++ b/scripts/build/lb_source_debian
@@ -67,7 +67,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_DISTRIBUTION}" in
+		case "${LB_PARENT_DISTRIBUTION}" in
 			squeeze)
 				echo "ntfsprogs" >> source-selection.txt
 				;;

-- 
live-build