[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-16-g9b5fc09

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit fda74e43074d51b5aabcb898dba623c2d82a5b50
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 27 14:33:57 2012 +0200

    Removing bootstrap-include and bootstrap-exclude options.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index f51acbb..9649db7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -377,17 +377,6 @@ Set_defaults ()
 		fi
 	fi
 
-	# Include packages on base
-	case "${LB_MODE}" in
-		ubuntu|kubuntu)
-			LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE:-gnupg}"
-			;;
-
-	esac
-
-	# Exclude packages on base
-	# LB_BOOTSTRAP_EXCLUDE
-
 	# Setting bootstrap keyring
 	# LB_BOOTSTRAP_KEYRING
 
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index 0e75765..dc3c1c7 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -61,16 +61,6 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
 fi
 
-if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
-fi
-
-if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
-fi
-
 if [ -n "${LB_BOOTSTRAP_KEYRING}" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 5e9caf2..901b907 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -67,16 +67,6 @@ then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')"
 fi
 
-if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
-then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
-fi
-
-if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ]
-then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
-fi
-
 case "${LB_USE_FAKEROOT}" in
 	true)
 		DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 58f98a1..c22dc39 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1093,14 +1093,6 @@ cat > config/bootstrap << EOF
 # (Default: autodetected)
 LB_ARCHITECTURES="${LB_ARCHITECTURES}"
 
-# \$LB_BOOTSTRAP_INCLUDE: include packages on base
-# (Default: empty)
-LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE}"
-
-# \$LB_BOOTSTRAP_EXCLUDE: exclude packages on base
-# (Default: empty)
-LB_BOOTSTRAP_EXCLUDE="${LB_BOOTSTRAP_EXCLUDE}"
-
 # \$LB_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
 LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}"

-- 
live-build