Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/update-project-name into lp:ubuntu-clock-app

  1. update-project-name
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 74
Merged at revision: 63
Proposed branch: lp:~nik90/ubuntu-clock-app/update-project-name
Merge into: lp:ubuntu-clock-app
Diff against target: 151 lines (+27/-15)
8 files modified
CMakeLists.txt (+4/-1)
app/CMakeLists.txt (+2/-1)
app/ubuntu-clock-app.desktop.in (+4/-3)
app/ubuntu-clock-app.qml (+1/-1)
com.ubuntu.clock_clock.url-dispatcher (+5/-0)
debian/changelog (+2/-0)
manifest.json (+7/-6)
tests/autopilot/ubuntu_clock_app/tests/__init__.py (+2/-3)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/update-project-name
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Sergio Schvezov (community) Approve
Review via email: mp+231618@code.launchpad.net

Commit message

Changed project name to "com.ubuntu.clock", replaced the desktop icon and changed the project name in the CMakeList file in preparation for the clock app replacement in the daily image.

Description of the change

Changed project name to "com.ubuntu.clock", replaced the desktop icon and changed the project name in the CMakeList file in preparation for the clock app replacement in the daily image.

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

PASSED: Continuous integration, rev:63
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/240/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/89
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/240

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/240/rebuild

review: Approve (continuous-integration)
lp:~nik90/ubuntu-clock-app/update-project-name updated
64. By Nekhelesh Ramananthan

Added comment, keywords and default department to the desktop file like
in the old clock app desktop file.

65. By Nekhelesh Ramananthan

Added url_dispatcher file and made appropriate modifications to the
cmake file.

66. By Nekhelesh Ramananthan

Added missing url-dispatcher file

67. By Nekhelesh Ramananthan

Fixed url-dispatcher hook in manifest.json and also improved cmake file
reference to it.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:66
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/241/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/90
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/241

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/241/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:67
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/242/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/91
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/242

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/242/rebuild

review: Approve (continuous-integration)
lp:~nik90/ubuntu-clock-app/update-project-name updated
68. By Nekhelesh Ramananthan

Changed arch to armhf

69. By Nekhelesh Ramananthan

simplified app name to clock in the manifest file

70. By Nekhelesh Ramananthan

Corrected AP __init__.py to use the correct project name

71. By Nekhelesh Ramananthan

indented code

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/243/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/92
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/243

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/243/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

looks good after the discussed changes over irc; nice work

review: Approve
lp:~nik90/ubuntu-clock-app/update-project-name updated
72. By Nekhelesh Ramananthan

Fixed AP click pakcage name to com.ubuntu.clock

73. By Nekhelesh Ramananthan

removed unnecessary comment

74. By Nekhelesh Ramananthan

