[SCM] live-build branch, debian-next, updated. debian/3.0_a13-1-13-g863ecba

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 2d25d1f140eccfbd7a29abd7e4f670fa7e2e3f13
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 24 20:26:29 2011 +0100

    Removing obsolete debian-backports auto-configuration.

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 91de350..c3ae0eb 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -393,15 +393,7 @@ Local_arguments ()
 
 			-d|--distribution)
 				LB_DISTRIBUTION="${2}"
-				BACKPORTS="false"
 				shift 2
-
-				case "${LB_DISTRIBUTION}" in
-					squeeze-backports)
-						LB_DISTRIBUTION="squeeze"
-						BACKPORTS="true"
-						;;
-				esac
 				;;
 
 			--parent-distribution)
@@ -1413,31 +1405,6 @@ then
 	fi
 fi
 
-if [ "${BACKPORTS}" = "true" ]
-then
-	# Adding sources.list entry
-
-cat > config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot << EOF
-# Backports Maintainers
-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=Debian Backports" config/chroot_apt/preferences
-	then
-
-cat >> config/chroot_apt/preferences << EOF
-Package: *
-Pin: release o=Debian Backports
-Pin-Priority: 999
-EOF
-
-	fi
-fi
-
 # Checking defaults again
 Check_defaults
 

-- 
live-build