From 2fcba79a9b121a8a793652b05e4b77e54242cc47 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Mon, 13 Jun 2016 05:11:00 -0600 Subject: [PATCH] Import patches-unapplied version 2.417 to ubuntu/yakkety-proposed Imported using git-ubuntu import. Changelog parent: a98e648df2d65c60c459c258b6454c46f7b12be5 New changelog entries: * Swap order of security and updates in dvd sources.list. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5bceb9f7..ba92b6c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.417) yakkety; urgency=medium + + * Swap order of security and updates in dvd sources.list. + + -- Adam Conrad Mon, 13 Jun 2016 05:11:00 -0600 + livecd-rootfs (2.416) yakkety; urgency=medium * Fix security mirror sources.list entries for non-x86 architectures. diff --git a/live-build/auto/config b/live-build/auto/config index f49fafb3..1f596c27 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -727,8 +727,8 @@ case $PROJECT:$SUBPROJECT in cat > config/archives/dvd.list.binary << EOF deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse -deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse +deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse EOF if [ "$PROPOSED" ]; then cat >> config/archives/dvd.list.binary << EOF