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

[Nicholas Skaggs]

Various changes to the packaging to make it work with the newest ubuntu-clock-app.

RESUBMIT under team branch.

Various changes to the packaging to make it work with the newest ubuntu-clock-app.

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

FAILED: Continuous integration, rev:42
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/~dholbach/ubuntu-clock-app/reboot-packaging/+merge/229173/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/97/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1247/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/97/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:48
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/~dholbach/ubuntu-clock-app/reboot-packaging/+merge/229173/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/98/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1248/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/98/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Can you merge trunk as it now has a working autopilot test. I will follow up with sergieusens asap.

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

FAILED: Continuous integration, rev:50
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/~dholbach/ubuntu-clock-app/reboot-packaging/+merge/229173/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/108/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1284/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/108/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:55
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/109/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1286/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1286/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/109

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Daniel, I got the "make autopilot" to work. The first fix needed was already done by you in rev 51 (adjusting CMakeList.txt file to point at the new test path). The second fix needed is to rename ubuntu-clock-app to ubuntu_clock_app in the tests/autopilot/run file.

=== 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-05 10:13:21 +0000
@@ -7,5 +7,5 @@

 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run ubuntu-clock-app
+autopilot run ubuntu_clock_app

After which I get it passing,

nik90@nik90-devel:~/Clock/add-alarm-test/builddir$ make autopilot
[ 0%] Built target alarmsettings-qmldir
[ 7%] Automoc for target timezone
[ 7%] Built target timezone_automoc
[ 42%] Built target timezone
[ 50%] Automoc for target datetime
[ 50%] Built target datetime_automoc
[ 71%] Built target datetime
[ 78%] Automoc for target alarmsettings
[ 78%] Built target alarmsettings_automoc
[100%] Built target alarmsettings
[100%] Built target timezone-qmldir
[100%] Built target datetime-qmldir
~/Clock/add-alarm-test/tests/autopilot ~/Clock/add-alarm-test/builddir/app
Loading tests from: /home/nik90/Clock/add-alarm-test/tests/autopilot

Tests running...

Ran 1 test in 48.013s
OK
~/Clock/add-alarm-test/builddir/app
[100%] Built target autopilot

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

FAILED: Continuous integration, rev:57
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/110/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1289/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1289/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/110

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

review: Needs Fixing (continuous-integration)

[Daniel Holbach (dholbach)]

A number of files are not installed in the right place or not present/installed at all:

 - backend/ directory is missing
 - files in usr/lib probably need their own, a bit more descriptive directory name
 - files for the -autopilot package are not installed anywhere
 - .desktop file.

[Sergio Schvezov (sergiusens)]

one inline comment for now, more later

review: Needs Fixing

[Daniel Holbach (dholbach)]

https://bugs.launchpad.net/ubuntu-clock-app/+bugs?field.tag=reboot are the issues I can think of right now.

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

FAILED: Continuous integration, rev:58
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/125/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1400/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1400/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/125

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:59
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/126/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1403/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1403/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/126

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:60
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/132/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1419/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1419/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/132

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:63
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/133/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1421/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/133/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:66
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/134/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1422/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/134/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:67
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/135/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1423/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/135/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/136/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1424/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1424/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/136

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/137/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1425/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/137/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:70
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/138/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1426/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1426/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/138

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:71
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/139/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1427/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1427/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/139

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:72
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/140/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1428/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1428/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/140

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/141/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1430/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1430/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/141

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/156/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1466/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1466/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/156

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/163/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1476/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1476/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/163

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/169/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1487/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1487/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/169

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/171/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/3
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/3/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/171

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I dropped the find_local_path as the python code was failing and I intend to propose a better solution in a future mp. No matter what we decide, this reverts to trunk and we can address the local path issue in another MP.

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

FAILED: Continuous integration, rev:77
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/~ubuntu-clock-dev/ubuntu-clock-app/reboot-packaging/+merge/230530/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/172/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/4/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/172/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/173/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/5/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/173/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/174/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/6
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/6/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/174

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/175/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/7
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/7/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/175

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Sergiusens fixed the remaining issues w.r.t to the click package. Please do not merge. I want to do one final review before approving and merging to trunk.

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

PASSED: Continuous integration, rev:80
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/176/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/8
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/8/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/176

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:81
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/179/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/11
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/11/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/179

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:82
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/180/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/12
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/12/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/180

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:83
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/181/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/13
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/13/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/181

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

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

