[SCM] live-build branch, debian-next, updated. debian/3.0_a7-1-1-gefaa2ac

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit efaa2ac6a3114d42d179f44fc904d37b33675365
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 23 10:36:48 2010 +0100

    Replacing last occurences of lh with lb.

diff --git a/functions/conffile.sh b/functions/conffile.sh
index 02730df..65a0357 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -17,9 +17,9 @@ Get_conffiles ()
 		for FILE in ${@}
 		do
 			FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
-			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
-			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
-			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
+			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')"
+			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}"
+			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}"
 		done
 	fi
 
diff --git a/functions/man.sh b/functions/man.sh
index 672ed7b..c039a39 100755
--- a/functions/man.sh
+++ b/functions/man.sh
@@ -12,7 +12,7 @@ Man ()
 {
 	if [ -x "$(which man 2>/dev/null)" ]
 	then
-		man lh_$(basename ${0})
+		man lb_$(basename ${0})
 		exit 0
 	fi
 }
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 3a21525..da3b036 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -122,7 +122,7 @@ case "${1}" in
 		if Find_files config/chroot_local-packages/*.deb
 		then
 			echo >> chroot/etc/apt/preferences
-			echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences
+			echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences
 			echo "Package: *" >> chroot/etc/apt/preferences
 			echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
 
@@ -133,7 +133,7 @@ case "${1}" in
 					;;
 
 				install-binary)
-					# Ensure local packages are not re-installed during lh_binary
+					# Ensure local packages are not re-installed during lb_binary
 					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
 
 					echo >> chroot/etc/apt/preferences
@@ -220,8 +220,8 @@ case "${1}" in
 		then
 			if [ -f chroot/etc/apt/preferences ]
 			then
-				# delete additions from lh_chroot_apt install|install-binary to preferences
-				sed -i '/# Added by lh_chroot_apt/,$d' chroot/etc/apt/preferences
+				# delete additions from lb_chroot_apt install|install-binary to preferences
+				sed -i '/# Added by lb_chroot_apt/,$d' chroot/etc/apt/preferences
 				# delete the last empty line
 				sed -i '${/^[[:blank:]]*$/d;}' chroot/etc/apt/preferences
 				# if the resulting preferences file is empty there was no user additions, remove it
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 257a7b6..6772519 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -946,7 +946,7 @@ GZIP_OPTIONS="${GZIP_OPTIONS}"
 ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
 EOF
 
-# Creating lh_bootstrap_* configuration
+# Creating lb_bootstrap_* configuration
 cat > config/bootstrap << EOF
 # config/bootstrap - options for live-build(7), bootstrap stage
 
@@ -1023,7 +1023,7 @@ LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
 LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
 EOF
 
-# Creating lh_chroot_* configuration
+# Creating lb_chroot_* configuration
 mkdir -p config/chroot_apt
 mkdir -p config/chroot_local-hooks
 mkdir -p config/chroot_local-includes
@@ -1109,7 +1109,7 @@ LB_BACKPORTS="${LB_BACKPORTS}"
 LB_SYSVINIT="${LB_SYSVINIT}"
 EOF
 
-# Creating lh_binary_* configuration
+# Creating lb_binary_* configuration
 mkdir -p config/binary_debian-installer
 mkdir -p config/binary_debian-installer-includes
 mkdir -p config/binary_grub
@@ -1258,7 +1258,7 @@ LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME}"
 LB_USERNAME="${LB_USERNAME}"
 EOF
 
-# Creating lh_source_* configuration
+# Creating lb_source_* configuration
 cat > config/source << EOF
 # config/source - options for live-build(7), source stage
 

-- 
live-build