[SCM] live-build branch, debian-next, updated. debian/3.0_a33-1-9-g6e168eb

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6e168eb0fbc6ab68c38b6fd8e8a2593a4f17c281
Author: Adam Conrad <adconrad at ubuntu.com>
Date:   Fri Sep 30 12:06:31 2011 +0200

    Using the correct mirror locations for Ubuntu ports.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index f8a3df6..21a0412 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -372,7 +372,7 @@ Set_defaults ()
 					;;
 
 				*)
-					LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/}"
+					LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/ubuntu-ports/}"
 					;;
 			esac
 
@@ -407,7 +407,7 @@ Set_defaults ()
 					;;
 
 				*)
-					LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/}"
+					LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
 					;;
 			esac
 
@@ -434,7 +434,7 @@ Set_defaults ()
 					;;
 
 				*)
-					LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/}"
+					LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/ubuntu-ports/}"
 					;;
 			esac
 
@@ -488,7 +488,7 @@ Set_defaults ()
 				;;
 
 				*)
-					LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ports.ubuntu.com/}"
+					LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ports.ubuntu.com/ubuntu-ports/}"
 					;;
 			esac
 
@@ -520,7 +520,7 @@ Set_defaults ()
 					;;
 
 				*)
-					LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/}"
+					LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
 					;;
 			esac
 
@@ -547,7 +547,7 @@ Set_defaults ()
 					;;
 
 				*)
-					LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/}"
+					LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/ubuntu-ports/}"
 					;;
 			esac
 			;;

-- 
live-build