1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2014-07-26 09:34:15 +0000
3
+++ CMakeLists.txt	2014-08-11 16:19:22 +0000
4
@@ -2,7 +2,6 @@
5
2
cmake_minimum_required(VERSION 2.8.9)
2
cmake_minimum_required(VERSION 2.8.9)
6
3
3
7
4
set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
4
set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
8
5
set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
9
6
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
5
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
10
7
6
11
8
find_package(Qt5Core)
7
find_package(Qt5Core)
12
@@ -20,51 +19,51 @@
13
20
set(APP_NAME                clock)
19
set(APP_NAME                clock)
14
21
set(APP_HARDCODE            ubuntu-clock-app)
20
set(APP_HARDCODE            ubuntu-clock-app)
15
22
set(MAIN_QML                ${APP_HARDCODE}.qml)
21
set(MAIN_QML                ${APP_HARDCODE}.qml)
17
23
set(ICON                    clock-app@30.png)
22
set(ICON                    clock-app)
18
23
SET(AUTOPILOT_DIR           ubuntu_clock_app)
19
24
20
25
# Standard install paths 
21
26
include(GNUInstallDirs) 
22
24
27
23
25
#set install paths
28
#set install paths
30
26
if(${CLICK_MODE})
29
if(CLICK_MODE)
31
27
  set(CMAKE_INSTALL_PREFIX /)
30
  set(CMAKE_INSTALL_PREFIX "/")
32
28
  set(DATA_DIR /)
31
  set(UBUNTU-CLOCK_APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
27
29
  set(DESKTOP_DIR ${DATA_DIR})
28
30
  set(UBUNTU-CLOCK-APP_DIR    "share/qml/ubuntu-clock-app")
29
31
  set(ICON "${UBUNTU-CLOCK-APP_DIR}/${ICON}")
33
32
32
34
33
  execute_process(
35
34
      COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
36
35
      OUTPUT_VARIABLE ARCH_TRIPLET
37
36
      OUTPUT_STRIP_TRAILING_WHITESPACE
38
37
  )
39
38
  set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
40
39
else()
41
40
  set(DATA_DIR "share/clockapp")
42
41
  set(DESKTOP_DIR ${DATA_DIR})
43
42
  set(ICON "${DATA_DIR}/${ICON}")
44
43
  set(UBUNTU-CLOCK-APP_DIR    "share/ubuntu-clock-app/qml")
45
44
  include(GNUInstallDirs)
46
45
  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
33
  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
50
46
endif()
34
  set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
51
47
35
else(CLICK_MODE)
52
48
set(EXEC "qmlscene $@ ${UBUNTU-CLOCK-APP_DIR}/${MAIN_QML}")
36
  set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app")
53
37
  execute_process( 
54
38
    COMMAND qmake -query QT_INSTALL_QML 
55
39
            OUTPUT_VARIABLE QT_IMPORTS_DIR 
56
40
            OUTPUT_STRIP_TRAILING_WHITESPACE 
57
41
    )
58
42
59
43
endif(CLICK_MODE)
60
44
61
45
set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
62
49
46
63
50
if(${CLICK_MODE})
47
if(${CLICK_MODE})
64
51
  install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
48
  install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
65
49
  install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_DATADIR})
66
50
else(CLICK_MODE)
67
51
  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
68
52
endif()
52
endif()
69
53
install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
70
54
install(FILES "${APP_HARDCODE}.json" DESTINATION ${DATA_DIR})
71
55
53
72
56
add_subdirectory(app)
54
add_subdirectory(app)
73
57
add_subdirectory(backend)
55
add_subdirectory(backend)
74
56
add_subdirectory(tests)
75
58
57
78
59
add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
58
add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/tests/autopilot/run
79
60
                    COMMAND ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
59
                    COMMAND ${CMAKE_SOURCE_DIR}/tests/autopilot/run
80
61
                    DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
60
                    DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
81
62
                    WORKING_DIRECTORY ./app)
61
                    WORKING_DIRECTORY ./app)
82
63
62
83
64
enable_testing()
63
enable_testing()
84
65
add_test(NAME basic
64
add_test(NAME basic
85
66
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/app
65
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/app
87
67
  COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
66
  COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/tests/unit -import ${CMAKE_BINARY_DIR}/backend
88
68
)
67
)
89
69
68
90
70
add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/ubuntu-clock-app.qml
69
add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/ubuntu-clock-app.qml
91
71
70
92
=== modified file 'app/CMakeLists.txt'
93
--- app/CMakeLists.txt	2014-07-28 13:02:59 +0000
94
+++ app/CMakeLists.txt	2014-08-11 16:19:22 +0000
95
@@ -1,14 +1,20 @@
99
1
file(GLOB QML_JS_FILES *.qml *.js *.png)
1
if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
97
2
98
3
# make the files visible on qtcreator
100
4
add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
2
add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
101
3
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
102
4
103
5
104
6
if(CLICK_MODE)
105
7
  set(ICON "${ICON}@30.png")
