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

[Sergio Schvezov]

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:60
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~sergiusens/ubuntu-clock-app/reboot-packaging/+merge/230011/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/128/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1411/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/128

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

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/ubuntu-clock-app/reboot-packaging]

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-26 09:34:15 +0000
+++ CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -2,7 +2,6 @@
 cmake_minimum_required(VERSION 2.8.9)
 
 set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 
 find_package(Qt5Core)
@@ -20,44 +19,39 @@
 set(APP_NAME                clock)
 set(APP_HARDCODE            ubuntu-clock-app)
 set(MAIN_QML                ${APP_HARDCODE}.qml)
-set(ICON                    [e-mail])
+set(ICON                    clock-app)
+
+# Standard install paths 
+include(GNUInstallDirs) 
 
 #set install paths
-if(${CLICK_MODE})
-  set(CMAKE_INSTALL_PREFIX /)
-  set(DATA_DIR /)
-  set(DESKTOP_DIR ${DATA_DIR})
-  set(UBUNTU-CLOCK-APP_DIR    "share/qml/ubuntu-clock-app")
-  set(ICON "${UBUNTU-CLOCK-APP_DIR}/${ICON}")
+if(CLICK_MODE)
+  set(CMAKE_INSTALL_PREFIX "/")
+  set(UBUNTU-CLOCK_APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
 
-  execute_process(
-      COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-      OUTPUT_VARIABLE ARCH_TRIPLET
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
-else()
-  set(DATA_DIR "share/clockapp")
-  set(DESKTOP_DIR ${DATA_DIR})
-  set(ICON "${DATA_DIR}/${ICON}")
-  set(UBUNTU-CLOCK-APP_DIR    "share/ubuntu-clock-app/qml")
-  include(GNUInstallDirs)
   set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
-endif()
+  set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+else(CLICK_MODE)
+  set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app/qml")
+  execute_process( 
+    COMMAND qmake -query QT_INSTALL_QML 
+            OUTPUT_VARIABLE QT_IMPORTS_DIR 
+            OUTPUT_STRIP_TRAILING_WHITESPACE 
+    )
 
-set(EXEC "qmlscene $@ ${UBUNTU-CLOCK-APP_DIR}/${MAIN_QML}")
+  set(EXEC "qmlscene $@ ${CMAKE_INSTALL_DATADIR}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+endif(CLICK_MODE)
 
 if(${CLICK_MODE})
   install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_DATADIR})
 endif()
-install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
-install(FILES "${APP_HARDCODE}.json" DESTINATION ${DATA_DIR})
 
 add_subdirectory(app)
 add_subdirectory(backend)
 
-add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
-                    COMMAND ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
+add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/tests/autopilot/run
+                    COMMAND ${CMAKE_SOURCE_DIR}/tests/autopilot/run
                     DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
                     WORKING_DIRECTORY ./app)
 
 
=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2014-07-13 11:18:31 +0000
+++ app/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -1,14 +1,20 @@
-file(GLOB QML_JS_FILES *.qml *.js *.png)
-
-# make the files visible on qtcreator
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+
+if(CLICK_MODE)
+  set(ICON "${ICON}@30.png")
+  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
 
 # substitute variables in the desktop file
 set(DESKTOP_FILE "ubuntu-clock-app.desktop")
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
-install(FILES ${QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} 
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CLOCK_APP_DIR})
 
 add_subdirectory(clock)
 add_subdirectory(alarm)
 
=== modified file 'app/alarm/CMakeLists.txt'
--- app/alarm/CMakeLists.txt	2014-06-16 14:09:12 +0000
+++ app/alarm/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})
 
-install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/alarm)
+install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/alarm)
 
=== modified file 'app/clock/CMakeLists.txt'
--- app/clock/CMakeLists.txt	2014-06-06 18:45:49 +0000
+++ app/clock/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})
 
-install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/clock)
+install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/clock)
 
=== modified file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	2014-06-06 18:45:49 +0000
+++ app/components/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
 
-install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/components)
+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/components)
 
=== modified file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt	2014-06-06 18:45:49 +0000
+++ app/graphics/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -1,6 +1,8 @@
-file(GLOB IMAGES_PNG_FILES *.png *.jpg)
+file(GLOB GRAPHICS_FILES *.png *.jpg)
 
 # make the files visible in the qtcreator tree
