[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-2-g2a82747

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 2a82747531e50a1a0aa3b3eae7ce5960a4c2cbde
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 21 09:37:24 2010 +0100

    Adding --repositories, part 1.

diff --git a/helpers/config b/helpers/config
index 9bb9201..d1c594d 100755
--- a/helpers/config
+++ b/helpers/config
@@ -109,6 +109,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [-p|--packages-lists FILE]\n\
 \t    [--packages PACKAGE|\"PACKAGES\"]\n\
 \t    [--quiet]\n\
+\t    [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\
 \t    [--root-command sudo]\n\
 \t    [--use-fakeroot true|false]\n\
 \t    [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
@@ -135,7 +136,7 @@ Local_arguments ()
 	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:,
 		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
-		initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
+		initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
 		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-binary:,
 		mirror-binary-security:,mirror-binary-volatile:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
@@ -151,7 +152,7 @@ Local_arguments ()
 		help,ignore-system-defaults,quiet,usage,verbose,version"
 	# Remove spaces added by indentation
 	LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')"
-	ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}")"
+	ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")"
 
 	if [ "${?}" != "0" ]
 	then
@@ -330,6 +331,11 @@ Local_arguments ()
 				shift 2
 				;;
 
+			-r|--repositories)
+				LH_REPOSITORIES="${2}"
+				shift 2
+				;;
+
 			--root-command)
 				LH_ROOT_COMMAND="${2}"
 				shift 2
@@ -1072,6 +1078,10 @@ LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
 # (Default: autodetected)
 LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES}"
 
+# \$LH_REPOSITORIES: enable available third-party repositories
+# (Default: empty)
+LH_REPOSITORIES="${LH_REPOSITORIES}"
+
 # \$LH_PACKAGES: set packages to install
 # (Default: empty)
 LH_PACKAGES="${LH_PACKAGES}"
diff --git a/repositories/backports.debian-maintainers.org b/repositories/backports.debian-maintainers.org
new file mode 100644
index 0000000..4ebb205
--- /dev/null
+++ b/repositories/backports.debian-maintainers.org
@@ -0,0 +1,3 @@
+# Backports Maintainers
+deb http://backports.debian-maintainers.org/ @DISTRIBUTION@/backports @SECTIONS@
+deb-src http://backports.debian-maintainers.org/ @DISTRIBUTION@/backports @SECTIONS@
diff --git a/repositories/live.debian.net b/repositories/live.debian.net
new file mode 100644
index 0000000..3193c5c
--- /dev/null
+++ b/repositories/live.debian.net
@@ -0,0 +1,3 @@
+# Debian Live Project
+deb http://live.debian.net/ @DISTRIBUTION at -snapshots @SECTIONS@
+deb-src http://live.debian.net/ @DISTRIBUTION at -snapshots @SECTIONS@
diff --git a/repositories/unofficial.debian-maintainers.org b/repositories/unofficial.debian-maintainers.org
new file mode 100644
index 0000000..fe4f934
--- /dev/null
+++ b/repositories/unofficial.debian-maintainers.org
@@ -0,0 +1,3 @@
+# Unofficial Maintainers
+deb http://unofficial.debian-maintainers.org/ @DISTRIBUTION@ @SECTIONS@ restricted
+deb-src http://unofficial.debian-maintainers.org/ @DISTRIBUTION@ @SECTIONS@ restricted

-- 
live-helper