Merge lp:~chipaca/snappy-hub/snappy-examples-get-icons-again into lp:~snappy-dev/snappy-hub/snappy-examples

[John Lenton]

Put icons where they'll be icons.

[Michael Vogt (mvo)]

!!!

review: Approve

[lp:~chipaca/snappy-hub/snappy-examples-get-icons-again]

98. By John Lenton on 2016-06-02

bump versions for modified snaps

[Mark Shuttleworth (sabdfl)]

Tests please.

<duck>

[John Lenton (chipaca)]

Good point. We're already getting hello-world in integration tests; we should check it looks right there.

=== added directory 'config-example-bash/meta/gui'
=== renamed file 'config-example-bash/meta/icon.png' => 'config-example-bash/meta/gui/icon.png'
=== modified file 'config-example-bash/meta/snap.yaml'
--- config-example-bash/meta/snap.yaml	2016-03-04 11:26:40 +0000
+++ config-example-bash/meta/snap.yaml	2016-06-02 15:02:33 +0000
@@ -1,5 +1,5 @@
 name: config-example-bash
-version: 16.04-2
+version: 16.04-3
 summary: Configuration example
 description: |
  This is a simple example to how how to write a configure hook with bash.

=== added directory 'config-example/meta/gui'
=== renamed file 'config-example/meta/hello.png' => 'config-example/meta/gui/icon.png'
=== modified file 'config-example/meta/snap.yaml'
--- config-example/meta/snap.yaml	2016-03-04 11:26:40 +0000
+++ config-example/meta/snap.yaml	2016-06-02 15:02:33 +0000
@@ -1,5 +1,5 @@
 name: config-example
-version: 16.04-2
+version: 16.04-3
 summary: Configuration example
 description: |
  This is a simple example to how how to write a configure hook.

=== added directory 'go-example-webserver/meta/gui'
=== renamed file 'go-example-webserver/meta/icon.png' => 'go-example-webserver/meta/gui/icon.png'
=== modified file 'go-example-webserver/meta/snap.yaml'
--- go-example-webserver/meta/snap.yaml	2016-04-11 08:46:35 +0000
+++ go-example-webserver/meta/snap.yaml	2016-06-02 15:02:33 +0000
@@ -1,5 +1,5 @@
 name: go-example-webserver
-version: 16.04-4
+version: 16.04-5
 summary: Minimal Golang webserver for snappy
 description: |
  Mostly a example to show how to build a binary webserver for snappy.

=== added directory 'hello-world/meta/gui'
=== renamed file 'hello-world/meta/icon.png' => 'hello-world/meta/gui/icon.png'
=== modified file 'hello-world/meta/snap.yaml'
--- hello-world/meta/snap.yaml	2016-05-31 07:03:01 +0000
+++ hello-world/meta/snap.yaml	2016-06-02 15:02:33 +0000
@@ -1,5 +1,5 @@
 name: hello-world
-version: 6.1
+version: 6.2
 architectures: [ all ]
 summary: The hello-world of snappy apps
 description: This is a simple hello world example that includes a

=== added directory 'licensed/meta/gui'
=== renamed file 'licensed/meta/icon.png' => 'licensed/meta/gui/icon.png'
=== modified file 'licensed/meta/snap.yaml'
--- licensed/meta/snap.yaml	2016-03-04 11:26:40 +0000
+++ licensed/meta/snap.yaml	2016-06-02 15:02:33 +0000
@@ -1,5 +1,5 @@
 name: licensed
-version: 16.04-2
+version: 16.04-3
 summary: Licensed example
 description: |
  This is a simple example with a license that needs accepting.

=== added directory 'python-xkcd-webserver/meta/gui'
=== renamed file 'python-xkcd-webserver/meta/icon.png' => 'python-xkcd-webserver/meta/gui/icon.png'
=== modified file 'python-xkcd-webserver/meta/snap.yaml'
--- python-xkcd-webserver/meta/snap.yaml	2016-03-04 11:26:40 +0000
+++ python-xkcd-webserver/meta/snap.yaml	2016-06-02 15:02:33 +0000
@@ -1,5 +1,5 @@
 name: xkcd-webserver
-version: 16.04-2
+version: 16.04-3
 summary: Python based example webserver
 description: |
  Show random XKCD comic via a build-in webserver