[SCM] live-build branch, debian, updated. debian/3.0_a46-1-21-g4b333fb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 02a0e0b64fb8e6315338ec43ea670d3cfe44cf40
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Apr 11 09:00:42 2012 +0200

    Temporarily including bzip2 manually when bootstrapping until #657560 has been fixed in unstable.

diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index 2bf892d..4b439d3 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -52,6 +52,9 @@ Create_lockfile .lock
 # Creating chroot directory
 mkdir -p chroot
 
+# Temporarily including bzip2 manually until #657560 has been fixed in unstable
+CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=bzip2"
+
 # Setting cdebootstrap options
 if [ -n "${LB_ARCHITECTURES}" ]
 then
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 3aeed80..b83ee02 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -52,6 +52,9 @@ Create_lockfile .lock
 # Creating chroot directory
 mkdir -p chroot
 
+# Temporarily including bzip2 manually until #657560 has been fixed in unstable
+DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=bzip2"
+
 # Setting debootstrap options
 if [ -n "${LB_ARCHITECTURES}" ]
 then

-- 
live-build