Merge lp:~nskaggs/ubuntu-clock-app/add-cmake into lp:ubuntu-clock-app/saucy

[Nicholas Skaggs]

Add cmake build
fix OSK from not be re-enabled after testing

Add cmake build
fix OSK from not be re-enabled after testing

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

FAILED: Continuous integration, rev:315
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/173/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/893/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/173/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/173/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/91/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/173/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:316
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/174/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/896/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/174/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/174/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/92/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/174/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:317
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/176/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/902/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/176/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/176/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/94/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/176/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

315. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-01

Launchpad automatic translations update.

[Nekhelesh Ramananthan (nik90)]

Please find someone to do the testing of this MP since I have absolutely no knowledge of CMAKE. Hence I wouldn't be able to review the MP.

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

316. By Victor Thompson on 2014-02-01

Force active focus of SearchBox text field. Fixes: https://bugs.launchpad.net/bugs/1274710.

Approved by Nekhelesh Ramananthan, Ubuntu Phone Apps Jenkins Bot.

317. By Victor Thompson on 2014-02-01

Increment/decrement hours count by winding clock in alarm. Fixes: https://bugs.launchpad.net/bugs/1274075.

Approved by Nekhelesh Ramananthan, Ubuntu Phone Apps Jenkins Bot.

318. By Victor Thompson on 2014-02-01

Propagate space key when pressed. Fixes: https://bugs.launchpad.net/bugs/1275084.

Approved by Ubuntu Phone Apps Jenkins Bot, Nekhelesh Ramananthan.

319. By Nekhelesh Ramananthan on 2014-02-01

Updated copyright of files that were changed this year 2014. Added missing copyright information to Blip and Settings files.

Approved by Riccardo Padovani, Ubuntu Phone Apps Jenkins Bot.

320. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-02

Launchpad automatic translations update.

321. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-03

Launchpad automatic translations update.

322. By Michal Predotka on 2014-02-03

Make timer hands snap to digits. Do not show 60 value for minutes and seconds in timer. Fixes: https://bugs.launchpad.net/bugs/1274127, https://bugs.launchpad.net/bugs/1274270.

Approved by Ubuntu Phone Apps Jenkins Bot, Nekhelesh Ramananthan.

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

FAILED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/191/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/939/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/191/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/191/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/109/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/191/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

323. By Nekhelesh Ramananthan on 2014-02-03

Transitioned sunrise/sunset times cache from LocalStorage to U1db. Fixes: https://bugs.launchpad.net/bugs/1269159.

Approved by Ubuntu Phone Apps Jenkins Bot, Andrew Hayzen.

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

FAILED: Continuous integration, rev:319
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/194/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/946/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/194/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/194/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/112/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/194/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/195/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/948
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/195
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/195
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/113

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/195/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/196/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/955
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/196
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/196
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/114

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/196/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/197/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/957
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/197
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/197
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/115

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/197/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/199/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/964
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/117

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/199/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

324. By Nekhelesh Ramananthan on 2014-02-04

Fixes the issue of overflowing labels in the clock, alarm and timer tabs. Also rearranges the alarm column to maintain consistency with other tabs. Fixes: https://bugs.launchpad.net/bugs/1275720.

Approved by Riccardo Padovani, Ubuntu Phone Apps Jenkins Bot.

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

FAILED: Continuous integration, rev:321
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/201/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/970
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/201
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/201
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/119

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/201/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

325. By Nekhelesh Ramananthan on 2014-02-05

Transitions timer preset list storage from LocalStorage to U1db. Fixes: https://bugs.launchpad.net/bugs/1276111.

Approved by Andrew Hayzen, Ubuntu Phone Apps Jenkins Bot.

326. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-06

Launchpad automatic translations update.

327. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-07

Launchpad automatic translations update.

328. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-08

Launchpad automatic translations update.

[Sergio Schvezov (sergiusens)]

sergiusens@rivendell:~/source/apps/clock/add-cmake$ bzr diff
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-02-04 19:18:22 +0000
+++ CMakeLists.txt 2014-02-08 18:30:56 +0000
@@ -10,14 +10,14 @@
 set(APP_NAME clock)
 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
