[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.2-1-8-g31018d7
Daniel Baumann
daniel at debian.org
Tue Oct 12 09:03:14 UTC 2010
The following commit has been merged in the debian-old-2.0 branch:
commit 31018d7d5066c57cb139dd820ac7d2ef8aa5f7bd
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 12 11:03:40 2010 +0200
Updating special handling for backports.
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index fa69271..bd6bd8d 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1346,27 +1346,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
More information about the debian-live-changes
mailing list