[SCM] live-build branch, debian-next, updated. debian/3.0_a61-1-4-g26f2278

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 26f2278a23a2285208487ef0fec75111d61afe1d
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 30 20:14:05 2012 +0200

    Supporting parent distribution as a variable field in archive definitions.

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 18b6862..e4de5a2 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -224,12 +224,14 @@ EOF
 				if [ -e "${_BASE}/archives/${REPOSITORY}.chroot" ]
 				then
 					sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
+					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
 					    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 					"${_BASE}/archives/${REPOSITORY}.chroot" > \
 					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 				elif [ -e "${_BASE}/archives/${REPOSITORY}" ]
 				then
 					sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
+					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
 					    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 					"${_BASE}/archives/${REPOSITORY}" > \
 					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
@@ -268,8 +270,8 @@ EOF
 				if [ -e "${FILE}" ]
 				then
 					sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
-					    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 					    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 					"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
 
@@ -779,12 +781,14 @@ EOF
 				if [ -e "${_BASE}/archives/${REPOSITORY}.binary" ]
 				then
 					sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
+					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
 					    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 					"${_BASE}/archives/${REPOSITORY}.binary" > \
 					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
 				elif [ -e "${_BASE}/archives/${REPOSITORY}" ]
 				then
 					sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
+					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
 					    -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 					"${_BASE}/archives/${REPOSITORY}" > \
 					"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
@@ -823,8 +827,8 @@ EOF
 				if [ -e "${FILE}" ]
 				then
 					sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
-					    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
 					    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
 					"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)"
 

-- 
live-build