ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #06773
[Merge] lp:~dbarth/ubuntu-calendar-app/push-helper into lp:ubuntu-calendar-app
David Barth has proposed merging lp:~dbarth/ubuntu-calendar-app/push-helper into lp:ubuntu-calendar-app.
Requested reviews:
Ubuntu Calendar Developers (ubuntu-calendar-dev)
Related bugs:
Bug #1440111 in Ubuntu Calendar App: "[calendar] Reminder notifications are not integrated into system notifications"
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1440111
Bug #1474078 in Ubuntu Calendar App: "Provide a way to disable notifications from calendar events"
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1474078
For more details, see:
https://code.launchpad.net/~dbarth/ubuntu-calendar-app/push-helper/+merge/280697
Integrate the Calendar app in the system notifications settings.
--
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~dbarth/ubuntu-calendar-app/push-helper into lp:ubuntu-calendar-app.
=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt 2014-09-29 20:44:47 +0000
+++ click/CMakeLists.txt 2015-12-16 10:52:50 +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 2015-12-16 10:52:50 +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 2015-12-16 10:52:50 +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 2015-12-16 10:52:50 +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 2015-12-16 10:52:50 +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 2015-12-16 10:52:50 +0000
@@ -0,0 +1,3 @@
+{
+ "exec": "push-helper"
+}
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2015-11-23 07:15:20 +0000
+++ po/com.ubuntu.calendar.pot 2015-12-16 10:52:50 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-23 15:14+0800\n"
+"POT-Creation-Date: 2015-12-16 11:45+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
References