I made some changes to be more in line with other phone packages in Ubuntu (originally instructed in https://wiki.ubuntu.com/DailyRelease/InlinePackaging).

If you want, you can keep the old version numbering as long as this is not hitting the Ubuntu archives officially. Also, "UNRELEASED" for the version is just normal what's done when wanting to have the CI Train to append it's own date format and do the official releasing, which is not applicable here.

Anyway, builds fine, looks fine.

review: Approve

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

PASSED: Continuous integration, rev:84
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/182/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/14
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/14/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/182

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Lgtm now.

review: Approve (cmake and click packaging)

[Nekhelesh Ramananthan (nik90)]

Sry forgot to do one small fix which was to update cmake to point at the lp:ubuntu-clock-app/reboot branch instead of the old lp:ubuntu-clock-app branch. I fixed this in rev 87

review: Approve

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

PASSED: Continuous integration, rev:86
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/183/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/15
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/15/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/183

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-autolanding/11/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1505/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1505/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-autolanding/11

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:87
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/184/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/16
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/16/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/184

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-autolanding/12/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1508/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1508/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-autolanding/12

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Autolanding job was not correctly updated when the ci job was to used the python3 specific test runner. This has been fixed.

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

review: Approve (continuous-integration)

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2014-08-13 12:03:59 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-26 09:34:15 +0000
+++ CMakeLists.txt	2014-08-13 12:03:59 +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,51 +19,66 @@
 set(APP_NAME                clock)
 set(APP_HARDCODE            ubuntu-clock-app)
 set(MAIN_QML                ${APP_HARDCODE}.qml)
-set(ICON                    [e-mail])
+set(ICON                    clock-app)
+SET(AUTOPILOT_DIR           ubuntu_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}")
+  set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+  set(MODULE_PATH ${QT_IMPORTS_DIR})
+  if(NOT BZR_REVNO)
+    execute_process( 
+      COMMAND bzr revno
+              OUTPUT_VARIABLE BZR_REVNO 
+              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+              OUTPUT_STRIP_TRAILING_WHITESPACE 
+      )
+  endif(NOT BZR_REVNO)
+  if(NOT BZR_SOURCE)
+    set(BZR_SOURCE lp:${APP_HARDCODE}/reboot)
+    message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+  endif(NOT BZR_SOURCE)
+else(CLICK_MODE)
+  set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app")
+  execute_process( 
+    COMMAND qmake -query QT_INSTALL_QML 
+            OUTPUT_VARIABLE QT_IMPORTS_DIR 
+            OUTPUT_STRIP_TRAILING_WHITESPACE 
+    )
+set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
+endif(CLICK_MODE)
 
 if(${CLICK_MODE})
-  install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  message("-- Configuring manifest.json")
+  configure_file(manifest.json manifest.json)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_PREFIX})
+else(CLICK_MODE)
+  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
 endif()
-install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
-install(FILES "${APP_HARDCODE}.json" DESTINATION ${DATA_DIR})
 
 add_subdirectory(app)
 add_subdirectory(backend)
+if(NOT CLICK_MODE)
+  add_subdirectory(tests)
+endif(NOT CLICK_MODE)
 
-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)
 
 enable_testing()
 add_test(NAME basic
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/app
-  COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+  COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/tests/unit -import ${CMAKE_BINARY_DIR}/backend
 )
 
 add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/ubuntu-clock-app.qml

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2014-07-28 13:02:59 +0000
+++ app/CMakeLists.txt	2014-08-13 12:03:59 +0000
@@ -1,14 +1,21 @@
-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")
+message("-- Configuring ubuntu-clock-app.desktop.in")
 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-13 12:03:59 +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-13 12:03:59 +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-13 12:03:59 +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-13 12:03:59 +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/upstreamcomponents/CMakeLists.txt'
--- app/upstreamcomponents/CMakeLists.txt	2014-07-28 13:02:59 +0000
+++ app/upstreamcomponents/CMakeLists.txt	2014-08-13 12:03:59 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})
 
