Merge lp://qastaging/~robert-ancell/deja-dup/unity-control-center2 into lp://qastaging/deja-dup/30
Proposed by
Robert Ancell
Status: | Merged |
---|---|
Merge reported by: | Michael Terry |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~robert-ancell/deja-dup/unity-control-center2 |
Merge into: | lp://qastaging/deja-dup/30 |
Diff against target: |
306 lines (+162/-16) 12 files modified
CMakeLists.txt (+9/-0) debian/control (+1/-0) debian/rules (+1/-0) deja-dup/preferences/CMakeLists.txt (+7/-12) deja-dup/preferences/PreferencesPanel.c (+4/-0) deja-dup/preferences/deja-dup-preferences.desktop.in (+1/-1) deja-dup/preferences/gnome-control-center/CMakeLists.txt (+36/-0) deja-dup/preferences/gnome-control-center/gnome-deja-dup-panel.desktop.in (+1/-1) deja-dup/preferences/unity-control-center/CMakeLists.txt (+36/-0) deja-dup/preferences/unity-control-center/unity-deja-dup-panel.desktop.in (+29/-0) deja-dup/tests/CMakeLists.txt (+7/-2) deja-dup/tests/deja_dup_autopilot/test_ccpanel.py (+30/-0) |
To merge this branch: | bzr merge lp://qastaging/~robert-ancell/deja-dup/unity-control-center2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry | Approve | ||
Review via email:
|
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
- I originally just switched to building against u-c-c since g-c-c doesn't support external panels upstream but the Ubuntu GNOME people said they still wanted to keep using this panel in newer GNOME
- deja-dup/
To post a comment you must log in.
Merged with some minor changes: OUTPUT_ DIRECTORY to stuff the two libdeja-dup.so files in different places.
- Typo in new autopilot test (had to change right super() class)
- Dropped the two new directories. I understand why you did that, but I just specified a LIBRARY_