Updated debian changelog

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:71
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/244/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/93
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/244

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/244/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:74
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/245/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/94
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/245

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/245/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-08-16 07:36:10 +0000
3+++ CMakeLists.txt 2014-08-20 22:57:00 +0000
4@@ -1,4 +1,4 @@
5-project(com.ubuntu.clock.devel C CXX)
6+project(com.ubuntu.clock C CXX)
7 cmake_minimum_required(VERSION 2.8.9)
8
9 set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
10@@ -21,6 +21,7 @@
11 set(MAIN_QML ${APP_HARDCODE}.qml)
12 set(ICON clock-app)
13 SET(AUTOPILOT_DIR ubuntu_clock_app)
14+set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
15
16 # Standard install paths
17 include(GNUInstallDirs)
18@@ -64,6 +65,8 @@
19 set(EXEC "qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
20 endif()
21
22+install(FILES ${URLS_FILE} DESTINATION "${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls")
23+
24 file(GLOB_RECURSE I18N_SRC_FILES
25 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
26 *.qml *.js)
27
28=== modified file 'app/CMakeLists.txt'
29--- app/CMakeLists.txt 2014-08-13 11:28:40 +0000
30+++ app/CMakeLists.txt 2014-08-20 22:57:00 +0000
31@@ -1,5 +1,6 @@
32 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
33-add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
34+ file(GLOB QML_JS_FILES *.qml *.js)
35+ add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
36 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
37
38
39
40=== modified file 'app/clock-app@30.png'
41Binary files app/clock-app@30.png 2014-07-08 10:52:02 +0000 and app/clock-app@30.png 2014-08-20 22:57:00 +0000 differ
42=== modified file 'app/ubuntu-clock-app.desktop.in'
43--- app/ubuntu-clock-app.desktop.in 2014-07-08 10:52:02 +0000
44+++ app/ubuntu-clock-app.desktop.in 2014-08-20 22:57:00 +0000
45@@ -1,10 +1,11 @@
46 [Desktop Entry]
47 Version=1.0
48-Name=Clock Reboot
49+Name=Clock
50+Comment=A sophisticated clock app that provides world clock and alarm functionality.
51+Keywords=time;alarm;alert;clock;world;
52 Exec=@EXEC@
53 Icon=@ICON@
54 Terminal=false
55 Type=Application
56 X-Ubuntu-Touch=true
57-
58-
59+X-Ubuntu-Default-Department-ID=accessories
60
61=== modified file 'app/ubuntu-clock-app.qml'
62--- app/ubuntu-clock-app.qml 2014-08-11 17:14:55 +0000
63+++ app/ubuntu-clock-app.qml 2014-08-20 22:57:00 +0000
64@@ -37,7 +37,7 @@
65 objectName: "clock"
66
67 // applicationName for click packages (used as an unique app identifier)
68- applicationName: "com.ubuntu.clock.devel"
69+ applicationName: "com.ubuntu.clock"
70
71 /*
72 This property enables the application to change orientation when the
73
74=== added file 'com.ubuntu.clock_clock.url-dispatcher'
75--- com.ubuntu.clock_clock.url-dispatcher 1970-01-01 00:00:00 +0000
76+++ com.ubuntu.clock_clock.url-dispatcher 2014-08-20 22:57:00 +0000
77@@ -0,0 +1,5 @@
78+[
79+ {
80+ "protocol": "alarm"
81+ }
82+]
83
84=== modified file 'debian/changelog'
85--- debian/changelog 2014-08-20 08:11:12 +0000
86+++ debian/changelog 2014-08-20 22:57:00 +0000
87@@ -12,6 +12,8 @@
88 * Improved error handling of jsontimezone model.
89 * Added support to play alarm sound preview when selecting them in the alarm
90 sound page. (LP: #1355410)
91+ * Changed project name and neccessary support variables from com.ubuntu.devel
92+ to com.ubuntu.clock in the CMakeList.txt, manifest.json and autopilot files.
93
94 [Zsombor Egri]
95 * Fixed alarm status toggle being reverted immediately (LP: #1272337)
96
97=== modified file 'manifest.json'
98--- manifest.json 2014-08-19 20:24:41 +0000
99+++ manifest.json 2014-08-20 22:57:00 +0000
100@@ -1,14 +1,15 @@
101 {
102- "name": "com.ubuntu.clock.devel",
103+ "name": "com.ubuntu.clock",
104 "description": "A sophisticated clock app for Ubuntu Touch",
105 "framework": "ubuntu-sdk-14.10-dev2",
106- "architecture": "all",
107- "title": "Clock Reboot",
108+ "architecture": "armhf",
109+ "title": "Clock",
110 "icon": "clock@30.png",
111 "hooks": {
112- "ubuntu-clock-app": {
113+ "clock": {
114 "apparmor": "ubuntu-clock-app.json",
115- "desktop": "share/applications/ubuntu-clock-app.desktop"
116+ "desktop": "share/applications/ubuntu-clock-app.desktop",
117+ "urls": "share/url-dispatcher/urls/com.ubuntu.clock_clock.url-dispatcher"
118 }
119 },
120 "version": "3.1.@BZR_REVNO@",
121@@ -20,4 +21,4 @@
122 "vcs-bzr": "@BZR_SOURCE@",
123 "vcs-bzr-revno": "@BZR_REVNO@"
124 }
125-}
126\ No newline at end of file
127+}
128
129=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
130--- tests/autopilot/ubuntu_clock_app/tests/__init__.py 2014-08-12 19:07:02 +0000
131+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py 2014-08-20 22:57:00 +0000
132@@ -52,9 +52,8 @@
133 installed_location_qml = \
134 '/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml'
135
136- # note this directory could change to com.ubuntu.clock at some point
137 sqlite_dir = os.path.expanduser(
138- "~/.local/share/com.ubuntu.clock.devel")
139+ "~/.local/share/com.ubuntu.clock")
140 backup_dir = sqlite_dir + ".backup"
141
142 def setUp(self):
143@@ -101,7 +100,7 @@
144 @autopilot_logging.log_action(logger.info)
145 def launch_test_click(self):
146 self.app = self.launch_click_package(
147- "com.ubuntu.clock.devel",
148+ "com.ubuntu.clock",
149 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
150
151 def temp_move_sqlite_db(self):

Subscribers

People subscribed via source and target branches