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

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 52bdb68d181a68108213054dace2bb486c5504dc
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 12 10:08:29 2012 +0200

    Changing default binary.list filename to binary.contents to make it more explicit and not to be confused with package lists.

diff --git a/frontends/cron/live-build-cron-images b/frontends/cron/live-build-cron-images
index 48c8d31..e5bd740 100755
--- a/frontends/cron/live-build-cron-images
+++ b/frontends/cron/live-build-cron-images
@@ -196,7 +196,7 @@ Build ()
 			lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log
 
 			mv binary*.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso
-			mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list
+			mv binary.contents debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list
 			mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.packages
 
 			if [ "${ARCHITECTURE}" != "powerpc" ]
@@ -206,7 +206,7 @@ Build ()
 				lb binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log
 
 				mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img
-				mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list
+				mv binary.contents debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list
 				mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.packages
 			fi
 
@@ -219,7 +219,7 @@ Build ()
 				lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.log
 
 				mv binary-net.tar.gz debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz
-				mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list
+				mv binary.contents debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list
 				mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.packages
 
 				mv binary/*/filesystem.squashfs debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.squashfs
diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums
index b5ba6b9..d86b55d 100755
--- a/scripts/build/lb_binary_checksums
+++ b/scripts/build/lb_binary_checksums
@@ -79,7 +79,7 @@ done
 
 # File list
 cd binary
-find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.list
+find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.contents
 cd "${OLDPWD}"
 
 # Creating stage file
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index e61c14b..417ce4f 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -99,7 +99,7 @@ do
 			rm -f binary*.img
 			rm -f binary*.tar.gz
 			rm -f binary.sh
-			rm -f binary.list binary.packages md5sum.txt
+			rm -f binary.contents binary.packages md5sum.txt
 
 			rm -rf binary
 			rm -rf tftpboot

-- 
live-build