+set(APP_HARDCODE ubuntu-clock-app)
 set(MAIN_QML ${APP_HARDCODE}.qml)
 set(ICON clock64.png)
 set(AUTOPILOT_DIR ubuntu_clock_app)
-set(APP_HARDCODE ubuntu-clock-app)

 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
- set(BZR_SOURCE "lp:ubuntu-${APP_HARDCODE}")
+ set(BZR_SOURCE "lp:${APP_HARDCODE}")
         message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
     endif(NOT DEFINED BZR_SOURCE)
     set(CMAKE_INSTALL_PREFIX /)
@@ -48,6 +48,7 @@
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      *.qml *.js *.png *.js)
 install(FILES ${SRC_FILES} DESTINATION ${DATA_DIR})
+install(DIRECTORY alarm clock common images stopwatch timer DESTINATION ${DATA_DIR})

 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})

review: Needs Fixing

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

329. By Nekhelesh Ramananthan on 2014-02-08

Transitions the storage of world clocks and current location of user from LocalStorage to U1db.

Approved by Ubuntu Phone Apps Jenkins Bot, Riccardo Padovani.

330. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-09

Launchpad automatic translations update.

331. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-02-10

Launchpad automatic translations update.

332. By Michal Predotka on 2014-02-10

Added snap to digit feature and also automatically change AM/PM indicator when going past teh 12 hour mark. Fixes: https://bugs.launchpad.net/bugs/1274077, https://bugs.launchpad.net/bugs/1274127.

Approved by Ubuntu Phone Apps Jenkins Bot, Nekhelesh Ramananthan.

333. By Nekhelesh Ramananthan on 2014-02-10

Updated autopilot sqlite_dir location in light of the recent transition to u1db for local storage.

Approved by Leo Arias, Ubuntu Phone Apps Jenkins Bot.

334. By Riccardo Padovani on 2014-02-10

Updated list of cities available offline. Fixes: https://bugs.launchpad.net/bugs/1203649.

Approved by Ubuntu Phone Apps Jenkins Bot, Nekhelesh Ramananthan.

335. By Nicholas Skaggs on 2014-02-10

add sergio's tweaks to enable cmake

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

FAILED: Continuous integration, rev:335
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/225/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1225
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/225
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/225
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/143

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/225/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

336. By Nicholas Skaggs on 2014-02-12

cmake build tweaks

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

FAILED: Continuous integration, rev:336
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/232/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1256
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/232
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/232
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/150

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

please run wrap-and-sort -t -a to fix the whitespacing et.al. in the packaging

review: Needs Fixing

[Sergio Schvezov (sergiusens)]

54 +install(DIRECTORY alarm click common images stopwatch timer DESTINATION ${DATA_DIR})

The 'click' in there is actually wrong ;-)

[Sergio Schvezov (sergiusens)]

add an install file rule for ubuntu-clock-app.qml

review: Needs Fixing

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

337. By Nicholas Skaggs on 2014-02-12

fix packaging whitespace, sort. tweak cmake install

338. By Nicholas Skaggs on 2014-02-12

XXXth tie is the charm for cmake?

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

FAILED: Continuous integration, rev:338
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/233/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1257/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/233/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/233/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/151/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/233/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/add-cmake]

339. By Nicholas Skaggs on 2014-02-12

order is important for cmake. cmake is not declarative, cmake is not declarative, say it with me

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

FAILED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/234/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1258
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/234
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/234
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/152

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/234/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/235/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1259
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/235
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/235
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/153

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/235/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/236/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/236
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/236
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/154

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/236/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

tests seems a bit flaky, but nik90 has some tweaks he'll be landing. we'll evaluate after

[Sergio Schvezov (sergiusens)]

great!

