[SCM] live-build branch, debian-next, updated. debian/3.0_a30-1-22-gc1169e2

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c1169e2491a3257a12aa3c5f1826fd44156c3ad4
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 16:02:03 2011 +0200

    Setting origin in apt release files for local packages to config/packages.chroot.

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 2e00004..5a097c7 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -113,7 +113,7 @@ case "${1}" in
 			echo >> chroot/etc/apt/preferences
 			echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences
 			echo "Package: *" >> chroot/etc/apt/preferences
-			echo "Pin: release o=chroot_packages" >> chroot/etc/apt/preferences
+			echo "Pin: release o=config/packages.chroot" >> chroot/etc/apt/preferences
 
 			case "${1}" in
 				install)
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index ab767ab..f1b22ed 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -337,7 +337,7 @@ EOF
 
 				# Generate Release
 				echo "cd /root/packages && apt-ftparchive \
-					-o APT::FTPArchive::Release::Origin=chroot_packages \
+					-o APT::FTPArchive::Release::Origin=config/packages.chroot \
 					release . > Release" | Chroot chroot sh
 
 				if [ "${LB_APT_SECURE}" = "true" ]

-- 
live-build