106
8
  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
107
9
endif(CLICK_MODE)
108
5
10
109
6
# substitute variables in the desktop file
11
# substitute variables in the desktop file
110
7
set(DESKTOP_FILE "ubuntu-clock-app.desktop")
12
set(DESKTOP_FILE "ubuntu-clock-app.desktop")
111
8
configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
13
configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
112
9
14
115
10
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
15
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} 
116
11
install(FILES ${QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR})
16
    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
117
17
install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CLOCK_APP_DIR})
118
12
18
119
13
add_subdirectory(clock)
19
add_subdirectory(clock)
120
14
add_subdirectory(alarm)
20
add_subdirectory(alarm)
121
15
21
122
=== modified file 'app/alarm/CMakeLists.txt'
123
--- app/alarm/CMakeLists.txt	2014-06-16 14:09:12 +0000
124
+++ app/alarm/CMakeLists.txt	2014-08-11 16:19:22 +0000
125
@@ -3,4 +3,4 @@
126
3
# make the files visible in the qtcreator tree
3
# make the files visible in the qtcreator tree
127
4
add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})
4
add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})
128
5
5
130
6
install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/alarm)
6
install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/alarm)
131
7
7
132
=== modified file 'app/clock/CMakeLists.txt'
133
--- app/clock/CMakeLists.txt	2014-06-06 18:45:49 +0000
134
+++ app/clock/CMakeLists.txt	2014-08-11 16:19:22 +0000
135
@@ -3,4 +3,4 @@
136
3
# make the files visible in the qtcreator tree
3
# make the files visible in the qtcreator tree
137
4
add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})
4
add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})
138
5
5
140
6
install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/clock)
6
install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/clock)
141
7
7
142
=== modified file 'app/components/CMakeLists.txt'
143
--- app/components/CMakeLists.txt	2014-06-06 18:45:49 +0000
144
+++ app/components/CMakeLists.txt	2014-08-11 16:19:22 +0000
145
@@ -3,4 +3,4 @@
146
3
# make the files visible in the qtcreator tree
3
# make the files visible in the qtcreator tree
147
4
add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
4
add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
148
5
5
150
6
install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/components)
6
install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/components)
151
7
7
152
=== modified file 'app/graphics/CMakeLists.txt'
153
--- app/graphics/CMakeLists.txt	2014-06-06 18:45:49 +0000
154
+++ app/graphics/CMakeLists.txt	2014-08-11 16:19:22 +0000
155
@@ -1,6 +1,8 @@
157
1
file(GLOB IMAGES_PNG_FILES *.png *.jpg)
1
file(GLOB GRAPHICS_FILES *.png *.jpg)
158
2
2
159
3
# make the files visible in the qtcreator tree
3
# make the files visible in the qtcreator tree
161
4
add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
4
if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
162
5
  add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
163
6
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
164
5
7
166
6
install(FILES ${IMAGES_PNG_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/graphics)
8
install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)
167
7
9
168
=== modified file 'app/upstreamcomponents/CMakeLists.txt'
169
--- app/upstreamcomponents/CMakeLists.txt	2014-07-28 13:02:59 +0000
170
+++ app/upstreamcomponents/CMakeLists.txt	2014-08-11 16:19:22 +0000
171
@@ -3,4 +3,4 @@
172
3
# make the files visible in the qtcreator tree
3
# make the files visible in the qtcreator tree
173
4
add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})
4
add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})
174
5
5
176
6
install(FILES ${UPSTREAM_COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/upstreamcomponents)
6
install(FILES ${UPSTREAM_COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/upstreamcomponents)
177
7
7
178
=== modified file 'app/worldclock/CMakeLists.txt'
179
--- app/worldclock/CMakeLists.txt	2014-07-13 11:18:31 +0000
180
+++ app/worldclock/CMakeLists.txt	2014-08-11 16:19:22 +0000
181
@@ -3,4 +3,4 @@
182
3
# make the files visible in the qtcreator tree
3
# make the files visible in the qtcreator tree
183
4
add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})
4
add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})
184
5
5
186
6
install(FILES ${WORLDCLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/worldclock)
6
install(FILES ${WORLDCLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/worldclock)
187
7
7
188
=== modified file 'backend/CMakeLists.txt'
189
--- backend/CMakeLists.txt	2014-07-26 09:34:15 +0000
190
+++ backend/CMakeLists.txt	2014-08-11 16:19:22 +0000
191
@@ -67,11 +67,11 @@
192
67
)
67
)
193
68
68
194
69
# Install plugin file
69
# Install plugin file
203
70
install(TARGETS timezone DESTINATION ${QT_IMPORTS_DIR}/Timezone/)
70
install(TARGETS timezone DESTINATION ${MODULE_PATH}/Timezone/)
204
71
install(FILES   modules/Timezone/qmldir DESTINATION ${QT_IMPORTS_DIR}/Timezone/)
71
install(FILES   modules/Timezone/qmldir DESTINATION ${MODULE_PATH}/Timezone/)
205
72
72
206
73
install(TARGETS datetime DESTINATION ${QT_IMPORTS_DIR}/DateTime/)
73
install(TARGETS datetime DESTINATION ${MODULE_PATH}/DateTime/)
207
74
install(FILES   modules/DateTime/qmldir DESTINATION ${QT_IMPORTS_DIR}/DateTime/)
74
install(FILES   modules/DateTime/qmldir DESTINATION ${MODULE_PATH}/DateTime/)
208
75
75
209
76
install(TARGETS alarmsettings DESTINATION ${QT_IMPORTS_DIR}/Alarm/Settings/)
76
install(TARGETS alarmsettings DESTINATION ${MODULE_PATH}/Alarm/Settings/)
210
77
install(FILES   modules/Alarm/Settings/qmldir DESTINATION ${QT_IMPORTS_DIR}/Alarm/Settings/)
77
install(FILES   modules/Alarm/Settings/qmldir DESTINATION ${MODULE_PATH}/Alarm/Settings/)
211
78
78
212
=== removed directory 'cmake'
213
=== removed file 'cmake/Click.cmake'
214
--- cmake/Click.cmake	2014-06-06 18:45:49 +0000
215
+++ cmake/Click.cmake	1970-01-01 00:00:00 +0000
216
@@ -1,17 +0,0 @@
217
1
if(CLICK_MODE)
218
2
    STRING(REPLACE "/usr/" "/"  QT_IMPORTS_DIR  ${QT_IMPORTS_DIR})
