Merge lp://qastaging/~fboucault/unity-2d/merge_natty_minus_dbus_rename into lp://qastaging/~unity-2d-team/unity-2d/maverick-old
Proposed by
Florian Boucault
| Status: | Merged |
|---|---|
| Approved by: | Florian Boucault |
| Approved revision: | 377 |
| Merged at revision: | 369 |
| Proposed branch: | lp://qastaging/~fboucault/unity-2d/merge_natty_minus_dbus_rename |
| Merge into: | lp://qastaging/~unity-2d-team/unity-2d/maverick-old |
| Diff against target: |
3457 lines (+1359/-273) 117 files modified
.bzrignore (+9/-9) CMakeLists.txt (+2/-2) README (+5/-5) TODO (+2/-0) config.h.in (+4/-4) debian/changelog (+9/-0) debian/control (+15/-7) debian/copyright (+69/-3) debian/libuqpanel0.postinst (+7/-0) debian/libuqpanel0.postrm (+7/-0) debian/libuqpanel0.symbols (+88/-0) debian/manpages/unity-2d-launcher.1 (+12/-0) debian/manpages/unity-2d-panel.1 (+11/-0) debian/manpages/unity-2d-places.1 (+12/-0) debian/manpages/unity-2d-spread.1 (+13/-0) debian/rules (+4/-0) debian/source/format (+1/-0) debian/unity-2d-launcher.install (+7/-7) debian/unity-2d-launcher.manpages (+1/-0) debian/unity-2d-launcher.preinst (+6/-4) debian/unity-2d-panel.install (+4/-4) debian/unity-2d-panel.manpages (+1/-0) debian/unity-2d-places.install (+6/-6) debian/unity-2d-places.manpages (+1/-0) debian/unity-2d-spread.install (+3/-3) debian/unity-2d-spread.manpages (+1/-0) debian/watch (+2/-0) launcher/CMakeLists.txt (+4/-4) launcher/UnityApplications/iconimageprovider.cpp (+18/-2) launcher/UnityApplications/iconimageprovider.h (+16/-0) launcher/UnityApplications/launcherapplication.cpp (+18/-2) launcher/UnityApplications/launcherapplication.h (+16/-0) launcher/UnityApplications/launcherapplicationslist.cpp (+16/-0) launcher/UnityApplications/launcherapplicationslist.h (+16/-0) launcher/UnityApplications/launcherdevice.cpp (+1/-1) launcher/UnityApplications/launchermenu.cpp (+1/-1) launcher/UnityApplications/placeentry.cpp (+1/-1) launcher/UnityApplications/plugin.cpp (+16/-0) launcher/UnityApplications/plugin.h (+16/-0) launcher/UnityApplications/trash.cpp (+1/-1) launcher/app/CMakeLists.txt (+4/-4) launcher/app/launcher.cpp (+3/-3) launcher/app/unity-2d-launcher.desktop (+4/-5) launcher/tests/launchermenutest.cpp (+12/-2) launcher/tests/launcherviewtest.cpp (+12/-2) panel/CMakeLists.txt (+2/-2) panel/app/CMakeLists.txt (+4/-4) panel/app/main.cpp (+20/-9) panel/app/unity-2d-panel.desktop (+4/-5) panel/applets/appindicator/appindicatorapplet.cpp (+13/-2) panel/applets/appindicator/appindicatorapplet.h (+14/-3) panel/applets/appindicator/sniitem.cpp (+14/-3) panel/applets/appindicator/sniitem.h (+13/-2) panel/applets/appname/appnameapplet.cpp (+15/-4) panel/applets/appname/appnameapplet.h (+14/-3) panel/applets/appname/menubarwidget.cpp (+14/-3) panel/applets/appname/menubarwidget.h (+13/-2) panel/applets/appname/registrar.cpp (+12/-1) panel/applets/appname/registrar.h (+12/-1) panel/applets/appname/windowhelper.cpp (+13/-2) panel/applets/appname/windowhelper.h (+13/-2) panel/applets/homebutton/homebuttonapplet.cpp (+14/-3) panel/applets/homebutton/homebuttonapplet.h (+14/-3) panel/applets/indicator/abstractindicator.cpp (+14/-3) panel/applets/indicator/abstractindicator.h (+13/-2) panel/applets/indicator/datetimeindicator.cpp (+14/-3) panel/applets/indicator/datetimeindicator.h (+13/-2) panel/applets/indicator/indicatorapplet.cpp (+13/-2) panel/applets/indicator/indicatorapplet.h (+14/-3) panel/applets/indicator/indicatorservicemanager.cpp (+14/-3) panel/applets/indicator/indicatorservicemanager.h (+13/-2) panel/applets/legacytray/fdotask.cpp (+12/-1) panel/applets/legacytray/fdotask.h (+13/-2) panel/applets/legacytray/legacytrayapplet.cpp (+13/-2) panel/applets/legacytray/legacytrayapplet.h (+14/-3) panel/lib/CMakeLists.txt (+2/-2) panel/lib/applet.cpp (+14/-3) panel/lib/applet.h (+14/-3) panel/lib/keyboardmodifiersmonitor.cpp (+16/-5) panel/lib/keyboardmodifiersmonitor.h (+15/-4) panel/lib/libuqpanel.pc.in (+1/-1) panel/lib/panel.cpp (+14/-3) panel/lib/panel.h (+14/-3) panel/lib/unity2dapplication.cpp (+22/-11) panel/lib/unity2dapplication.h (+22/-11) panel/lib/unity2dstyle.cpp (+18/-7) panel/lib/unity2dstyle.h (+18/-7) panel/tests/homebuttonapplettest.cpp (+13/-3) panel/tests/keyboardmodifiersmonitortest.cpp (+15/-5) panel/tests/paneltest.cpp (+13/-3) places/CMakeLists.txt (+3/-3) places/UnityPlaces/blendedimageprovider.cpp (+16/-0) places/UnityPlaces/blendedimageprovider.h (+16/-0) places/UnityPlaces/qdbusconnectionqml.cpp (+16/-0) places/UnityPlaces/qdbusconnectionqml.h (+16/-0) places/UnityPlaces/qsortfilterproxymodelqml.cpp (+16/-0) places/UnityPlaces/qsortfilterproxymodelqml.h (+16/-0) places/UnityPlaces/unity_place.h (+16/-0) places/UnityPlaces/unity_place_entry.h (+16/-0) places/UnityPlaces/windowimageprovider.cpp (+16/-0) places/UnityPlaces/windowimageprovider.h (+16/-0) places/UnityPlaces/windowinfo.cpp (+16/-0) places/UnityPlaces/windowinfo.h (+16/-0) places/UnityPlaces/windowslist.cpp (+16/-0) places/UnityPlaces/windowslist.h (+16/-0) places/app/CMakeLists.txt (+6/-6) places/app/dashdeclarativeview.cpp (+16/-0) places/app/dashdeclarativeview.h (+16/-0) places/app/places.cpp (+4/-4) places/app/unity-2d-places.desktop (+4/-5) places/app/unity-2d-places.service.in (+2/-2) spread/CMakeLists.txt (+2/-2) spread/app/CMakeLists.txt (+5/-5) spread/app/spread.cpp (+5/-5) spread/app/spread.xml (+3/-3) spread/app/spreadcontrol.cpp (+1/-1) spread/app/unity-2d-spread.service.in (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~fboucault/unity-2d/merge_natty_minus_dbus_rename |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Oliver Grawert | Approve | ||
|
Review via email:
|
|||
Description of the change
Merged from lp:unity-2d minus natty specific changes:
- conserved debian/changelog and added a new entry bumping version to 0.4
- reverted lp:unity-2d revisions 360 and 361 that introduced the D-Bus name changes from org.ayatana.
- readded recommends of unity-2d-launcher on unity-place-files, unity-place-
Added Conflicts and Replaces on unity-qt-*
Fixed source branch in debian/copyright
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
if the symbols cause build failures on different arches we need to fix them later, otherwise it looks good