Ubuntu Calendar App

Merge lp:~popey/ubuntu-calendar-app/fix-1315318 into lp:ubuntu-calendar-app

  1. fix-1315318
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Mihir Soni
Approved revision: 261
Merged at revision: 261
Proposed branch: lp:~popey/ubuntu-calendar-app/fix-1315318
Merge into: lp:ubuntu-calendar-app
Diff against target: 42 lines (+7/-4)
3 files modified
click/apparmor.json (+1/-1)
click/manifest.json.in (+1/-1)
debian/changelog (+5/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-calendar-app/fix-1315318
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Approve
Review via email: mp+218033@code.launchpad.net

Commit message

Update framework and apparmor profile version

To post a comment you must log in.
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me.

Thank you Alan.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:261
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/429/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2357
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/429
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/429
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/263

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/429/rebuild

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-18 23:29:11 +0000
3+++ click/apparmor.json 2014-05-02 10:13:13 +0000
4@@ -1,4 +1,4 @@
5 {
6 "policy_groups": ["calendar", "networking"],
7- "policy_version": 1.0
8+ "policy_version": 1.1
9 }
10
11=== modified file 'click/manifest.json.in'
12--- click/manifest.json.in 2014-03-29 08:03:31 +0000
13+++ click/manifest.json.in 2014-05-02 10:13:13 +0000
14@@ -1,6 +1,6 @@
15 {
16 "description": "Calendar application for Ubuntu devices",
17- "framework": "ubuntu-sdk-13.10",
18+ "framework": "ubuntu-sdk-14.04-qml-dev1",
19 "hooks": {
20 "@APP_NAME@": {
21 "apparmor": "apparmor.json",
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2014-02-24 13:36:54 +0000
25+++ debian/changelog 2014-05-02 10:13:13 +0000
26@@ -1,4 +1,4 @@
27-calendar-app (0.5) UNRELEASED; urgency=medium
28+calendar-app (0.6) raring; urgency=medium
29
30 [ Sergio Schvezov ]
31 * Adding cmake
32@@ -12,7 +12,10 @@
33 [ Dimitri John Ledkov ]
34 * Ship *.svg assets in click-buddy/cmake build.
35
36- -- Sergio Schvezov <sergio.schvezov@canonical.com> Sat, 18 Jan 2014 17:05:03 -0300
37+ [ Alan Pope ]
38+ * Update click framework and apparmor profile version (LP: #1315318)
39+
40+ -- Alan Pope <popey@ubuntu.com> Fri, 02 May 2014 11:11:47 +0100
41
42 calendar-app (0.4) raring; urgency=low
43

Subscribers

People subscribed via source and target branches

to status/vote changes: