From 41e1ae746cef1251904d02c2d8efd6e2388181f6 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 27 May 2016 10:45:38 +0200
Subject: [PATCH] Import patches-unapplied version 2.412 to
 ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 7570a3c606be30378a9d53f3b73765ef7f0a47bf

New changelog entries:
  * rename the ubuntu-core snap to simply be "core", update the package
    summary too
---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ca6379b..c6e8b299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.412) yakkety; urgency=medium
+
+  * rename the ubuntu-core snap to simply be "core", update the package
+    summary too
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 27 May 2016 10:45:38 +0200
+
 livecd-rootfs (2.411) yakkety; urgency=medium
 
   [ Michael Vogt ]
diff --git a/live-build/auto/build b/live-build/auto/build
index cb40d4f8..be80bdb0 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -330,9 +330,9 @@ if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
         VERSION="$(lsb_release -r -s)+$(date +20%y%m%d.%H-%M)"
 
         cat > $rootfs/meta/snap.yaml <<EOF
-name: ubuntu-core
+name: core
 version: $VERSION
-summary: The ubuntu-core OS snap
+summary: The core runtime environment for snapd
 architectures: [$ARCH]
 type: os
 EOF
@@ -340,7 +340,7 @@ EOF
         apt-get -y install snapcraft
         snapcraft snap $rootfs
 
-        snapfile="$(ls ubuntu-core*.snap)"
+        snapfile="$(ls core*.snap)"
         cp -a $snapfile $PREFIX.os.snap
     fi
 fi