[SCM] live-build branch, debian, updated. debian/3.0_a59-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit e12985ac97c48006020808cddba44326eeff3550
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Aug 29 15:58:42 2012 +0200

    Adding baureo-backports and charon-backports as valid distributions in progress mode.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index a6c1ea7..98ace32 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -68,23 +68,17 @@ Set_defaults ()
 	case "${LB_MODE}" in
 		progress)
 			case "${LB_DISTRIBUTION}" in
-				artax)
+				artax|artax-backports)
 					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
 					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
 					;;
 
-
-				artax-backports)
-					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
-					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
-					;;
-
-				baureo)
+				baureo|baureo-backports)
 					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}"
 					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
 					;;
 
-				charon)
+				charon|charon-backports)
 					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}"
 					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
 					;;

-- 
live-build