review: Approve

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-02-12 23:37:01 +0000
@@ -0,0 +1,65 @@
+project(com.ubuntu.clock)
+cmake_minimum_required(VERSION 2.8.9)
+
+# Standard install paths
+include(GNUInstallDirs)
+
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Installs to a contained location" off)
+
+set(APP_NAME clock)
+set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
+set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
+set(APP_HARDCODE ubuntu-clock-app)
+set(MAIN_QML ${APP_HARDCODE}.qml)
+set(ICON clock64.png)
+set(AUTOPILOT_DIR ubuntu_clock_app)
+
+if(CLICK_MODE)
+    if(NOT DEFINED BZR_SOURCE)
+        set(BZR_SOURCE "lp:${APP_HARDCODE}")
+        message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+    endif(NOT DEFINED BZR_SOURCE)
+    set(CMAKE_INSTALL_PREFIX /)
+    set(CMAKE_INSTALL_BINDIR /)
+    set(DATA_DIR /)
+    set(EXEC "qmlscene ${MAIN_QML}")
+    set(DESKTOP_DIR ${DATA_DIR})
+    set(URLS_DIR ${DATA_DIR})
+else(CLICK_MODE)
+    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
+    set(EXEC ${APP_HARDCODE})
+    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
+    configure_file(${APP_HARDCODE}.in
+        ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
+        DESTINATION ${CMAKE_INSTALL_BINDIR})
+    set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+    set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
+endif(CLICK_MODE)
+
+file(GLOB_RECURSE I18N_SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     rc/**.qml desktop/**.desktop.in)
+list(SORT I18N_SRC_FILES)
+
+
+file(GLOB SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.qml *.js *.png *.js)
+install(DIRECTORY alarm clock common images stopwatch timer
+    DESTINATION ${DATA_DIR})
+install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
+
+configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+    DESTINATION ${DESKTOP_DIR})
+
+install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
+
+# Tests
+enable_testing()
+
+add_subdirectory(click)
+add_subdirectory(po)
+add_subdirectory(tests)

=== removed directory 'apparmor'
=== added directory 'click'
=== added file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ click/CMakeLists.txt	2014-02-12 23:37:01 +0000
@@ -0,0 +1,8 @@
+if(CLICK_MODE)
+    if(NOT BZR_REVNO)
+        set(BZR_REVNO "latest")
+    endif(NOT BZR_REVNO)
+    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
+            DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)

=== renamed file 'apparmor/clock.json' => 'click/apparmor.json'
=== renamed file 'manifest.json' => 'click/manifest.json.in'
=== renamed file 'ubuntu-clock-app.desktop' => 'com.ubuntu.clock_clock.desktop.in'
--- ubuntu-clock-app.desktop	2013-10-11 22:36:12 +0000
+++ com.ubuntu.clock_clock.desktop.in	2014-02-12 23:37:01 +0000
@@ -2,9 +2,9 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/ubuntu-clock-app/ubuntu-clock-app.qml
-Icon=/usr/share/ubuntu-clock-app/clock64.png
+Exec=@EXEC@
+Icon=@ICON@
 Name=Clock
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.clock
+X-Ubuntu-Gettext-Domain=@PROJECT_NAME@

=== renamed file 'ubuntu-clock-app.url-dispatcher' => 'com.ubuntu.clock_clock.url-dispatcher'
=== modified file 'debian/control'
--- debian/control	2014-01-12 00:57:48 +0000
+++ debian/control	2014-02-12 23:37:01 +0000
@@ -1,7 +1,8 @@
 Source: ubuntu-clock-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9),
+Build-Depends: cmake,
+               debhelper (>= 9),
                gettext,
 Standards-Version: 3.9.4
 Section: misc
@@ -11,13 +12,13 @@
 Package: ubuntu-clock-app
 Section: misc
 Architecture: all
-Depends: ${misc:Depends},
-         qmlscene,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+Depends: qmlscene,
          qtdeclarative5-localstorage-plugin,
-	 qtdeclarative5-u1db1.0,
          qtdeclarative5-qtquick2-plugin,
-     qtdeclarative5-xmllistmodel-plugin,
+         qtdeclarative5-u1db1.0,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         qtdeclarative5-xmllistmodel-plugin,
+         ${misc:Depends},
 Description: Clock application
  Ubuntu Core Clock application which provides Stopwatch, Timer, Alarm and Clock functionalities.
 
@@ -25,8 +26,7 @@
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
+         ubuntu-clock-app (= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
-         ubuntu-clock-app (= ${source:Version}),
 Description: Autopilot tests for Ubuntu Clock Application
  This package contains autopilot tests for the Ubuntu Clock application.
-

=== modified file 'debian/rules'
--- debian/rules	2013-10-10 20:29:38 +0000
+++ debian/rules	2014-02-12 23:37:01 +0000
@@ -6,16 +6,3 @@
 
 %:
 	dh $@
-
-override_dh_install:
-	dh_install --fail-missing
-	appname=com.ubuntu.clock; \
-	debname=ubuntu-clock-app; \
-	for pofile in $(shell find ./po -name "*.po"); do \
-		pofilename="$${pofile##*/}"; \
-		langcode="$${pofilename%.*}"; \
-		localedir="debian/$$debname/usr/share/locale/$$langcode/LC_MESSAGES"; \
-		mkdir -p $$localedir; \
-		mofile="$$localedir/$$appname.mo"; \
-		msgfmt -o $$mofile $$pofile; \
-	done

