Merge lp:~popey/ubuntu-calculator-app/fix-1315318 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Alan Pope 🍺🐧🐱 🦄]

Update framework and apparmor 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:249
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/198/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2356
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/197
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/197
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/69

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

2 maj 2014 12:36 <email address hidden> napisał(a):

> The proposal to merge lp:~popey/ubuntu-calculator-app/fix-1315318 into
> lp:ubuntu-calculator-app has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~popey/ubuntu-calculator-app/fix-1315318/+merge/218031
> --
>
> https://code.launchpad.net/~popey/ubuntu-calculator-app/fix-1315318/+merge/218031
> Your team Ubuntu Calculator Developers is subscribed to branch
> lp:ubuntu-calculator-app.
>

=== modified file 'click/apparmor.json'
--- click/apparmor.json	2014-01-17 20:50:29 +0000
+++ click/apparmor.json	2014-05-02 10:07:42 +0000
@@ -1,4 +1,4 @@
 {
     "policy_groups": [], 
-    "policy_version": 1.0
-}
\ No newline at end of file
+    "policy_version": 1.1
+}

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-03-13 22:00:54 +0000
+++ click/manifest.json.in	2014-05-02 10:07:42 +0000
@@ -1,6 +1,6 @@
 {
     "description": "Calculator application",
-    "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-04-30 09:35:43 +0000
+++ debian/changelog	2014-05-02 10:07:42 +0000
@@ -1,4 +1,4 @@
-ubuntu-calculator-app (0.1.3ubuntu3) UNRELEASED; urgency=medium
+ubuntu-calculator-app (0.1.4) raring; urgency=medium
 
   [ Bartosz Kosiorek ]
   * Support select, copy and paste of calculator numbers (LP: #1267821)
@@ -12,8 +12,9 @@
   [ Alan Pope ]
   * Update icon
   * Add -qt5 command line option (LP: #1288885) 
+  * Update click framework and apparmor profile version (LP: #1315318) 
 
- -- Alan Pope <[e-mail]>  Mon, 10 Mar 2014 10:12:03 +0000
+ -- Alan Pope <[e-mail]>  Fri, 02 May 2014 11:05:35 +0100
 
 ubuntu-calculator-app (0.1.3) raring; urgency=low