[SCM] live-build branch, debian-next, updated. debian/3.0_a48-1-9-ga666a80

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a666a80a4fa2739ba7dcdfa77926ea1c0d458c88
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 3 08:26:38 2012 +0200

    Renaming config/binary_debian-installer-includes to config/includes.binary_debian-installer for consistency with the other include directories.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index a309898..f2f7b20 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -831,14 +831,14 @@ then
 	fi
 fi
 
-# Include content of config/binary_debian-installer-includes if exists and not empty
-if [ -d config/binary_debian-installer-includes ] && [ -n "$(ls -A config/binary_debian-installer-includes)" ]
+# Include content of config/includes.binary_debian-installer if exists and not empty
+if [ -d config/includes.binary_debian-installer ] && [ -n "$(ls -A config/includes.binary_debian-installer)" ]
 then
-	Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/binary_debian-installer-includes
+	Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.binary_debian-installer
 
 	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
 	then
-		Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/binary_debian-installer-includes
+		Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.binary_debian-installer
 	fi
 fi
 
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index f1ae30c..987ce49 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1271,9 +1271,9 @@ EOF
 
 # Creating lb_binary_* configuration
 mkdir -p config/binary_debian-installer
-mkdir -p config/binary_debian-installer-includes
 mkdir -p config/binary_grub
 mkdir -p config/includes.binary
+mkdir -p config/includes.binary_debian-installer
 mkdir -p config/packages.binary
 mkdir -p config/package-lists
 mkdir -p config/binary_rootfs

-- 
live-build