=== modified file 'debian/ubuntu-clock-app-autopilot.install'
--- debian/ubuntu-clock-app-autopilot.install	2013-05-27 07:43:41 +0000
+++ debian/ubuntu-clock-app-autopilot.install	2014-02-12 23:37:01 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/ubuntu_clock_app/* usr/lib/python2.7/dist-packages/ubuntu_clock_app/
+usr/lib/*/dist-packages/ubuntu_clock_app/*

=== modified file 'debian/ubuntu-clock-app.install'
--- debian/ubuntu-clock-app.install	2014-01-14 20:26:17 +0000
+++ debian/ubuntu-clock-app.install	2014-02-12 23:37:01 +0000
@@ -1,11 +1,2 @@
-ubuntu-clock-app usr/bin/
-ubuntu-clock-app.desktop usr/share/applications/
-ubuntu-clock-app.url-dispatcher usr/share/url-dispatcher/urls/
-*.qml usr/share/ubuntu-clock-app/
-*.png usr/share/ubuntu-clock-app/
-alarm usr/share/ubuntu-clock-app/
-clock usr/share/ubuntu-clock-app/
-common usr/share/ubuntu-clock-app/
-images usr/share/ubuntu-clock-app/
-stopwatch usr/share/ubuntu-clock-app/
-timer usr/share/ubuntu-clock-app/
+usr/bin/*
+usr/share/*

=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-02-12 23:37:01 +0000
@@ -0,0 +1,25 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${PROJECT_NAME})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+add_custom_target(${POT_FILE}
+                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+                          -D ${CMAKE_SOURCE_DIR}
+                          --from-code=UTF-8
+                          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=tr --keyword=tr:1,2
+						  --package-name='${PROJECT}'
+                          --copyright-holder='Canonical Ltd.'
+                          ${I18N_SRC_FILES})
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2014-02-12 23:37:01 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(autopilot)

=== added file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/CMakeLists.txt	2014-02-12 23:37:01 +0000
@@ -0,0 +1,8 @@
+if(INSTALL_TESTS)
+execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(DIRECTORY ${AUTOPILOT_DIR}
+    DESTINATION ${PYTHON_PACKAGE_DIR}
+    )
+endif(INSTALL_TESTS)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-02-09 16:48:28 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-02-12 23:37:01 +0000
@@ -59,9 +59,7 @@
         #turn off the OSK so it doesn't block screen elements
         if model() != 'Desktop':
             os.system("stop maliit-server")
-            # adding cleanup step seems to restart
-            # service immediately; disabling for now
-            # self.addCleanup(os.system("start maliit-server"))
+            self.addCleanup(os.system,"start maliit-server")
 
         if os.path.exists(self.local_location):
             self.launch_test_local()
@@ -81,8 +79,6 @@
         self.app = self.launch_test_application(
             base.get_qmlscene_launch_command(),
             self.installed_location,
-            "--desktop_file_hint=/usr/share/applications/"
-            "ubuntu-clock-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 

=== renamed file 'ubuntu-clock-app' => 'ubuntu-clock-app.in'
--- ubuntu-clock-app	2013-03-11 11:32:05 +0000
+++ ubuntu-clock-app.in	2014-02-12 23:37:01 +0000
@@ -1,2 +1,3 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-clock-app/ubuntu-clock-app.qml
+export QT_SELECT=qt5
+qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@