Merge lp://qastaging/~robert-ancell/indicator-datetime/unity-control-center2 into lp://qastaging/indicator-datetime/14.04
Proposed by
Robert Ancell
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 294 |
Merged at revision: | 293 |
Proposed branch: | lp://qastaging/~robert-ancell/indicator-datetime/unity-control-center2 |
Merge into: | lp://qastaging/indicator-datetime/14.04 |
Diff against target: |
239 lines (+110/-10) 10 files modified
CMakeLists.txt (+15/-1) data/CMakeLists.txt (+22/-1) data/unity-datetime-panel.desktop.in (+13/-0) debian/control (+14/-1) debian/gnome-control-center-datetime.install (+2/-2) debian/unity-control-center-datetime.install (+3/-0) panel-gnome/CMakeLists.txt (+5/-4) panel-unity/CMakeLists.txt (+26/-0) panel/datetime-prefs.c (+9/-1) po/POTFILES.in (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~robert-ancell/indicator-datetime/unity-control-center2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Support both gnome-control-
Description of the change
Compile a Unity Control Center panel.
Things to note:
- unity-control-
- This relies on both control center APIs staying the same, but I don't know of any reason why that would change in the future
- It supports both control centers so this can be uploaded now and easily migrated. We can choose to drop support for gnome-control-
To post a comment you must log in.
PASSED: Continuous integration, rev:293 jenkins. qa.ubuntu. com/job/ indicator- datetime- ci/148/ jenkins. qa.ubuntu. com/job/ indicator- datetime- trusty- amd64-ci/ 28 jenkins. qa.ubuntu. com/job/ indicator- datetime- trusty- armhf-ci/ 28 jenkins. qa.ubuntu. com/job/ indicator- datetime- trusty- armhf-ci/ 28/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- ci/148/ rebuild
http://