[SCM] live-build branch, debian, updated. debian/3.0_a54-1-21-g227ae76

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit a16be4ab5e706f07997de6c03d4edd35537368c4
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 27 23:29:19 2012 +0200

    Updating all distribution specific selectors in defaults to be as future proof as possible.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c9b9e00..f194a8b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -56,7 +56,7 @@ Set_defaults ()
 			;;
 
 		ubuntu|kubuntu)
-			LB_DISTRIBUTION="${LB_DISTRIBUTION:-oneiric}"
+			LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}"
 			LB_DERIVATIVE="false"
 			;;
 
@@ -81,6 +81,11 @@ Set_defaults ()
 					;;
 
 				baureo)
+					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}"
+					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
+					;;
+
+				charon)
 					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}"
 					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
 					;;
@@ -293,7 +298,7 @@ Set_defaults ()
 	fi
 
 	# Setting tasksel
-	case "${LB_DISTRIBUTION}" in
+	case "${LB_PARENT_DISTRIBUTION}" in
 		squeeze)
 			LB_TASKSEL="${LB_TASKSEL:-tasksel}"
 			;;
@@ -748,13 +753,13 @@ Set_defaults ()
 							;;
 
 						*)
-							case "${LB_DISTRIBUTION}" in
-								wheezy|sid)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
+							case "${LB_PARENT_DISTRIBUTION}" in
+								squeeze)
+									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
 									;;
 
 								*)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
+									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
 									;;
 							esac
 							;;
@@ -848,8 +853,8 @@ Set_defaults ()
 			;;
 
 		*)
-			case "${LB_DISTRIBUTION}" in
-				squeeze|artax)
+			case "${LB_PARENT_DISTRIBUTION}" in
+				squeeze)
 					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image-2.6}"
 					;;
 
@@ -864,8 +869,8 @@ Set_defaults ()
 	LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}"
 
 	# Setting security updates option
-	case "${LB_DISTRIBUTION}" in
-		wheezy|sid|precise)
+	case "${LB_PARENT_DISTRIBUTION}" in
+		jessie|sid)
 			LB_SECURITY="${LB_SECURITY:-false}"
 			;;
 
@@ -875,8 +880,8 @@ Set_defaults ()
 	esac
 
 	# Setting volatile updates option
-	case "${LB_DISTRIBUTION}" in
-		wheezy|sid|precise)
+	case "${LB_PARENT_DISTRIBUTION}" in
+		jessie|sid)
 			LB_VOLATILE="${LB_VOLATILE:-false}"
 			;;
 
@@ -948,7 +953,7 @@ Set_defaults ()
 			;;
 
 		*)
-			case "${LB_DISTRIBUTION}" in
+			case "${LB_PARENT_DISTRIBUTION}" in
 				squeeze)
 					LB_COMPRESSION="${LB_COMPRESSION:-gzip}"
 					;;
diff --git a/functions/echo.sh b/functions/echo.sh
index fa6b888..9daabd1 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -193,8 +193,8 @@ Echo_file ()
 
 Echo_breakage ()
 {
-	case "${LB_DISTRIBUTION}" in
-		sid|unstable)
+	case "${LB_PARENT_DISTRIBUTION}" in
+		sid)
 			Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution."
 			;;
 		*)

-- 
live-build