Merge lp:~popey/ubuntu-rssreader-app/fix-1315318 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

Status: Merged
Approved by: Joey Chan
Approved revision: 220
Merged at revision: 220
Proposed branch: lp:~popey/ubuntu-rssreader-app/fix-1315318
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 37 lines (+5/-4)
3 files modified
click/apparmor.json (+1/-1)
click/manifest.json.in (+1/-1)
debian/changelog (+3/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-rssreader-app/fix-1315318
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+218043@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 :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/apparmor.json'
2--- click/apparmor.json 2014-01-31 21:23:34 +0000
3+++ click/apparmor.json 2014-05-02 11:18:23 +0000
4@@ -2,5 +2,5 @@
5 "policy_groups": [
6 "networking"
7 ],
8- "policy_version": 1.0
9+ "policy_version": 1.1
10 }
11
12=== modified file 'click/manifest.json.in'
13--- click/manifest.json.in 2014-04-11 22:40:58 +0000
14+++ click/manifest.json.in 2014-05-02 11:18:23 +0000
15@@ -1,6 +1,6 @@
16 {
17 "description": "Rss Reader application",
18- "framework": "ubuntu-sdk-13.10",
19+ "framework": "ubuntu-sdk-14.04-qml-dev1",
20 "hooks": {
21 "@APP_NAME@": {
22 "apparmor": "apparmor.json",
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2014-02-18 21:22:34 +0000
26+++ debian/changelog 2014-05-02 11:18:23 +0000
27@@ -1,8 +1,9 @@
28-ubuntu-rssreader-app (0.2ubuntu1) UNRELEASED; urgency=medium
29+ubuntu-rssreader-app (0.3) raring; urgency=medium
30
31 * New icon
32+ * Update click framework and apparmor profile version (LP: #1315318)
33
34- -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 21:22:12 +0000
35+ -- Alan Pope <popey@ubuntu.com> Fri, 02 May 2014 12:10:30 +0100
36
37 ubuntu-rssreader-app (0.2) saucy; urgency=low
38

Subscribers

People subscribed via source and target branches