From 61e05b928da0570f1dd7eadff817719c1d36b89c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 5 Aug 2014 08:34:27 +0200 Subject: [PATCH] Import patches-unapplied version 2.235 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 5264712d26587dde7e8591dec2370d4a26bd2b74 New changelog entries: * Only add the ubuntu-core hooks for the system-image subproject. --- debian/changelog | 6 ++++++ live-build/auto/config | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1671a8be..b8ab2608 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.235) utopic; urgency=medium + + * Only add the ubuntu-core hooks for the system-image subproject. + + -- Colin Watson Tue, 05 Aug 2014 08:34:27 +0200 + livecd-rootfs (2.234) utopic; urgency=medium [ James Hunt ] diff --git a/live-build/auto/config b/live-build/auto/config index 743ec985..e51be32d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -545,8 +545,8 @@ EOF config/archives/proposed.list.binary fi -case $PROJECT in - *-dvd) +case $PROJECT:$SUBPROJECT in + *-dvd:*) . config/bootstrap cat > config/archives/dvd.list.binary << EOF @@ -561,7 +561,7 @@ EOF fi ;; - ubuntu-touch|ubuntu-core) + ubuntu-touch:*|ubuntu-core:system-image) cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ ;;