Snapcraft

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

  1. 0.2.1
  2. Merge into core
Proposed by Daniel Holbach on 2015-09-25
Status: Merged
Approved by: Michael Vogt on 2015-09-25
Approved revision: 210
Merged at revision: 210
Proposed branch: lp:~dholbach/snapcraft/0.2.1
Merge into: lp:~snappy-dev/snapcraft/core
Diff against target: 33 lines (+8/-4)
3 files modified
debian/changelog (+6/-2)
debian/rules (+1/-1)
debian/snapcraft-examples.examples (+1/-1)
To merge this branch: bzr merge lp:~dholbach/snapcraft/0.2.1
Reviewer Review Type Date Requested Status
Michael Vogt 2015-09-25 Approve on 2015-09-25
Review via email: mp+272362@code.launchpad.net

Commit Message

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

To post a comment you must log in.
Michael Vogt (mvo) :
review: Approve
Sergio Schvezov (sergiusens) wrote :

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
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-09-24 09:38:06 +0000
3+++ debian/changelog 2015-09-25 09:49:12 +0000
4@@ -1,6 +1,10 @@
5-snapcraft (0.3) wily; urgency=medium
6+snapcraft (0.2.1) wily; urgency=medium
7
8- *
9+ * New upstream release (LP: #1499265)
10+ * Brown-paper bag release:
11+ - Fix install path of examples. Thanks Martin Pitt for noticing.
12+ - Allow using local sources through an env var (mostly useful for
13+ Launchpad building).
14
15 -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 24 Sep 2015 11:37:36 +0200
16
17
18=== modified file 'debian/rules'
19--- debian/rules 2015-09-21 16:22:24 +0000
20+++ debian/rules 2015-09-25 09:49:12 +0000
21@@ -5,4 +5,4 @@
22 dh $@ --with python3 --buildsystem=pybuild
23
24 override_dh_compress:
25- dh_compress -X/usr/share/snapcraft/examples
26+ dh_compress -Xusr/share/doc/snapcraft-examples/examples
27
28=== renamed file 'debian/snapcraft-examples.install' => 'debian/snapcraft-examples.examples'
29--- debian/snapcraft-examples.install 2015-09-21 16:22:24 +0000
30+++ debian/snapcraft-examples.examples 2015-09-25 09:49:12 +0000
31@@ -1,1 +1,1 @@
32-examples /usr/share/snapcraft
33+examples/*

Subscribers

People subscribed via source and target branches