From 1ab44006f5221aee34464d786400d4e623fbea57 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 13 Apr 2016 22:57:39 -0600 Subject: [PATCH] Import patches-unapplied version 2.400 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 9fadf2c64882f8ffe3c5cc7698f2fc9b85733521 New changelog entries: * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd. --- debian/changelog | 6 ++++++ live-build/auto/config | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1709a4f6..a75d0f2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.400) xenial; urgency=medium + + * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd. + + -- Adam Conrad Wed, 13 Apr 2016 22:57:39 -0600 + livecd-rootfs (2.399) xenial; urgency=medium [ Oliver Grawert ] diff --git a/live-build/auto/config b/live-build/auto/config index e377b12a..937b683b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -365,7 +365,8 @@ case $PROJECT in add_package install ppp add_package install watchdog # no Task: header yet - add_package install ubuntu-snappy + add_package install snapd + add_package install ubuntu-core-snapd-units # no minimal as we want to be really minimal #add_task install minimal