[SCM] live-build branch, debian-next, updated. debian/3.0_a10-1-22-gd0aea9b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d0aea9bc89517b9863ece6c02ab1347bb81213af
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 8 11:05:19 2011 +0100

    Updating parent distribution defaults for progress.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 0a63368..d9a2ef2 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -20,24 +20,33 @@ Set_defaults ()
 	# Setting distribution name
 	case "${LB_MODE}" in
 		progress)
-			_DERIVATIVE="true"
-
 			LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}"
-			LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
 			;;
 
 		ubuntu)
-			_DERIVATIVE="false"
-
 			LB_DISTRIBUTION="${LB_DISTRIBUTION:-karmic}"
-			LB_PARENT_DISTRIBUTION="${LB_DISTRIBUTION}"
 			;;
 
 		*)
-			_DERIVATIVE="false"
-
 			LB_DISTRIBUTION="${LB_DISTRIBUTION:-squeeze}"
-			LB_PARENT_DISTRIBUTION="${LB_DISTRIBUTION}"
+			;;
+	esac
+
+	case "${LB_MODE}" in
+		progress)
+			case "${LB_DISTRIBUTION}" in
+				artax|artax-backports)
+					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
+					;;
+
+				baureo)
+					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}"
+					;;
+			esac
+			;;
+
+		*)
+			LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-${LB_DISTRIBUTION}}"
 			;;
 	esac
 

-- 
live-build