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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 346a4160c802c738f709b4323b5ab0aa19ce5110
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Oct 12 11:04:10 2010 +0200

    Updating special handling for backports.

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 3d0583e..9a2f82b 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1331,27 +1331,23 @@ then
 
 cat > config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot << EOF
 # Backports Maintainers
-deb http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
-deb-src http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
+deb http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}
+deb-src http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}
 EOF
 
 	cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot config/chroot_sources/${LB_DISTRIBUTION}-backports.binary
 
 	# Adding apt preferences
-	if ! grep -qs "^Pin: release o=backports.debian-maintainers.org" config/chroot_apt/preferences
+	if ! grep -qs "^Pin: release o=Debian Backports" config/chroot_apt/preferences
 	then
 
 cat >> config/chroot_apt/preferences << EOF
 Package: *
-Pin: release o=backports.debian-maintainers.org
+Pin: release o=Debian Backports
 Pin-Priority: 999
 EOF
 
 	fi
-
-	# Addding archive signing key
-	wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg
-	cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LB_DISTRIBUTION}-backports.binary.gpg
 fi
 
 # Checking defaults again

-- 
live-build