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