[SCM] live-build branch, debian-next, updated. debian/3.0_a19-1-8-g0633d3b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 0633d3bc96a513b26f0728077d9dfd9fc2ee5788
Author: Colin Watson <cjwatson at canonical.com>
Date:   Fri Jun 10 17:41:07 2011 +0100

    Fix incorrect Ubuntu defaults for security and volatile mirrors (Closes: #630080).

diff --git a/functions/defaults.sh b/functions/defaults.sh
index adbe65e..5b0f57d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -381,7 +381,7 @@ Set_defaults ()
 		ubuntu)
 			case "${LB_ARCHITECTURES}" in
 				amd64|i386)
-					LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://security.ubuntu.com/ubuntu/}"
+					LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://archive.ubuntu.com/ubuntu/}"
 					;;
 
 				*)
@@ -467,7 +467,7 @@ Set_defaults ()
 		ubuntu)
 			case "${LB_ARCHITECTURES}" in
 				amd64|i386)
-					LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://archive.ubuntu.com/ubuntu/}"
+					LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
 					;;
 
 				*)
@@ -494,7 +494,7 @@ Set_defaults ()
 		ubuntu)
 			case "${LB_ARCHITECTURES}" in
 				amd64|i386)
-					LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://security.ubuntu.com/ubuntu/}"
+					LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://archive.ubuntu.com/ubuntu/}"
 					;;
 
 				*)

-- 
live-build