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

[Alan Pope 🍺🐧🐱 🦄]

Update framework and apparmor profile version

[Mihir Soni (mihirsoni)]

Looks good to me.

Thank you Alan.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

=== modified file 'click/apparmor.json'
--- click/apparmor.json	2014-01-18 23:29:11 +0000
+++ click/apparmor.json	2014-05-02 10:13:13 +0000
@@ -1,4 +1,4 @@
 {
     "policy_groups": ["calendar", "networking"], 
-    "policy_version": 1.0
+    "policy_version": 1.1
 }
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-03-29 08:03:31 +0000
+++ click/manifest.json.in	2014-05-02 10:13:13 +0000
@@ -1,6 +1,6 @@
 {
     "description": "Calendar application for Ubuntu devices",
-    "framework": "ubuntu-sdk-13.10",
+    "framework": "ubuntu-sdk-14.04-qml-dev1",
     "hooks": {
         "@APP_NAME@": {
             "apparmor": "apparmor.json",
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-02-24 13:36:54 +0000
+++ debian/changelog	2014-05-02 10:13:13 +0000
@@ -1,4 +1,4 @@
-calendar-app (0.5) UNRELEASED; urgency=medium
+calendar-app (0.6) raring; urgency=medium
 
   [ Sergio Schvezov ]
   * Adding cmake 
@@ -12,7 +12,10 @@
   [ Dimitri John Ledkov ]
   * Ship *.svg assets in click-buddy/cmake build.
 
- -- Sergio Schvezov <[e-mail]>  Sat, 18 Jan 2014 17:05:03 -0300
+  [ Alan Pope ]
+  * Update click framework and apparmor profile version (LP: #1315318)  
+
+ -- Alan Pope <[e-mail]>  Fri, 02 May 2014 11:11:47 +0100
 
 calendar-app (0.4) raring; urgency=low