-add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+  add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
-install(FILES ${IMAGES_PNG_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/graphics)
+install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)
 
=== modified file 'app/worldclock/CMakeLists.txt'
--- app/worldclock/CMakeLists.txt	2014-07-13 11:18:31 +0000
+++ app/worldclock/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})
 
-install(FILES ${WORLDCLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/worldclock)
+install(FILES ${WORLDCLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/worldclock)
 
=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2014-07-26 09:34:15 +0000
+++ backend/CMakeLists.txt	2014-08-07 21:04:22 +0000
@@ -66,12 +66,14 @@
     DEPENDS ${QMLFILES}
 )
 
+set(MODULE_PATH ${QT_IMPORTS_DIR}/Clock)
+
 # Install plugin file
-install(TARGETS timezone DESTINATION ${QT_IMPORTS_DIR}/Timezone/)
-install(FILES   modules/Timezone/qmldir DESTINATION ${QT_IMPORTS_DIR}/Timezone/)
-
-install(TARGETS datetime DESTINATION ${QT_IMPORTS_DIR}/DateTime/)
-install(FILES   modules/DateTime/qmldir DESTINATION ${QT_IMPORTS_DIR}/DateTime/)
-
-install(TARGETS alarmsettings DESTINATION ${QT_IMPORTS_DIR}/Alarm/Settings/)
-install(FILES   modules/Alarm/Settings/qmldir DESTINATION ${QT_IMPORTS_DIR}/Alarm/Settings/)
+install(TARGETS timezone DESTINATION ${MODULE_PATH}/Timezone/)
+install(FILES   modules/Timezone/qmldir DESTINATION ${MODULE_PATH}/Timezone/)
+
+install(TARGETS datetime DESTINATION ${MODULE_PATH}/DateTime/)
+install(FILES   modules/DateTime/qmldir DESTINATION ${MODULE_PATH}/DateTime/)
+
+install(TARGETS alarmsettings DESTINATION ${MODULE_PATH}/Alarm/Settings/)
+install(FILES   modules/Alarm/Settings/qmldir DESTINATION ${MODULE_PATH}/Alarm/Settings/)
 
=== removed directory 'cmake'
=== removed file 'cmake/Click.cmake'
--- cmake/Click.cmake	2014-06-06 18:45:49 +0000
+++ cmake/Click.cmake	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-if(CLICK_MODE)
-    STRING(REPLACE "/usr/" "/"  QT_IMPORTS_DIR  ${QT_IMPORTS_DIR})
-    set(CMAKE_INSTALL_PREFIX /)
-    set(CMAKE_INSTALL_BINDIR /)
-        set(DATA_DIR /)
-        set(EXEC "qmlscene $@ -I .${QT_IMPORTS_DIR} ${UBUNTU-CLOCK-APP_DIR}/${MAIN_QML}")
-        set(DESKTOP_DIR ${DATA_DIR})
-        set(ICON ".${DATA_DIR}/${ICON}")
-    install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
-    install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
-    install(FILES "${CMAKE_PROJECT_NAME}.json" DESTINATION ${DATA_DIR})
-else(CLICK_MODE)
-        set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
-        set(EXEC "qmlscene $@ ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/qml/${MAIN_QML}")
-        set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
-        set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-endif(CLICK_MODE)
 
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-08-07 21:04:22 +0000
@@ -0,0 +1,181 @@
+ubuntu-clock-app (1.2) utopic; urgency=medium
+
+  [ Daniel Holbach ]
+  * Fix debhelper-but-no-misc-depends ubuntu-clock-app-autopilot.
+  * Bump Standards-Version to 3.9.5, no changes required.
+  * Add missing build-depends. 
+  * Run 'wrap-and-sort'.
+  * Don't try to install files from usr/bin, there are none.
+  * Install files from usr/lib.
+  * Fail if not all files can be installed.
+  * Make ubuntu-clock-app Arch:any.
+  * Don't install 'ubuntu-clock-app-autopilot' files for now.
+    Bits in the cmake installation have to be fixed.
+  * Add ${shlibs:Depends} to Depends.
+  * Remove duplicate 'Section' definition.
+  * Relax dependency from ubuntu-clock-app-autopilot on ubuntu-clock-app
+    somewhat.
+  * Run tests as autopkgtest. (LP: #1354091)
+  * Don't return ignore of autopilot test execution. (LP: #1354095)
+
+  [ Jussi Pakkanen ]
+  * Use CMake's testing framework instead of a custom target.
+  * Only install manifest in click mode.
+  * Spaces are tabs.
+  * Add a CMake option to build both as a click app and a regular one.
+
+ -- Daniel Holbach <[e-mail]>  Fri, 01 Aug 2014 09:16:35 +0200
+
+ubuntu-clock-app (1.1) raring; urgency=medium
+
+  * New icon
+  * Add -qt5 command line option (LP: #1288885)
+  * Update framework and apparmor profile version
+
+ -- Alan Pope <[e-mail]>  Fri, 02 May 2014 13:57:25 +0100
+
+ubuntu-clock-app (1.0) saucy; urgency=low
+
+  [Nekhelesh Ramananthan]
+  * World Clock list needs to inform user when results cannot be retrieved due to network error (LP: #1231106)
+  * Load premade presets for new user so user doesn't end up in blank app (LP: #1226131)
+  * Return more fine-grained territorial divisions for city search results (LP: #1230153)
+  * Improve the visual appearance of the clock, timer, stopwatch and alarm
+  * Removed hour support from timer
+  
+  [Sergio Schvezov]
+  * Translation for desktop and debian package
+  * Fix click package confinement issues
+
+  [Riccardo Padovani]
+  * Alarm notifications do not appear when an alarm is triggered (LP: #1233176)
+
+  [Nicholas Skaggs]
+  * Several apps have failing tests with 20131003 ui-toolkit (LP: #1234544)
+
+  [Andrea Cerisara]
+  * Autopilot Testcase Needed: Test Add World Clock (LP: #1210196)
+  * Autopilot Testcase Needed: Test Delete World Clock (LP: #1210197)
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Fri, 11 Oct 2013 01:45:36 +0200
+
+ubuntu-clock-app (0.7) saucy; urgency=low
+
+  [Nekhelesh Ramananthan]
+  * Alarm doesn't work (LP: #1187994)
+  * Clock app does not honor timezone (LP: #1191291)
+  * Clocks need to sync better and use the same backend (LP: #1201830)
+  * Clock reports time in UTC by default (LP: #1201858)
+  * On scrolling down page, hide tab header (LP: #1226128)
+  * Very difficult to select bottom city in scrollable list of 4 or more (LP: #1227674)
+  * There is no effect on the circle shape (LP: #1215332)
+  * HUD actions should not appear for toolbar button such as save or cancel (LP: #1224891)
+
+  [Paolo Rotolo]
+  * Add error message if no cities were found (LP: #1222235)
+  * Timer label updates before the timer hand reaches destination (LP: #1172869)
+  * Cancel toolbar action needs the correct icon (LP: #1222942) 
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Fri, 27 Sep 2013 12:47:21 +0200
+
+ubuntu-clock-app (0.6) saucy; urgency=low
+
+  [Nekhelesh Ramananthan]
+  * Digital clock font size is smaller than design spec (LP: #1215334)
+  * Font in world city list are too big (LP: #1200594)
+  * Timer does not inform user if there are no presets (LP: #1169182)
+  * Clicking the Add preset or add city button should reflect on the title for visual feedback (LP: #1168329)
+  * In Timer, clock face is off screen when selecting preset (LP: #1219770)
+  * Toolbar prevents text preset from accepting input (LP: #1209024)
+
+  [Paolo Rotolo]
+  * Search button icon is not as per design specifications (LP: #1221252)
+  * Search icon isn't in Ubuntu Touch Style (LP: #1202364)
+  * Reset button doesn't work while the stopwatch is running (LP: #1204861)
+  * Timer sometimes does not reset its clock hands after stopping it (LP: #1197908)
+  * Provide the ability to delete a stopwatch lap (LP: #1220375)
+  * Scrolling list of cities overlaps labels (LP: #1219768)
+  * Reset and lap icons appear pixelated on a phone (LP: #1218751)
+  * While searching world cities provide a small pause before going online to search (LP: #1200410)
+
+  [Camron]
+  * Stopwatch runs backwards (LP: #1217743)
+
+  [Andrew Starr-Bochicchio]
+  * Sunrise/Sunset Times should be retrieved online sparingly (LP: #1200410)
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Fri, 06 Sep 2013 23:26:54 +0200
+
+ubuntu-clock-app (0.5) saucy; urgency=low
+
+  [Nekhelesh Ramananthan]
+  * Added background gradients support with proper use of theme palette colors
+  * Connected Sunrise/Sunset to the current location set by the user (LP: #1195701)
+  * Fixed inaccurate timer touch input (LP: #1186396, #1168327)
+  * Fixed second hand moving erratically in mobile devices (LP: #1186279)
+  * Fixed timer being able to start without setting any time (LP: #1197914)
+  * Fixed city name going over the search box (LP: #1199379)
+
+  [Riccardo Padovani]
+  * Added support to pause timer (LP: #1166264)
+  * Added state names to world city search to distinguish cities with duplicate names (LP: #1197436)
+  * Added autopilot test to test adding a timer (LP: #1188800)
+  * Added autopilot test to run a saved timer preset (LP: #1188801)
+  * Added autopilot test to delete a saved timer preset (LP: #1188807)
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Tue, 16 Jul 2013 21:24:53 +0200
+
+ubuntu-clock-app (0.4) raring; urgency=low
+
+  * Added World Clocks
+  * Added autopilot tests for Stopwatch (LP: #1188796, #1188812, #1188794)
+  * Implemented initial visual designs for Clock
+  * Fixed Timer runs slower than expected (LP: #117655)
+  * Add city clock from toolbar (LP: #1164943)
+  * Added Animations for Clock, Timer and Stopwatch (LP: #1168325, #1169153)
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Fri, 14 Jun 2013 22:31:07 +0200
+
+ubuntu-clock-app (0.3) raring; urgency=low
+
+  * Added translations support 
+
+ -- David Planella <[e-mail]>  Tue, 07 May 2013 16:10:25 +0200
+
+ubuntu-clock-app (0.2) raring; urgency=low
+
+  [ Nekhelesh Ramananthan ]
+  * Fix Timer Label bugs (LP: #1172864, #1172865, #1173572).
+  * Add blip to the stopwatch (LP: #1168468).
+  * Tweak behavior of timer hand (LP: #1168335).
+  * Timer format should read mm:ss and count upwards into minutes and hours (LP: #1171467).
+
+  [ Alessandro Pozzi ]
+  * Stopwatch needs to show 1/10th of a second in the label for better accuracy (LP: #1163855).
+  * Add gradient to the stopwatch second hand (LP: #1168402).
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Sun, 28 Apr 2013 15:21:19 +0200
+
+ubuntu-clock-app (0.1) raring; urgency=low
+
+  [ Michael Hall ]
+  * Initial release
+
+  [ Juha Ristolainen ]
+  * Implemented basic clock layout
+
+  [ Nick Leppänen Larsson ]
+  * Implemented Analog Clock Face API
+  * Basic clock layout
+
+  [ Nekhelesh Ramananthan ]
+  * Add copyright/license headers to the clock app files (LP: #1164594)
+  * Analog clock markers around 3,6,9,12 should be differentiated from others (LP: #1163852)
+  * Clock app code style does not follow qml, javascript guidelines (LP: #1167040)
+  * No easy way to set timer for an hour or more (LP: #1163854)
+  
+  [ Alessandro Pozzi ]
+  * Timer function requires design for adding and editing presets (LP: #1164443)
+  * Implemented basic stopwatch functionality
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Thu, 11 Apr 2013 21:09:19 +0200
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-08-07 21:04:22 +0000
@@ -0,0 +1,1 @@
+9
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-08-07 21:04:22 +0000
@@ -0,0 +1,40 @@
+Source: ubuntu-clock-app
+Priority: extra
+Maintainer: Ubuntu App Cats <[e-mail]>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               gettext,
+               intltool,
+               python3-minimal,
+               qt5-default,
+               qtbase5-dev,
+               qtdeclarative5-dev
+Standards-Version: 3.9.5
+Section: misc
+Homepage: https://launchpad.net/ubuntu-clock-app
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/trunk
+XS-Testsuite: autopkgtest
+
+Package: ubuntu-clock-app
+Architecture: any
+Depends: qmlscene,
+         qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-u1db1.0,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         qtdeclarative5-xmllistmodel-plugin,
+         suru-icon-theme | ubuntu-mobile-icons,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Clock application
+ Ubuntu Core Clock application which provides Stopwatch, Timer, Alarm and Clock functionalities.
+
+Package: ubuntu-clock-app-autopilot
+Architecture: all
+Depends: libautopilot-qt,
+         libqt5test5,
+         ubuntu-clock-app (>= ${source:Version}),
+         ubuntu-ui-toolkit-autopilot,
+         ${misc:Depends}
+Description: Autopilot tests for Ubuntu Clock Application
+ This package contains autopilot tests for the Ubuntu Clock application.
 
=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-08-07 21:04:22 +0000
@@ -0,0 +1,54 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntu-clock-app
+Source: https://launchpad.net/ubuntu-clock-app
+
+Files: *
+Copyright: 2013, 2014 Canonical Ltd.
+           2013 Alessandro Pozzi <[e-mail]>
+           2013 Juha Ristolainen <[e-mail]>
+           2013 Marco Biscaro <[e-mail]>
+           2013, 2014 Nekhelesh Ramananthan <[e-mail]>
+           2013 Nick Leppänen Larsson <[e-mail]>
+           2013 Omer Akram <[e-mail]>
+           2013 Paolo Rotolo <[e-mail]>
+           2013, 2014 Riccardo Padovani <[e-mail]>
+           2014 Bartosz Kosiorek <[e-mail]>
+License: GPL-3
+
+Files: debian/*
+Copyright: 2013, 2014 Canonical Ltd.
+License: LGPL-3
+
+License: GPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-3".
 
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-08-07 21:04:22 +0000
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCLICK_MODE=OFF
+
+override_dh_auto_test:
+	echo
+
+override_dh_install:
+	dh_install --fail-missing
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-08-07 21:04:22 +0000
@@ -0,0 +1,1 @@
+1.0
 
=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2014-08-07 21:04:22 +0000
@@ -0,0 +1,12 @@
+Tests: make-autopilot make-test
+Depends: autopilot-touch,
+         cmake,
+         libautopilot-qt,
+         libqt5test5,
+         python3-autopilot,
+         qt5-default,
+         qtbase5-dev,
+         qtdeclarative5-dev,
+         qtdeclarative5-dev-tools,
+         ubuntu-ui-toolkit-autopilot
+Restrictions: build-needed
 
=== added file 'debian/tests/make-autopilot'
--- debian/tests/make-autopilot	1970-01-01 00:00:00 +0000
+++ debian/tests/make-autopilot	2014-08-07 21:04:22 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+cd obj*; make autopilot
 
=== added file 'debian/tests/make-test'
--- debian/tests/make-test	1970-01-01 00:00:00 +0000
+++ debian/tests/make-test	2014-08-07 21:04:22 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+cd obj*; make test
 
=== added file 'debian/ubuntu-clock-app-autopilot.install'
--- debian/ubuntu-clock-app-autopilot.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-clock-app-autopilot.install	2014-08-07 21:04:22 +0000
@@ -0,0 +1,1 @@
+#usr/lib/*/dist-packages/ubuntu_clock_app/*
 
=== added file 'debian/ubuntu-clock-app.install'
--- debian/ubuntu-clock-app.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-clock-app.install	2014-08-07 21:04:22 +0000
@@ -0,0 +1,2 @@
+usr/lib/*
+usr/share/*
 
=== modified file 'manifest.json'
--- manifest.json	2014-07-31 19:33:54 +0000
+++ manifest.json	2014-08-07 21:04:22 +0000
@@ -4,10 +4,11 @@
     "framework": "ubuntu-sdk-14.10-dev2",
     "architecture": "all",
     "title": "Clock Reboot",
+    "icon": "[e-mail]",
     "hooks": {
         "ubuntu-clock-app": {
             "apparmor": "ubuntu-clock-app.json",
-            "desktop": "ubuntu-clock-app.desktop"
+            "desktop": "share/applications/ubuntu-clock-app.desktop"
         }
     },
     "version": "0.1",
 
=== modified file 'tests/autopilot/run' (properties changed: -x to +x)
--- tests/autopilot/run	2014-07-31 16:58:56 +0000
+++ tests/autopilot/run	2014-08-07 21:04:22 +0000
@@ -7,5 +7,7 @@
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run ubuntu-clock-app
+autopilot run ubuntu_clock_app
+retcode=$?
 popd
+exit $retcode