Merge lp:~dholbach/snapcraft/0.2.1 into lp:~snappy-dev/snapcraft/core

[Daniel Holbach]

Brown paperbag release (install examples into the right directory).

[Michael Vogt (mvo)]

review: Approve

[Sergio Schvezov (sergiusens)]

Why not keep trunk on 0.3? It afaik already had these fixes.
Won't this break daily builds, changing 0.3 to 0.2.1?

BTW, there's lp:snapcraft/0.2

On Fri, Sep 25, 2015 at 7:14 AM, <email address hidden> wrote:

> The proposal to merge lp:~dholbach/snapcraft/0.2.1 into lp:snapcraft has
> been updated.
>
> Status: Approved => Merged
>
> For more details, see:
> https://code.launchpad.net/~dholbach/snapcraft/0.2.1/+merge/272362
> --
> Your team Snappy Developers is subscribed to branch lp:snapcraft.
>
> Launchpad-Message-Rationale: Subscriber @snappy-dev
> Launchpad-Message-For: snappy-dev
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~snappy-dev/snapcraft/core
> Launchpad-Project: snapcraft
>

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-24 09:38:06 +0000
+++ debian/changelog	2015-09-25 09:49:12 +0000
@@ -1,6 +1,10 @@
-snapcraft (0.3) wily; urgency=medium
+snapcraft (0.2.1) wily; urgency=medium
 
-  * 
+  * New upstream release (LP: #1499265)
+  * Brown-paper bag release:
+    - Fix install path of examples. Thanks Martin Pitt for noticing.
+    - Allow using local sources through an env var (mostly useful for
+      Launchpad building).
 
  -- Daniel Holbach <[e-mail]>  Thu, 24 Sep 2015 11:37:36 +0200
 

=== modified file 'debian/rules'
--- debian/rules	2015-09-21 16:22:24 +0000
+++ debian/rules	2015-09-25 09:49:12 +0000
@@ -5,4 +5,4 @@
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_compress:
-	dh_compress -X/usr/share/snapcraft/examples
+	dh_compress -Xusr/share/doc/snapcraft-examples/examples

=== renamed file 'debian/snapcraft-examples.install' => 'debian/snapcraft-examples.examples'
--- debian/snapcraft-examples.install	2015-09-21 16:22:24 +0000
+++ debian/snapcraft-examples.examples	2015-09-25 09:49:12 +0000
@@ -1,1 +1,1 @@
-examples		/usr/share/snapcraft
+examples/*