Ubuntu Calendar App

Merge lp:~sergiusens/ubuntu-calendar-app/click_fixes into lp:ubuntu-calendar-app

  1. click_fixes
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 138
Merged at revision: 138
Proposed branch: lp:~sergiusens/ubuntu-calendar-app/click_fixes
Merge into: lp:ubuntu-calendar-app
Diff against target: 47 lines (+6/-5)
3 files modified
apparmor/calendar.json (+2/-2)
calendar.qml (+1/-1)
tests/autopilot/calendar_app/tests/__init__.py (+3/-2)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-calendar-app/click_fixes
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Calendar Developers Pending
Review via email: mp+189865@code.launchpad.net

Commit message

Fixing namespace issues and adding calendar apparmor profile

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apparmor/calendar.json'
2--- apparmor/calendar.json 2013-10-07 12:03:58 +0000
3+++ apparmor/calendar.json 2013-10-08 14:27:28 +0000
4@@ -1,4 +1,4 @@
5 {
6- "policy_groups": [],
7+ "policy_groups": ["calendar"],
8 "policy_version": 1.0
9-}
10\ No newline at end of file
11+}
12
13=== modified file 'calendar.qml'
14--- calendar.qml 2013-09-17 20:14:50 +0000
15+++ calendar.qml 2013-10-08 14:27:28 +0000
16@@ -8,7 +8,7 @@
17 id: mainView
18
19 objectName: "calendar"
20- applicationName: "calendar-app"
21+ applicationName: "com.ubuntu.calendar"
22
23 width: units.gu(45)
24 height: units.gu(80)
25
26=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
27--- tests/autopilot/calendar_app/tests/__init__.py 2013-10-03 17:23:02 +0000
28+++ tests/autopilot/calendar_app/tests/__init__.py 2013-10-08 14:27:28 +0000
29@@ -45,7 +45,8 @@
30
31 local_location = "../../calendar.qml"
32 installed_location = "/usr/share/calendar-app/calendar.qml"
33- sqlite_dir = os.path.expanduser("~/.local/share/calendar-app/Databases")
34+ sqlite_dir = os.path.expanduser(
35+ "~/.local/share/com.ubuntu.calendar/Databases")
36 backup_dir = sqlite_dir + ".backup"
37
38 def setUp(self):
39@@ -79,7 +80,7 @@
40
41 def launch_test_click(self):
42 self.app = self.launch_click_package(
43- "com.ubuntu.calendar-app",
44+ "com.ubuntu.calendar",
45 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
46
47 def temp_move_sqlite_db(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: