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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 039df15831fb6eda461fe329df6a85b056ff66f7
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 16:33:53 2011 +0200

    Using config/includes.binary rather than config/binary_local-includes.

diff --git a/scripts/build/lb_binary_local-includes b/scripts/build/lb_binary_local-includes
index 627e683..6ec33ac 100755
--- a/scripts/build/lb_binary_local-includes
+++ b/scripts/build/lb_binary_local-includes
@@ -38,10 +38,10 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if Find_files config/binary_local-includes/
+if Find_files config/includes.binary/
 then
 	# Copying includes
-	cd config/binary_local-includes
+	cd config/includes.binary
 	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
 	cd "${OLDPWD}"
 
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index a1b2a0e..45f583b 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1233,7 +1233,7 @@ mkdir -p config/binary_debian-installer
 mkdir -p config/binary_debian-installer-includes
 mkdir -p config/binary_grub
 mkdir -p config/binary_local-debs
-mkdir -p config/binary_local-includes
+mkdir -p config/includes.binary
 mkdir -p config/package-lists
 mkdir -p config/binary_local-udebs
 mkdir -p config/binary_rootfs

-- 
live-build