Import patches-unapplied version 2.274 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: c9aadc4a69

New changelog entries:
  [ Michael Vogt ]
  * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary:
    - improve apt-get output
  * live-build/auto/config:
    - add click-apparmor for system-image
  * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary:
    - fix incorrect "echo"
    - add missing wrappers for apt, apt-cache
    - fix message
  * live-build/ubuntu-core/hooks/14-set-motd.chroot:
    - update motd
  [ James Hunt ]
  * live-build/ubuntu-core/hooks/10-remove-documentation.binary:
    - compress remaining documentation to save further space.

debian/changelog

@@ -1,3 +1,23 @@
+livecd-rootfs (2.274) vivid; urgency=medium
+
+  [ Michael Vogt ]
+  * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary:
+    - improve apt-get output
+  * live-build/auto/config:
+    - add click-apparmor for system-image
+  * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary:
+    - fix incorrect "echo"
+    - add missing wrappers for apt, apt-cache
+    - fix message
+  * live-build/ubuntu-core/hooks/14-set-motd.chroot:
+    - update motd
+
+  [ James Hunt ]
+  * live-build/ubuntu-core/hooks/10-remove-documentation.binary:
+    - compress remaining documentation to save further space.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 10 Dec 2014 12:57:30 +0100
+
 livecd-rootfs (2.273) vivid; urgency=low
 
   [ Michael Vogt ]

live-build/auto/config

@@ -355,6 +355,7 @@ case $PROJECT in
 		        add_package install libpam-systemd
                         add_package install isc-dhcp-client
                         add_package install resolvconf
+                        add_package install click-apparmor
 
                         # add special azure package
                         case $ARCH in

live-build/ubuntu-core/hooks/10-remove-documentation.binary

@@ -3,6 +3,7 @@
 echo "I: Remove unneeded files from /usr/share/doc "
 find binary/boot/filesystem.dir/usr/share/doc -depth -type f ! -name copyright|xargs rm -f || true
 find binary/boot/filesystem.dir/usr/share/doc -empty|xargs rmdir || true
+find binary/boot/filesystem.dir/usr/share/doc -type f -exec gzip -9 {} \;
 
 echo "I: Remove man/info pages"
 rm -rf binary/boot/filesystem.dir/usr/share/man \

live-build/ubuntu-core/hooks/14-set-motd.chroot

@@ -1,11 +1,12 @@
 #!/bin/sh
 
 cat >/etc/motd<<EOF
-Welcome to Ubuntu Core (development branch)
+Welcome to the Ubuntu Core rolling development release.
 
  * See https://ubuntu.com/snappy
 
-Surprise! It's a brave new Ubuntu world here in the snappy development
-channel. Ubuntu Core does not use APT, see 'snappy --help' for ideas
-on how to make the most of this transactional system.
+It's a brave new world here in snappy Ubuntu Core! This machine
+does not use apt-get or deb packages. Please see 'snappy --help'
+for app installation and transactional updates.
+
 EOF

live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary

@@ -7,9 +7,13 @@ echo "I: Creating warning to use snappy when apt-get is used"
 PREFIX=binary/boot/filesystem.dir
 
 mkdir -p $PREFIX/usr/local/bin
-cat >$PREFIX/usr/local/bin/apt-get <<EOF
+cat >$PREFIX/usr/local/bin/no-apt <<EOF
 #!/bin/sh
-echo "apt is not available on snappy Ubuntu! Try our snappy command to install"
-echo "and update your system"
+cat <<EOF
+Ubuntu Core does not use apt-get, see 'snappy --help'!
 EOF
-chmod 755 $PREFIX/usr/local/bin/apt-get
+chmod 755 $PREFIX/usr/local/bin/no-apt
+
+for cmd in apt apt-cache apt-get; do
+    ln -s no-apt $PREFIX/usr/local/bin/$cmd
+done