219
3
    set(CMAKE_INSTALL_PREFIX /)
220
4
    set(CMAKE_INSTALL_BINDIR /)
221
5
        set(DATA_DIR /)
222
6
        set(EXEC "qmlscene $@ -I .${QT_IMPORTS_DIR} ${UBUNTU-CLOCK-APP_DIR}/${MAIN_QML}")
223
7
        set(DESKTOP_DIR ${DATA_DIR})
224
8
        set(ICON ".${DATA_DIR}/${ICON}")
225
9
    install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
226
10
    install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
227
11
    install(FILES "${CMAKE_PROJECT_NAME}.json" DESTINATION ${DATA_DIR})
228
12
else(CLICK_MODE)
229
13
        set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
230
14
        set(EXEC "qmlscene $@ ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/qml/${MAIN_QML}")
231
15
        set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
232
16
        set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
233
17
endif(CLICK_MODE)
234
18
0
235
=== added directory 'debian'
236
=== added file 'debian/changelog'
237
--- debian/changelog	1970-01-01 00:00:00 +0000
238
+++ debian/changelog	2014-08-11 16:19:22 +0000
239
@@ -0,0 +1,197 @@
240
1
ubuntu-clock-app (1.2) utopic; urgency=medium
241
2
242
3
  [ Daniel Holbach ]
243
4
  * Fix debhelper-but-no-misc-depends ubuntu-clock-app-autopilot.
244
5
  * Bump Standards-Version to 3.9.5, no changes required.
245
6
  * Add missing build-depends. 
246
7
  * Run 'wrap-and-sort'.
247
8
  * Don't try to install files from usr/bin, there are none.
248
9
  * Install files from usr/lib.
249
10
  * Fail if not all files can be installed.
250
11
  * Make ubuntu-clock-app Arch:any.
