Merge lp://qastaging/~smspillaz/unity/unity.remove_explicit_gconf_dep into lp://qastaging/unity
Proposed by
Sam Spilsbury
| Status: | Merged |
|---|---|
| Merged at revision: | 2609 |
| Proposed branch: | lp://qastaging/~smspillaz/unity/unity.remove_explicit_gconf_dep |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
25 lines (+2/-2) 2 files modified
CMakeLists.txt (+1/-1) services/CMakeLists.txt (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~smspillaz/unity/unity.remove_explicit_gconf_dep |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Timo Jyrinki | Approve | ||
|
Review via email:
|
|||
Description of the change
Remove explicit gconf dep and build with dbus-glib-1
To post a comment you must log in.
Revision history for this message
| Unity Merger (unity-merger) wrote | # |
Revision history for this message
| Timo Jyrinki (timo-jyrinki) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Works on top of lp:~smspillaz/unity/unity.gnome-control-center-integration + only debian/ from lp:ubuntu/unity. Needed since the packaging got rid of gconf dependency (and packaging had these same changes as direct changes to the source).