Dropping Letters

Merge lp:~popey/dropping-letters/fix-1315318 into lp:dropping-letters

  1. fix-1315318
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Michael Hall
Approved revision: 49
Merged at revision: 49
Proposed branch: lp:~popey/dropping-letters/fix-1315318
Merge into: lp:dropping-letters
Diff against target: 39 lines (+6/-5)
3 files modified
apparmor/dropping-letters.json (+2/-2)
debian/changelog (+3/-2)
manifest.json (+1/-1)
To merge this branch: bzr merge lp:~popey/dropping-letters/fix-1315318
Reviewer Review Type Date Requested Status
Michael Hall Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+218065@code.launchpad.net

Commit message

Update framework and apparmor profile version

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:49
http://91.189.93.70:8080/job/dropping-letters-ci/18/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-saucy-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-trusty-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2364

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apparmor/dropping-letters.json'
2--- apparmor/dropping-letters.json 2013-10-09 19:30:21 +0000
3+++ apparmor/dropping-letters.json 2014-05-02 12:47:34 +0000
4@@ -1,4 +1,4 @@
5 {
6 "policy_groups": [],
7- "policy_version": 1.0
8-}
9\ No newline at end of file
10+ "policy_version": 1.1
11+}
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2014-03-10 10:25:59 +0000
15+++ debian/changelog 2014-05-02 12:47:34 +0000
16@@ -1,8 +1,9 @@
17-dropping-letters (0.1.2.2ubuntu1) UNRELEASED; urgency=medium
18+dropping-letters (0.1.2.3) UNRELEASED; urgency=medium
19
20 * Add -qt5 command line option (LP: #1288885)
21+ * Update click framework and apparmor profile version (LP: #1315318)
22
23- -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:24:40 +0000
24+ -- Alan Pope <popey@ubuntu.com> Fri, 02 May 2014 13:26:36 +0100
25
26 dropping-letters (0.1.2.2) raring; urgency=low
27
28
29=== modified file 'manifest.json'
30--- manifest.json 2014-04-10 10:52:05 +0000
31+++ manifest.json 2014-05-02 12:47:34 +0000
32@@ -1,6 +1,6 @@
33 {
34 "description": "Dropping Letters game",
35- "framework": "ubuntu-sdk-13.10",
36+ "framework": "ubuntu-sdk-14.04-qml-dev1",
37 "hooks": {
38 "dropping-letters": {
39 "apparmor": "apparmor/dropping-letters.json",

Subscribers

People subscribed via source and target branches