251
12
  * Install files into ubuntu-clock-app-autopilot again (LP: #1354074).
252
13
  * Add ${shlibs:Depends} to Depends.
253
14
  * Remove duplicate 'Section' definition.
254
15
  * Relax dependency from ubuntu-clock-app-autopilot on ubuntu-clock-app
255
16
    somewhat.
256
17
  * Run tests as autopkgtest. (LP: #1354091)
257
18
  * Don't ignore return code of autopilot test execution. (LP: #1354095)
258
19
  * Fix path in Exec= line of .desktop file. (LP: #1354081) 
259
20
  * Move module files into proper place. (LP: #1354079)
260
21
  * Make pep8 happy.
261
22
  * Add -I argument to Exec line in .desktop file.
262
23
263
24
  [ Jussi Pakkanen ]
264
25
  * Use CMake's testing framework instead of a custom target.
265
26
  * Only install manifest in click mode.
266
27
  * Spaces are tabs.
267
28
  * Add a CMake option to build both as a click app and a regular one.
268
29
269
30
  [ Sergio Schvezov ]
270
31
  * Using GnuInstallDirs takes care of the arch triplet.
271
32
  * Used a proper qt_imports_dir (still needs qml import updates).
272
33
  * Moved gnuinstalldirs higher up for better path management.
273
34
  * Removed a bunch of very custom variables and build on top.
274
35
  * Removed the install target for the gallery directory as it was a dup 
275
36
    and going to the wrong path.
276
37
  * Not installing icon for deb and just rely on us using the desktop 
277
38
    default (we can depend on the suru icon set, it's there).
278
39
  * Made some rules filter out if not in qtcreator.
279
40
  * Changed the path for a couple of things to use common subpaths in most
280
41
    cases.
281
42
282
43
 -- Daniel Holbach <daniel.holbach@ubuntu.com>  Fri, 01 Aug 2014 09:16:35 +0200
283
44
284
45
ubuntu-clock-app (1.1) raring; urgency=medium
285
46
286
47
  * New icon
287
48
  * Add -qt5 command line option (LP: #1288885)
288
49
  * Update framework and apparmor profile version
289
50
290
51
 -- Alan Pope <popey@ubuntu.com>  Fri, 02 May 2014 13:57:25 +0100
291
52
292
53
ubuntu-clock-app (1.0) saucy; urgency=low
293
54
294
55
  [Nekhelesh Ramananthan]
295
56
  * World Clock list needs to inform user when results cannot be retrieved due to network error (LP: #1231106)
296
57
  * Load premade presets for new user so user doesn't end up in blank app (LP: #1226131)
297
58
  * Return more fine-grained territorial divisions for city search results (LP: #1230153)
298
59
  * Improve the visual appearance of the clock, timer, stopwatch and alarm
299
60
  * Removed hour support from timer
300
61
  
301
62
  [Sergio Schvezov]
302
63
  * Translation for desktop and debian package
303
64
  * Fix click package confinement issues
304
65
305
66
  [Riccardo Padovani]
306
67
  * Alarm notifications do not appear when an alarm is triggered (LP: #1233176)
307
68
308
69
  [Nicholas Skaggs]
309
70
  * Several apps have failing tests with 20131003 ui-toolkit (LP: #1234544)
310
71
311
72
  [Andrea Cerisara]
312
73
  * Autopilot Testcase Needed: Test Add World Clock (LP: #1210196)
313
74
  * Autopilot Testcase Needed: Test Delete World Clock (LP: #1210197)
314
75
315
76
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Fri, 11 Oct 2013 01:45:36 +0200
316
77
317
78
ubuntu-clock-app (0.7) saucy; urgency=low
318
79
319
80
  [Nekhelesh Ramananthan]
320
81
  * Alarm doesn't work (LP: #1187994)
321
82
  * Clock app does not honor timezone (LP: #1191291)
322
83
  * Clocks need to sync better and use the same backend (LP: #1201830)
323
84
  * Clock reports time in UTC by default (LP: #1201858)
324
85
  * On scrolling down page, hide tab header (LP: #1226128)
325
86
  * Very difficult to select bottom city in scrollable list of 4 or more (LP: #1227674)
326
87
  * There is no effect on the circle shape (LP: #1215332)
327
88
  * HUD actions should not appear for toolbar button such as save or cancel (LP: #1224891)
328
89
329
90
  [Paolo Rotolo]
330
91
  * Add error message if no cities were found (LP: #1222235)
331
92
  * Timer label updates before the timer hand reaches destination (LP: #1172869)
332
93
  * Cancel toolbar action needs the correct icon (LP: #1222942) 
333
94
334
95
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Fri, 27 Sep 2013 12:47:21 +0200
335
96
336
97
ubuntu-clock-app (0.6) saucy; urgency=low
337
98
338
99
  [Nekhelesh Ramananthan]
339
100
  * Digital clock font size is smaller than design spec (LP: #1215334)
340
101
  * Font in world city list are too big (LP: #1200594)
341
102
  * Timer does not inform user if there are no presets (LP: #1169182)
342
103
  * Clicking the Add preset or add city button should reflect on the title for visual feedback (LP: #1168329)
343
104
  * In Timer, clock face is off screen when selecting preset (LP: #1219770)
344
105
  * Toolbar prevents text preset from accepting input (LP: #1209024)
345
106
346
107
  [Paolo Rotolo]
347
108
  * Search button icon is not as per design specifications (LP: #1221252)
348
109
  * Search icon isn't in Ubuntu Touch Style (LP: #1202364)
349
110
  * Reset button doesn't work while the stopwatch is running (LP: #1204861)
350
111
  * Timer sometimes does not reset its clock hands after stopping it (LP: #1197908)
351
112
  * Provide the ability to delete a stopwatch lap (LP: #1220375)
352
113
  * Scrolling list of cities overlaps labels (LP: #1219768)
353
114
  * Reset and lap icons appear pixelated on a phone (LP: #1218751)
354
115
  * While searching world cities provide a small pause before going online to search (LP: #1200410)
355
116
356
117
  [Camron]
357
118
  * Stopwatch runs backwards (LP: #1217743)
358
119
359
120
  [Andrew Starr-Bochicchio]
360
121
  * Sunrise/Sunset Times should be retrieved online sparingly (LP: #1200410)
361
122
362
123
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Fri, 06 Sep 2013 23:26:54 +0200
363
124
364
125
ubuntu-clock-app (0.5) saucy; urgency=low
365
126
366
127
  [Nekhelesh Ramananthan]
367
128
  * Added background gradients support with proper use of theme palette colors
368
129
  * Connected Sunrise/Sunset to the current location set by the user (LP: #1195701)
369
130
  * Fixed inaccurate timer touch input (LP: #1186396, #1168327)
370
131
  * Fixed second hand moving erratically in mobile devices (LP: #1186279)
371
132
  * Fixed timer being able to start without setting any time (LP: #1197914)
372
133
  * Fixed city name going over the search box (LP: #1199379)
373
134
374
135
  [Riccardo Padovani]
375
136
  * Added support to pause timer (LP: #1166264)
376
137
  * Added state names to world city search to distinguish cities with duplicate names (LP: #1197436)
377
138
  * Added autopilot test to test adding a timer (LP: #1188800)
378
139
  * Added autopilot test to run a saved timer preset (LP: #1188801)
379
140
  * Added autopilot test to delete a saved timer preset (LP: #1188807)
380
141
381
142
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Tue, 16 Jul 2013 21:24:53 +0200
382
143
383
144
ubuntu-clock-app (0.4) raring; urgency=low
384
145
385
146
  * Added World Clocks
386
147
  * Added autopilot tests for Stopwatch (LP: #1188796, #1188812, #1188794)
387
148
  * Implemented initial visual designs for Clock
388
149
  * Fixed Timer runs slower than expected (LP: #117655)
389
150
  * Add city clock from toolbar (LP: #1164943)
390
151
  * Added Animations for Clock, Timer and Stopwatch (LP: #1168325, #1169153)
391
152
392
153
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Fri, 14 Jun 2013 22:31:07 +0200
393
154
394
155
ubuntu-clock-app (0.3) raring; urgency=low
395
156
396
157
  * Added translations support 
397
158
398
159
 -- David Planella <david.planella@ubuntu.com>  Tue, 07 May 2013 16:10:25 +0200
399
160
400
161
ubuntu-clock-app (0.2) raring; urgency=low
401
162
402
163
  [ Nekhelesh Ramananthan ]
403
164
  * Fix Timer Label bugs (LP: #1172864, #1172865, #1173572).
404
165
  * Add blip to the stopwatch (LP: #1168468).
405
166
  * Tweak behavior of timer hand (LP: #1168335).
406
167
  * Timer format should read mm:ss and count upwards into minutes and hours (LP: #1171467).
407
168
408
169
  [ Alessandro Pozzi ]
409
170
  * Stopwatch needs to show 1/10th of a second in the label for better accuracy (LP: #1163855).
410
171
  * Add gradient to the stopwatch second hand (LP: #1168402).
411
172
412
173
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Sun, 28 Apr 2013 15:21:19 +0200
413
174
414
175
ubuntu-clock-app (0.1) raring; urgency=low
415
176
416
177
  [ Michael Hall ]
417
178
  * Initial release
418
179
419
180
  [ Juha Ristolainen ]
420
181
  * Implemented basic clock layout
421
182
422
183
  [ Nick Leppänen Larsson ]
423
184
  * Implemented Analog Clock Face API
424
185
  * Basic clock layout
425
186
426
187
  [ Nekhelesh Ramananthan ]
427
188
  * Add copyright/license headers to the clock app files (LP: #1164594)
428
189
  * Analog clock markers around 3,6,9,12 should be differentiated from others (LP: #1163852)
429
190
  * Clock app code style does not follow qml, javascript guidelines (LP: #1167040)
430
191
  * No easy way to set timer for an hour or more (LP: #1163854)
431
192
  
432
193
  [ Alessandro Pozzi ]
433
194
  * Timer function requires design for adding and editing presets (LP: #1164443)
434
195
  * Implemented basic stopwatch functionality
435
196
436
197
 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com>  Thu, 11 Apr 2013 21:09:19 +0200
437
0
198
438
=== added file 'debian/compat'
439
--- debian/compat	1970-01-01 00:00:00 +0000
440
+++ debian/compat	2014-08-11 16:19:22 +0000
441
@@ -0,0 +1,1 @@
442
1
9
443
0
2
444
=== added file 'debian/control'
445
--- debian/control	1970-01-01 00:00:00 +0000
446
+++ debian/control	2014-08-11 16:19:22 +0000
447
@@ -0,0 +1,42 @@
448
1
Source: ubuntu-clock-app
449
2
Priority: extra
450
3
Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
451
4
Build-Depends: cmake,
452
5
               debhelper (>= 9),
453
6
               gettext,
454
7
               intltool,
455
8
               python3 | python3-all | python3-dev | python3-all-dev,
456
9
               python3-minimal,
457
10
               qt5-default,
458
11
               qtbase5-dev,
459
12
               qtdeclarative5-dev
460
13
Standards-Version: 3.9.5
461
14
Section: misc
462
15
Homepage: https://launchpad.net/ubuntu-clock-app
463
16
Vcs-Bzr: https://code.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/trunk
464
17
XS-Testsuite: autopkgtest
465
18
466
19
Package: ubuntu-clock-app
467
20
Architecture: any
468
21
Depends: qmlscene,
469
22
         qtdeclarative5-localstorage-plugin,
470
23
         qtdeclarative5-qtquick2-plugin,
471
24
         qtdeclarative5-u1db1.0,
472
25
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
473
26
         qtdeclarative5-xmllistmodel-plugin,
474
27
         suru-icon-theme | ubuntu-mobile-icons,
475
28
         ${misc:Depends},
476
29
         ${shlibs:Depends}
477
30
Description: Clock application
478
31
 Ubuntu Core Clock application which provides Stopwatch, Timer, Alarm and Clock functionalities.
479
32
480
33
Package: ubuntu-clock-app-autopilot
481
34
Architecture: all
482
35
Depends: libautopilot-qt,
483
36
         libqt5test5,
484
37
         ubuntu-clock-app (>= ${source:Version}),
485
38
         ubuntu-ui-toolkit-autopilot,
486
39
         ${misc:Depends},
487
40
         ${python3:Depends}
488
41
Description: Autopilot tests for Ubuntu Clock Application
489
42
 This package contains autopilot tests for the Ubuntu Clock application.
490
0
43
491
=== added file 'debian/copyright'
492
--- debian/copyright	1970-01-01 00:00:00 +0000
493
+++ debian/copyright	2014-08-11 16:19:22 +0000
494
@@ -0,0 +1,54 @@
495
1
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
496
2
Upstream-Name: ubuntu-clock-app
497
3
Source: https://launchpad.net/ubuntu-clock-app
498
4
499
5
Files: *
500
6
Copyright: 2013, 2014 Canonical Ltd.
501
7
           2013 Alessandro Pozzi <signor.hyde@gmail.com>
502
8
           2013 Juha Ristolainen <juha.ristolainen@codemancers.fi>
503
9
           2013 Marco Biscaro <marcobiscaro2112@gmail.com>
504
10
           2013, 2014 Nekhelesh Ramananthan <krnekhelesh@gmail.com>
505
11
           2013 Nick Leppänen Larsson <frals@frals.se>
506
12
           2013 Omer Akram <om26er@ubuntu.com>
507
13
           2013 Paolo Rotolo <paolorotolo@ubuntu.com>
508
14
           2013, 2014 Riccardo Padovani <rpadovani@ubuntu.com>
509
15
           2014 Bartosz Kosiorek <gang65@poczta.onet.pl>
510
16
License: GPL-3
511
17
512
18
Files: debian/*
513
19
Copyright: 2013, 2014 Canonical Ltd.
514
20
License: LGPL-3
515
21
516
22
License: GPL-3
517
23
 This package is free software; you can redistribute it and/or
518
24
 modify it under the terms of the GNU General Public
519
25
 License as published by the Free Software Foundation; either
520
26
 version 3 of the License.
521
27
 .
522
28
 This package is distributed in the hope that it will be useful,
523
29
 but WITHOUT ANY WARRANTY; without even the implied warranty of
524
30
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
525
31
 General Public License for more details.
526
32
 .
527
33
 You should have received a copy of the GNU General Public License
528
34
 along with this program. If not, see <http://www.gnu.org/licenses/>.
529
35
 .
530
36
 On Debian systems, the complete text of the GNU General
531
37
 Public License can be found in "/usr/share/common-licenses/GPL-3".
532
38
533
39
License: LGPL-3
534
40
 This package is free software; you can redistribute it and/or
535
41
 modify it under the terms of the GNU Lesser General Public
536
42
 License as published by the Free Software Foundation; either
537
43
 version 3 of the License.
538
44
 .
539
45
 This package is distributed in the hope that it will be useful,
540
46
 but WITHOUT ANY WARRANTY; without even the implied warranty of
541
47
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
542
48
 Lesser General Public License for more details.
543
49
 .
544
50
 You should have received a copy of the GNU General Public License
545
51
 along with this program. If not, see <http://www.gnu.org/licenses/>.
546
52
 .
547
53
 On Debian systems, the complete text of the GNU Lesser General
548
54
 Public License can be found in "/usr/share/common-licenses/LGPL-3".
549
0
55
550
=== added file 'debian/rules'
551
--- debian/rules	1970-01-01 00:00:00 +0000
552
+++ debian/rules	2014-08-11 16:19:22 +0000
553
@@ -0,0 +1,20 @@
554
1
#!/usr/bin/make -f
555
2
# -*- makefile -*-
556
3
557
4
# Uncomment this to turn on verbose mode.
558
5
#export DH_VERBOSE=1
559
6
560
7
%:
561
8
	dh $@
562
9
563
10
override_dh_auto_configure:
564
11
	dh_auto_configure -- -DCLICK_MODE=OFF
565
12
566
13
override_dh_auto_test:
567
14
	echo
568
15
569
16
override_dh_install:
570
17
	dh_install --fail-missing
571
18
572
19
override_dh_python3:
573
20
	dh_python3 -pubuntu-clock-app-autopilot
574
0
21
575
=== added directory 'debian/source'
576
=== added file 'debian/source/format'
577
--- debian/source/format	1970-01-01 00:00:00 +0000
578
+++ debian/source/format	2014-08-11 16:19:22 +0000
579
@@ -0,0 +1,1 @@
580
1
1.0
581
0
2
582
=== added directory 'debian/tests'
583
=== added file 'debian/tests/control'
584
--- debian/tests/control	1970-01-01 00:00:00 +0000
585
+++ debian/tests/control	2014-08-11 16:19:22 +0000
586
@@ -0,0 +1,13 @@
587
1
Tests: make-autopilot make-test
588
2
Depends: autopilot-touch,
589
3
         cmake,
590
4
         libautopilot-qt,
591
5
         libqt5test5,
592
6
         python3-autopilot,
593
7
         qml-module-qttest,
594
8
         qt5-default,
595
9
         qtbase5-dev,
596
10
         qtdeclarative5-dev,
597
11
         qtdeclarative5-dev-tools,
598
12
         ubuntu-ui-toolkit-autopilot
599
13
Restrictions: build-needed
600
0
14
601
=== added file 'debian/tests/make-autopilot'
602
--- debian/tests/make-autopilot	1970-01-01 00:00:00 +0000
603
+++ debian/tests/make-autopilot	2014-08-11 16:19:22 +0000
604
@@ -0,0 +1,2 @@
605
1
#!/bin/sh
606
2
cd obj*; make autopilot
607
0
3
608
=== added file 'debian/tests/make-test'
609
--- debian/tests/make-test	1970-01-01 00:00:00 +0000
610
+++ debian/tests/make-test	2014-08-11 16:19:22 +0000
611
@@ -0,0 +1,2 @@
612
1
#!/bin/sh
613
2
cd obj*; make test
614
0
3
615
=== added file 'debian/ubuntu-clock-app-autopilot.install'
616
--- debian/ubuntu-clock-app-autopilot.install	1970-01-01 00:00:00 +0000
617
+++ debian/ubuntu-clock-app-autopilot.install	2014-08-11 16:19:22 +0000
618
@@ -0,0 +1,1 @@
619
1
/usr/lib/*/dist-packages/ubuntu_clock_app/*
620
0
2
621
=== added file 'debian/ubuntu-clock-app.install'
622
--- debian/ubuntu-clock-app.install	1970-01-01 00:00:00 +0000
623
+++ debian/ubuntu-clock-app.install	2014-08-11 16:19:22 +0000
624
@@ -0,0 +1,2 @@
625
1
usr/lib/*/qt5/qml/ClockApp/*
626
2
usr/share/*
627
0
3
628
=== modified file 'manifest.json'
629
--- manifest.json	2014-08-06 20:14:02 +0000
630
+++ manifest.json	2014-08-11 16:19:22 +0000
631
@@ -4,10 +4,11 @@
632
4
    "framework": "ubuntu-sdk-14.10-dev2",
4
    "framework": "ubuntu-sdk-14.10-dev2",
633
5
    "architecture": "all",
5
    "architecture": "all",
634
6
    "title": "Clock Reboot",
6
    "title": "Clock Reboot",
635
7
    "icon": "clock@30.png",
636
7
    "hooks": {
8
    "hooks": {
637
8
        "ubuntu-clock-app": {
9
        "ubuntu-clock-app": {
638
9
            "apparmor": "ubuntu-clock-app.json",
10
            "apparmor": "ubuntu-clock-app.json",
640
10
            "desktop": "ubuntu-clock-app.desktop"
11
            "desktop": "share/applications/ubuntu-clock-app.desktop"
641
11
        }
12
        }
642
12
    },
13
    },
643
13
    "version": "0.1",
14
    "version": "0.1",
644
14
15
645
=== added file 'tests/CMakeLists.txt'
646
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
647
+++ tests/CMakeLists.txt	2014-08-11 16:19:22 +0000
648
@@ -0,0 +1,1 @@
649
1
add_subdirectory(autopilot)
650
0
2
651
=== added file 'tests/autopilot/CMakeLists.txt'
652
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
653
+++ tests/autopilot/CMakeLists.txt	2014-08-11 16:19:22 +0000
654
@@ -0,0 +1,8 @@
655
1
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
656
2
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
657
3
658
4
if(INSTALL_TESTS)
659
5
    install(DIRECTORY ${AUTOPILOT_DIR}
660
6
        DESTINATION ${PYTHON_PACKAGE_DIR}
661
7
        )
662
8
endif(INSTALL_TESTS)
663
0
9
664
=== modified file 'tests/autopilot/run' (properties changed: -x to +x)
665
--- tests/autopilot/run	2014-07-31 16:58:56 +0000
666
+++ tests/autopilot/run	2014-08-11 16:19:22 +0000
667
@@ -7,5 +7,7 @@
668
7
7
669
8
SCRIPTPATH=`dirname $0`
8
SCRIPTPATH=`dirname $0`
670
9
pushd ${SCRIPTPATH}
9
pushd ${SCRIPTPATH}
672
10
autopilot run ubuntu-clock-app
10
autopilot run ubuntu_clock_app
673
11
retcode=$?
674
11
popd
12
popd
675
13
exit $retcode
676
12
14
677
=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
678
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-08 09:11:06 +0000
679
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-11 16:19:22 +0000
680
@@ -396,7 +396,8 @@
681
396
            raise ClockEmulatorException('Error deleting alarm.')
396
            raise ClockEmulatorException('Error deleting alarm.')
682
397
397
683
398
398
685
399
class ListItemWithActions(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
399
class ListItemWithActions(
686
400
        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
687
400
401
688
401
    def swipe_to_delete(self):
402
    def swipe_to_delete(self):
689
402
        x, y, width, height = self.globalRect
403
        x, y, width, height = self.globalRect
690
403
404
691
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
692
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-08-08 22:30:20 +0000
693
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-08-11 16:19:22 +0000
694
@@ -19,6 +19,7 @@
695
19
import os.path
19
import os.path
696
20
import os
20
import os
697
21
import shutil
21
import shutil
698
22
import glob
699
22
import logging
23
import logging
700
23
import fixtures
24
import fixtures
701
24
25
702
@@ -33,6 +34,32 @@
703
33
logger = logging.getLogger(__name__)
34
logger = logging.getLogger(__name__)
704
34
35
705
35
36
706
37
def find_local_path(what):
707
38
708
39
    """Depending on which directory we build in, paths might be
709
40
    named differently. This way we find them and don't have to
710
41
    hook into cmake variables.
711
42
712
43
    """
713
44
    if not what:
714
45
        return None
715
46
    if what.endswith("/"):
716
47
        what = what[:-1]
717
48
    for dirpath, dirnames, filenames in os.walk("../.."):
718
49
        avail_dirs = map(lambda a: os.path.abspath(os.path.join(dirpath, a)),
719
50
                         dirnames)
720
51
        match_dirs = filter(lambda a: a.endswith(what), avail_dirs)
721
52
        if match_dirs:
722
53
            return match_dirs[0]
723
54
724
55
        avail_files = map(lambda a: os.path.abspath(os.path.join(dirpath, a)),
725
56
                          filenames)
726
57
        match_files = filter(lambda a: a.endswith(what), avail_files)
727
58
        if match_files:
728
59
            return match_files[0]
729
60
    return None
730
61
731
62
732
36
class ClockAppTestCase(base.UbuntuUIToolkitAppTestCase):
63
class ClockAppTestCase(base.UbuntuUIToolkitAppTestCase):
733
37
64
734
38
    """A common test case class that provides several useful methods for
65
    """A common test case class that provides several useful methods for
735
@@ -41,13 +68,14 @@
736
41
    """
68
    """
737
42
69
738
43
    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
70
    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
744
44
    local_location_qml = os.path.join(
71
    local_location_qml = find_local_path("app/ubuntu-clock-app.qml")
745
45
        local_location, 'app/ubuntu-clock-app.qml')
72
    local_location_backend = find_local_path("backend/")
746
46
    local_location_backend = os.path.join(local_location, 'builddir/backend')
73
    installed_location_backend = ""
747
47
    installed_location_backend = \
74
    if glob.glob('/usr/lib/*/qt5/qml/ClockApp'):
748
48
        '/usr/share/ubuntu-clock-app/builddir/backend'
75
        installed_location_backend = \
749
76
            glob.glob('/usr/lib/*/qt5/qml/ClockApp')[0]
750
49
    installed_location_qml = \
77
    installed_location_qml = \
752
50
        '/usr/share/ubuntu-clock-app/app/ubuntu-clock-app.qml'
78
        '/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml'
753
51
79
754
52
    # note this directory could change to com.ubuntu.clock at some point
80
    # note this directory could change to com.ubuntu.clock at some point
755
53
    sqlite_dir = os.path.expanduser(
81
    sqlite_dir = os.path.expanduser(
756
54
82
757
=== modified file 'tests/unit/tst_hellocomponent.qml'
758
--- tests/unit/tst_hellocomponent.qml	2014-07-31 16:58:56 +0000
759
+++ tests/unit/tst_hellocomponent.qml	2014-08-11 16:19:22 +0000
760
@@ -1,7 +1,7 @@
761
1
import QtQuick 2.0
1
import QtQuick 2.0
762
2
import QtTest 1.0
2
import QtTest 1.0
763
3
import Ubuntu.Components 0.1
3
import Ubuntu.Components 0.1
765
4
import "../../components"
4
import "../../app/components"
766
5
5
767
6
// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
6
// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
768
7
7
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2014-08-12
Sergio Schvezov (community)		2014-08-07	Needs Fixing on 2014-08-07
Ubuntu Clock Developers		2014-08-01	Pending
Review via email: mp+229173@code.launchpad.net