Merge lp:~dbarth/ubuntu-calendar-app/push-helper into lp:ubuntu-calendar-app

[David Barth]

Integrate the Calendar app in the system notifications settings.

Integrate the Calendar app in the system notifications settings.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This shouldn't land until https://requests.ci-train.ubuntu.com/#/ticket/790 does. It adds the enable/disable switch in system settings -> notifications, but that won't work until the above i-d patch lands.

[lp:~dbarth/ubuntu-calendar-app/push-helper]

740. By David Barth on 2016-02-03

rollback po file change

[David Barth (dbarth)]

The indicator-datetime work is ready now.
This branch and others are ready for landing in silo 003
+1 for me

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2014-09-29 20:44:47 +0000
+++ click/CMakeLists.txt	2016-02-03 17:15:41 +0000
@@ -3,7 +3,7 @@
         set(BZR_REVNO "latest")
     endif(NOT BZR_REVNO)
     configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json calendar.apparmor
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json calendar.apparmor push-helper push-helper.json calendar-helper-apparmor.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})
 
     # make the click files visible in qtcreator
 
=== added file 'click/calendar-helper-apparmor.json'
--- click/calendar-helper-apparmor.json	1970-01-01 00:00:00 +0000
+++ click/calendar-helper-apparmor.json	2016-02-03 17:15:41 +0000
@@ -0,0 +1,7 @@
+{
+    "template": "ubuntu-push-helper",
+    "policy_groups": [
+        "push-notification-client"
+    ],
+    "policy_version": 1.2
+}
 
=== modified file 'click/calendar.apparmor'
--- click/calendar.apparmor	2015-03-28 11:31:47 +0000
+++ click/calendar.apparmor	2016-02-03 17:15:41 +0000
@@ -3,7 +3,8 @@
         "calendar",
         "networking",
         "contacts",
-        "accounts"
+        "accounts",
+        "push-notification-client"
     ],
     "policy_version": 1.2
 }
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-12-28 23:12:44 +0000
+++ click/manifest.json.in	2016-02-03 17:15:41 +0000
@@ -8,6 +8,10 @@
             "apparmor": "calendar.apparmor",
             "desktop": "@DESKTOP_FILE@",
             "urls": "@URLS_FILE@"
+        },
+        "calendar-helper": {
+            "apparmor": "calendar-helper-apparmor.json",
+            "push-helper": "push-helper.json"
         }
     },
     "icon": "@ICON@",
 
=== added file 'click/push-helper'
--- click/push-helper	1970-01-01 00:00:00 +0000
+++ click/push-helper	2016-02-03 17:15:41 +0000
@@ -0,0 +1,4 @@
+#!/usr/lib/initramfs-tools/bin/busybox static-sh
+cp $1 $2
+
+# This is just a temporary hack!
 \ No newline at end of file
 
=== added file 'click/push-helper.json'
--- click/push-helper.json	1970-01-01 00:00:00 +0000
+++ click/push-helper.json	2016-02-03 17:15:41 +0000
@@ -0,0 +1,3 @@
+{
+    "exec": "push-helper"
+}