Merge lp:~sergiusens/ubuntu-clock-app/reboot-packaging into lp:ubuntu-clock-app

Proposed by Sergio Schvezov on 2014-08-07
Status: Superseded
Proposed branch: lp:~sergiusens/ubuntu-clock-app/reboot-packaging
Merge into: lp:ubuntu-clock-app
Diff against target: 613 lines (+368/-65)
22 files modified
CMakeLists.txt (+20/-26)
app/CMakeLists.txt (+11/-5)
app/alarm/CMakeLists.txt (+1/-1)
app/clock/CMakeLists.txt (+1/-1)
app/components/CMakeLists.txt (+1/-1)
app/graphics/CMakeLists.txt (+5/-3)
app/worldclock/CMakeLists.txt (+1/-1)
backend/CMakeLists.txt (+10/-8)
cmake/Click.cmake (+0/-17)
debian/changelog (+181/-0)
debian/compat (+1/-0)
debian/control (+40/-0)
debian/copyright (+54/-0)
debian/rules (+17/-0)
debian/source/format (+1/-0)
debian/tests/control (+12/-0)
debian/tests/make-autopilot (+2/-0)
debian/tests/make-test (+2/-0)
debian/ubuntu-clock-app-autopilot.install (+1/-0)
debian/ubuntu-clock-app.install (+2/-0)
manifest.json (+2/-1)
tests/autopilot/run (+3/-1)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-clock-app/reboot-packaging
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing on 2014-08-07
Daniel Holbach 2014-08-07 Pending
Nekhelesh Ramananthan 2014-08-07 Pending
Review via email: mp+230011@code.launchpad.net

This proposal has been superseded by a proposal from 2014-08-07.

Description of the change

Changes:
- used a proper qt_imports_dir (still needs qml import updates).
- moved gnuinstalldirs higher up for better path management
- removed a bunch of very custom variables and build on top
- removed the install target for the gallery directory as it was a dup and going to the wrong path
- not installing icon for deb and just rely on us using the desktop default (we can depend on the suru icon set, it's there)
- made some rules filter out if not in qtcreator
- I've changed the path for a couple of things to use common subpaths in most cases, it may break some of your scenarios.

TODOs:
- change qml imports
- test (I haven't touched anything autopilot)

I hope this unblocks you guys

To post a comment you must log in.
review: Needs Fixing (continuous-integration)
60. By Daniel Holbach on 2014-08-08

* Using GnuInstallDirs takes care of the arch triplet.
* Used a proper qt_imports_dir (still needs qml import updates).
* Moved gnuinstalldirs higher up for better path management.
* Removed a bunch of very custom variables and build on top.
* Removed the install target for the gallery directory as it was a dup
  and going to the wrong path.
* Not installing icon for deb and just rely on us using the desktop
  default (we can depend on the suru icon set, it's there).
* Made some rules filter out if not in qtcreator.
* Changed the path for a couple of things to use common subpaths in most
  cases.

61. By Daniel Holbach on 2014-08-08

Fix path in Exec= line of .desktop file. (LP: #1354081)

62. By Daniel Holbach on 2014-08-08

fix changelog entry

63. By Daniel Holbach on 2014-08-08

Move module files into proper place. (LP: #1354079)

64. By Daniel Holbach on 2014-08-08

fix tests path for basic testcase

65. By Daniel Holbach on 2014-08-08

get 'make test' closer to actually working

66. By Daniel Holbach on 2014-08-08

merge from trunk

67. By Daniel Holbach on 2014-08-08

fix path location for upstreamcomponents

68. By Daniel Holbach on 2014-08-08

make pep8 happy

69. By Daniel Holbach on 2014-08-08

generalise local paths in tests somewhat

70. By Daniel Holbach on 2014-08-08

Make pep8 happy.

71. By Daniel Holbach on 2014-08-08

bring installation path more closely in line with other apps

72. By Daniel Holbach on 2014-08-08

Add -I argument to Exec line in .desktop file.

73. By Daniel Holbach on 2014-08-08

Install files into ubuntu-clock-app-autopilot again (LP: #1354074).

74. By Daniel Holbach on 2014-08-11

merge from trunk

75. By Daniel Holbach on 2014-08-11

merged lp:~nskaggs/ubuntu-clock-app/fix-ap-setup - resolve conflicts

76. By Daniel Holbach on 2014-08-11

remove 'builddir' portion from system-installed paths

77. By Nicholas Skaggs on 2014-08-12

remove find local path

78. By Nicholas Skaggs on 2014-08-12

fix pep8

79. By Nekhelesh Ramananthan on 2014-08-12

Merged trunk

80. By Sergio Schvezov on 2014-08-12

adding x-source to manifest for ci

81. By Sergio Schvezov on 2014-08-12

Install apparmor manifest where manifest.json points to

82. By Sergio Schvezov on 2014-08-12

Make it easy for us and let ubuntu-app-lauch use the expected import path

83. By Sergio Schvezov on 2014-08-12

Provision version and branch to x-source and version in the manifest

84. By Sergio Schvezov on 2014-08-12

Don't install tests into click package

Unmerged revisions

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

Subscribers

People subscribed via source and target branches