Import patches-unapplied version 2.398 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: fa7136ad4d

New changelog entries:
  * switch snappy package builds from "snappy build" to "snapcraft snap"
  (LP: #1557515)

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.398) xenial; urgency=medium
+
+  * switch snappy package builds from "snappy build" to "snapcraft snap"
+  (LP: #1557515)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 08 Apr 2016 16:45:48 +0200
+
 livecd-rootfs (2.397) xenial; urgency=medium
 
   * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:

live-build/auto/build

@@ -337,8 +337,8 @@ architectures: [$ARCH]
 type: os
 EOF
 
-        apt-get -y install ubuntu-snappy-cli
+        apt-get -y install snapcraft
-        snappy build --squashfs $rootfs
+        snapcraft snap $rootfs
 
         snapfile="$(ls ubuntu-core*.snap)"
         cp -a $snapfile $PREFIX.os.snap
@@ -577,8 +577,8 @@ EOF
         fi
         cd $HERE
 
-        apt-get -y install ubuntu-snappy-cli
+        apt-get -y install snapcraft
-        snappy build --squashfs snap
+        snapcraft snap snap
 
         snapfile="$(ls $metaname*.snap)"
         cp -a $snapfile $PREFIX.$snapname