[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f

Daniel Baumann daniel at debian.org
Wed Sep 7 15:43:12 UTC 2011


The following commit has been merged in the debian branch:
commit d218383d8381d1f6a6b2c581631ed710e4258423
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 16:37:58 2011 +0200

    Using config/packages.binary instead of config/binary_local-debs.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 2605093..f41a8a5 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -446,17 +446,17 @@ then
 	fi
 
 	# Including local debs
-	if Find_files config/binary_local-debs/*_"${LB_ARCHITECTURES}".deb
+	if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb
 	then
-		for FILE in config/binary_local-debs/*_"${LB_ARCHITECTURES}".deb
+		for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb
 		do
 			Install_file "${FILE}" "binary/pool/main"
 		done
 	fi
 
-	if Find_files config/binary_local-debs/*_all.deb
+	if Find_files config/packages.binary/*_all.deb
 	then
-		for FILE in config/binary_local-debs/*_all.deb
+		for FILE in config/packages.binary/*_all.deb
 		do
 			Install_file "${FILE}" "binary/pool/main"
 		done

-- 
live-build



More information about the debian-live-changes mailing list