[SCM] live-build branch, debian-next, updated. debian/3.0_a30-1-27-g04f93bf

Daniel Baumann daniel at debian.org
Wed Sep 7 14:39:56 UTC 2011


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

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

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index f41a8a5..1103a73 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -520,9 +520,9 @@ then
 	cp *.udeb ../cache/packages_debian-installer.udeb
 
 	# Including local udebs
-	if Find_files ../config/binary_local-udebs/*_"${LB_ARCHITECTURES}".udeb
+	if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb
 	then
-		for FILE in ../config/binary_local-udebs/*_"${LB_ARCHITECTURES}".udeb
+		for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb
 		do
 			Install_file "${FILE}" "pool/main"
 
@@ -531,9 +531,9 @@ then
 		done
 	fi
 
-	if Find_files ../config/binary_local-udebs/*_all.udeb
+	if Find_files ../config/packages.binary/*_all.udeb
 	then
-		for FILE in ../config/binary_local-udebs/*_all.udeb
+		for FILE in ../config/packages.binary/*_all.udeb
 		do
 			Install_file "${FILE}" "pool/main"
 

-- 
live-build



More information about the debian-live-changes mailing list