Ubuntu Clock App

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

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

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

Description of the change

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

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

I hope this unblocks you guys

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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://staging/~sergiusens/ubuntu-clock-app/reboot-packaging updated
60. By Daniel Holbach

* 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

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

62. By Daniel Holbach

fix changelog entry

63. By Daniel Holbach

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

64. By Daniel Holbach

fix tests path for basic testcase

65. By Daniel Holbach

get 'make test' closer to actually working

66. By Daniel Holbach

merge from trunk

67. By Daniel Holbach

fix path location for upstreamcomponents

68. By Daniel Holbach

make pep8 happy

69. By Daniel Holbach

generalise local paths in tests somewhat

70. By Daniel Holbach

Make pep8 happy.

71. By Daniel Holbach

bring installation path more closely in line with other apps

72. By Daniel Holbach

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

73. By Daniel Holbach

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

74. By Daniel Holbach

merge from trunk

75. By Daniel Holbach

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

76. By Daniel Holbach

remove 'builddir' portion from system-installed paths

77. By Nicholas Skaggs

remove find local path

78. By Nicholas Skaggs

fix pep8

79. By Nekhelesh Ramananthan

Merged trunk

80. By Sergio Schvezov

adding x-source to manifest for ci

81. By Sergio Schvezov

Install apparmor manifest where manifest.json points to

82. By Sergio Schvezov

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

83. By Sergio Schvezov

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

84. By Sergio Schvezov

Don't install tests into click package

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches