From 81c1d20b74056ca027e095b36f05073e632deb8e Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 5 Jun 2015 15:06:07 +0200 Subject: [PATCH] Import patches-unapplied version 2.308 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 123b33de50658a03ee97dbe50f26f4922e4ec44b New changelog entries: * Copy desktop-next hooks in the configuration --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b4a3e82e..1b2c298e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.308) wily; urgency=medium + + * Copy desktop-next hooks in the configuration + + -- Sebastien Bacher Fri, 05 Jun 2015 15:06:07 +0200 + livecd-rootfs (2.307) wily; urgency=medium * Remove duplicated code leftover in the previous desktop-next changeset diff --git a/live-build/auto/config b/live-build/auto/config index ceabd07c..11d8e400 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -665,7 +665,7 @@ EOF fi ;; - ubuntu-touch:*|ubuntu-core:system-image|ubuntu-cpc:*) + ubuntu-touch:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*) cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ ;;