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

Tue Aug 14 21:15:38 UTC 2012

The following commit has been merged in the debian-next branch:
commit 3d993d3602513c5e20da513e1633ac39fe53a24d
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 23:15:25 2012 +0200

    Moving from cdn.debian.net to http.debian.net as binary mirror.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 0598ead..1d411c6 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -512,7 +512,7 @@ Set_defaults ()
 	# Setting mirror which ends up in the image
 	case "${LB_MODE}" in
 		debian)
-			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://cdn.debian.net/debian/}"
+			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://http.debian.net/debian/}"
 			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
 			;;
 
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index b834507..7ba08ff 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -589,11 +589,11 @@ sets the location of the debian package mirror that should end up configured
 in the final image and which is the one a user would see and use. This has
 not necessarily to be the same that is used to build the image, e.g. if you
 use a local mirror but want to have an official mirror in the image. By
-default, 'http://cdn.debian.net/debian/' is used.
+default, 'http://http.debian.net/debian/' is used.
 .IP "\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP" 4
 sets the location of the debian security package mirror that should end up
-configured in the final image. By default,
-\&'http://cdn.debian.net/debian\-security/' is used.
+configured in the final image. By default, 'http://security.debian.org/' is
+used.
 .IP "\fB\-\-parent\-mirror\-binary\-volatile\fP \fIURL\fP" 4
 sets the location of the debian volatile package mirror that should end up
 configured in the final image. By default, the value of
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 9c1dfcf..18c776d 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -388,9 +388,9 @@ sets the location of the debian volatile package mirror that will be used to fet
 .IP "\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR" 4
 sets the location of the debian backports package mirror that will be used to fetch packages in order to build the live system. By default, this points to http://backports.debian.org/debian-backports/.
 .IP "\fB\-\-parent\-mirror\-binary\fR \fIURL\fR" 4
-sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://cdn.debian.net/debian/' is used.
+sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://http.debian.net/debian/' is used.
 .IP "\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR" 4
-sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://cdn.debian.net/debian-security/' is used.
+sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://security.debian.org/' is used.
 .IP "\fB\-\-parent\-mirror\-binary\-volatile\fR \fIURL\fR" 4
 sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-parent\-mirror\-binary is used.
 .IP "\fB\-\-parent\-mirror\-binary\-backports\fR \fIURL\fR" 4
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 4261de1..805bd7a 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-14 21:05+0300\n"
+"POT-Creation-Date: 2012-08-14 23:13+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -1786,7 +1786,7 @@ msgid ""
 "in the final image and which is the one a user would see and use. This has "
 "not necessarily to be the same that is used to build the image, e.g. if you "
 "use a local mirror but want to have an official mirror in the image. By "
-"default, 'http://cdn.debian.net/debian/' is used."
+"default, 'http://http.debian.net/debian/' is used."
 msgstr ""
 
 #. type: IP
@@ -1799,8 +1799,8 @@ msgstr ""
 #: en/lb_config.1:394
 msgid ""
 "sets the location of the debian security package mirror that should end up "
-"configured in the final image. By default, 'http://cdn.debian.net/debian-"
-"security/' is used."
+"configured in the final image. By default, 'http://security.debian.org/' is "
+"used."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 84aa98b..63f95fc 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-14 21:05+0300\n"
+"POT-Creation-Date: 2012-08-14 23:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1786,7 +1786,7 @@ msgid ""
 "in the final image and which is the one a user would see and use. This has "
 "not necessarily to be the same that is used to build the image, e.g. if you "
 "use a local mirror but want to have an official mirror in the image. By "
-"default, 'http://cdn.debian.net/debian/' is used."
+"default, 'http://http.debian.net/debian/' is used."
 msgstr ""
 
 #. type: IP
@@ -1799,8 +1799,8 @@ msgstr ""
 #: en/lb_config.1:394
 msgid ""
 "sets the location of the debian security package mirror that should end up "
-"configured in the final image. By default, 'http://cdn.debian.net/debian-"
-"security/' is used."
+"configured in the final image. By default, 'http://security.debian.org/' is "
+"used."
 msgstr ""
 
 #. type: IP

-- 
live-build