-install(FILES ${UPSTREAM_COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/upstreamcomponents)
+install(FILES ${UPSTREAM_COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/upstreamcomponents)

=== modified file 'app/worldclock/CMakeLists.txt'
--- app/worldclock/CMakeLists.txt	2014-07-13 11:18:31 +0000
+++ app/worldclock/CMakeLists.txt	2014-08-13 12:03:59 +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-13 12:03:59 +0000
@@ -67,11 +67,11 @@
 )
 
 # 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-13 12:03:59 +0000
@@ -0,0 +1,327 @@
+ubuntu-clock-app (3.0-0ubuntu1) 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.
+  * Install files into ubuntu-clock-app-autopilot again (LP: #1354074).
+  * 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 ignore return code of autopilot test execution. (LP: #1354095)
+  * Fix path in Exec= line of .desktop file. (LP: #1354081) 
+  * Move module files into proper place. (LP: #1354079)
+  * Make pep8 happy.
+  * Add -I argument to Exec line in .desktop file.
+
+  [ 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.
+
+  [ Sergio Schvezov ]
+  * 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.
+
+ -- Daniel Holbach <[e-mail]>  Wed, 13 Aug 2014 11:24:41 +0000
+
+ubuntu-clock-app (2.9) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Added multiselect mode for alarms list as per design (LP: #1349882)
+  * Fixed a small portion of the listitem behind left behind after
+    deleting it. (LP: #1354617)
+  * Added vibration settings option for alarms (LP: #1350017)
+  
+  [Michael Zanetti]
+  * Improve the performance of the world city list by creating QTimeZone
+    objects only once as they are really slow to create. (LP: #1350433)
+  
+  [Nicholas Skaggs]
+  * Tweak AP setup and launching
+  
+ -- Nekhelesh Ramananthan <[e-mail]>  Mon, 11 Aug 2014 16:20:00 +0200
+
+ubuntu-clock-app (2.8) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Implemented custom swipe delete for list items (LP: #1349881)
+  * Synced bottom edge component with upstream code
+  * Added fast scroll to the world city page (LP: #1349877)
+  * Implemented the world clock UI in the main clock page
+  * Added settings option to change system time in the clock app.
+  
+  [Carla Sella]
+  * Setup autopilot infrastructure and added alarm test
+  * Added objectNames required for the AP tests
+  * Expanded alarm tests using scenarios to cover different days
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Fri, 08 Aug 2014 21:05:12 +0200
+
+ubuntu-clock-app (2.7) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Expanded base TimeZoneModel to also take a u1db query model
+  * Added more cities to the local world city list
+  * Improved the accuracy of the clock hour hand by taking into account the 
+    minutes as well.
+  * Improved minute and second hand accuracy
+  * Improved the clock hands movement. It is now more smoother.
+  * Added a delete alarm button in the edit alarm page as per design
+  * Encapsulated the settings icon into an abstract button to provide haptic
+    feedback when pressed.
+  
+  [Victor Thompson]
+  * Resolve build warning related to unused variable in the AlarmSettings plugin
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Mon, 04 Aug 2014 11:23:30 +0200
+
+ubuntu-clock-app (2.6) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Clock mode is now saved in u1db to remember the user preferences
+  * Added support for alarm setting options like alarm duration and volume
+  * Updated license headers
+  * Added support to listen to Dbus changes to the alarm settings and update
+    UI automatically.
+    
+  [Victor Thompson]
+  * Update digital time every second instead of every 60 seconds
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Wed, 30 Jul 2014 10:10:23 +0200
+ 
+ubuntu-clock-app (2.5) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Added a page to select world cities.
+  * World cities are filtered as the user types using the SDK SortFilterModel
+  * Added a XML file with a list of popular cities
+  
+  [Victor Thompson]
+  * Center the plus icon in PullToAdd.qml
+  * Use the ok icon instead of save in the edit alarm page
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Thu, 24 Jul 2014 15:20:15 +0200
+ 
+ubuntu-clock-app (2.4) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Fixed some issues that were noticed while running on the device for the first time
+  * Removed AddCityButton.qml since we use the pulltoadd component now
+  * Pulltoadd animation is now more reliable since it uses grid units instead of pixels
+  * Transition to the new headers API
+  * Removed the redundant back button definition in the alarm page since it is provided
+    by the pagestack automatically.
+  * Implemented Analog mode and allowed for switching between different modes.
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Thu, 17 Jul 2014 20:32:15 +0200
+
+ubuntu-clock-app (2.3) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Updated framework version to ubuntu-sdk-14.10-dev2
+  * Fix apparmor issue with regards to reading the ringtone folder (LP: #1340326)
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Sat, 12 Jul 2014 14:00:00 +0200
+
+ubuntu-clock-app (2.2) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Split labels to allow for a different color time divider.
+  * Added support for 12-hour time display.
+  * Fixed CMakeList.txt for apparmor file
+  * Returned the clock time in the proper user locale
+  * Added support to edit saved alarms
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Thu, 10 Jul 2014 14:00:00 +0200
+
+ubuntu-clock-app (2.1) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Added support for creating new alarms
+  * Added bottom edge for alarms
+  * Added tug down add city animation
+  * Updated the font size of several UI elements according to design.
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Thu, 03 Jul 2014 10:00:00 +0200
+ 
+ubuntu-clock-app (2.0) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * First release of the clock app reboot
+  * Implemented Digital Mode (LP: #1267146)
+  * Fixed scrollable lists on scrollable pages (LP: #1227418)
+  * Added developer guidelines  
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Thu, 26 Jun 2014 18:57:25 +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-13 12:03:59 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-08-13 12:03:59 +0000
@@ -0,0 +1,43 @@
+Source: ubuntu-clock-app
+Priority: extra
+Maintainer: Ubuntu App Cats <[e-mail]>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               gettext,
+               intltool,
+               python3 | python3-all | python3-dev | python3-all-dev,
+               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/utopic-3.0
+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 Alarm, Clock and
+ World Clock functionalities.
+
+Package: ubuntu-clock-app-autopilot
+Architecture: all
+Depends: libautopilot-qt,
+         libqt5test5,
+         ubuntu-clock-app (>= ${source:Version}),
+         ubuntu-ui-toolkit-autopilot,
+         ${misc:Depends},
+         ${python3: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-13 12:03:59 +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-13 12:03:59 +0000
@@ -0,0 +1,20 @@
+#!/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
+
+override_dh_python3:
+	dh_python3 -pubuntu-clock-app-autopilot

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2014-08-13 12:03:59 +0000
@@ -0,0 +1,13 @@
+Tests: make-autopilot make-test
+Depends: autopilot-touch,
+         cmake,
+         libautopilot-qt,
+         libqt5test5,
+         python3-autopilot,
+         qml-module-qttest,
+         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-13 12:03:59 +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-13 12:03:59 +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-13 12:03:59 +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-13 12:03:59 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/qml/ClockApp/*
+usr/share/*

=== modified file 'manifest.json'
--- manifest.json	2014-08-06 20:14:02 +0000
+++ manifest.json	2014-08-13 12:03:59 +0000
@@ -4,15 +4,20 @@
     "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",
+    "version": "3.0.@BZR_REVNO@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "x-test": {
         "autopilot": "ubuntu_clock_app"
+    },
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@",
+        "vcs-bzr-revno": "@BZR_REVNO@"
     }
-}
\ No newline at end of file
+}

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2014-08-13 12:03:59 +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-08-13 12:03:59 +0000
@@ -0,0 +1,8 @@
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if(INSTALL_TESTS)
+    install(DIRECTORY ${AUTOPILOT_DIR}
+        DESTINATION ${PYTHON_PACKAGE_DIR}
+        )
+endif(INSTALL_TESTS)

=== 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-13 12:03:59 +0000
@@ -7,5 +7,7 @@
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run ubuntu-clock-app
+autopilot run ubuntu_clock_app
+retcode=$?
 popd
+exit $retcode

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-09 18:09:26 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-13 12:03:59 +0000
@@ -395,7 +395,8 @@
             raise ClockEmulatorException('Error deleting alarm.')
 
 
-class ListItemWithActions(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+class ListItemWithActions(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     def swipe_to_delete(self):
         x, y, width, height = self.globalRect

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-08-08 22:30:20 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-08-13 12:03:59 +0000
@@ -19,6 +19,7 @@
 import os.path
 import os
 import shutil
+import glob
 import logging
 import fixtures
 
@@ -41,13 +42,15 @@
     """
 
     local_location = os.path.dirname(os.path.dirname(os.getcwd()))
-    local_location_qml = os.path.join(
-        local_location, 'app/ubuntu-clock-app.qml')
+    local_location_qml = os.path.join(local_location,
+                                      'app/ubuntu-clock-app.qml')
     local_location_backend = os.path.join(local_location, 'builddir/backend')
-    installed_location_backend = \
-        '/usr/share/ubuntu-clock-app/builddir/backend'
+    installed_location_backend = ""
+    if glob.glob('/usr/lib/*/qt5/qml/ClockApp'):
+        installed_location_backend = \
+            glob.glob('/usr/lib/*/qt5/qml/ClockApp')[0]
     installed_location_qml = \
-        '/usr/share/ubuntu-clock-app/app/ubuntu-clock-app.qml'
+        '/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml'
 
     # note this directory could change to com.ubuntu.clock at some point
     sqlite_dir = os.path.expanduser(

=== modified file 'tests/unit/tst_hellocomponent.qml'
--- tests/unit/tst_hellocomponent.qml	2014-07-31 16:58:56 +0000
+++ tests/unit/tst_hellocomponent.qml	2014-08-13 12:03:59 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 0.1
-import "../../components"
+import "../../app/components"
 
 // See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html