Merge lp://qastaging/~noskcaj/ubuntu/utopic/blueman/merge into lp://qastaging/ubuntu/utopic/blueman
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/blueman/merge |
| Merge into: | lp://qastaging/ubuntu/utopic/blueman |
| Diff against target: |
4662 lines (+1004/-1453) 61 files modified
.pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in (+0/-9) .pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py (+0/-364) .pc/03_filemanager_fix.patch/apps/blueman-browse (+0/-79) .pc/applied-patches (+0/-4) .pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py (+0/-82) Makefile (+16/-16) aclocal.m4 (+57/-2) apps/Makefile (+16/-16) apps/blueman-browse (+1/-6) autom4te.cache/output.0 (+2/-1) autom4te.cache/output.1 (+2/-1) autom4te.cache/requests (+228/-225) autom4te.cache/traces.0 (+39/-10) autom4te.cache/traces.1 (+7/-7) blueman/Makefile (+16/-16) blueman/bluez/Makefile (+16/-16) blueman/gui/Makefile (+16/-16) blueman/gui/applet/Makefile (+16/-16) blueman/gui/manager/Makefile (+16/-16) blueman/iniparse/Makefile (+16/-16) blueman/main/Makefile (+16/-16) blueman/main/applet/Makefile (+16/-16) blueman/ods/Makefile (+16/-16) blueman/plugins/Makefile (+16/-16) blueman/plugins/applet/DhcpClient.py (+0/-1) blueman/plugins/applet/Makefile (+16/-16) blueman/plugins/applet/PulseAudio.py (+0/-13) blueman/plugins/config/Makefile (+16/-16) blueman/plugins/manager/Makefile (+16/-16) blueman/plugins/mechanism/Makefile (+16/-16) blueman/plugins/services/Makefile (+16/-16) configure (+1/-0) data/Makefile (+16/-16) data/blueman.desktop.in (+0/-1) data/configs/Makefile (+16/-16) data/icons/Makefile (+16/-16) data/icons/hicolor/16x16/Makefile (+16/-16) data/icons/hicolor/16x16/actions/Makefile (+16/-16) data/icons/hicolor/16x16/devices/Makefile (+16/-16) data/icons/hicolor/16x16/status/Makefile (+16/-16) data/icons/hicolor/32x32/Makefile (+16/-16) data/icons/hicolor/32x32/actions/Makefile (+16/-16) data/icons/hicolor/48x48/Makefile (+16/-16) data/icons/hicolor/48x48/actions/Makefile (+16/-16) data/icons/hicolor/48x48/devices/Makefile (+16/-16) data/icons/hicolor/48x48/status/Makefile (+16/-16) data/icons/hicolor/Makefile (+16/-16) data/icons/hicolor/scalable/Makefile (+16/-16) data/icons/hicolor/scalable/actions/Makefile (+16/-16) data/icons/hicolor/scalable/devices/Makefile (+16/-16) data/icons/hicolor/scalable/status/Makefile (+16/-16) data/icons/main_icon/Makefile (+16/-16) data/man/Makefile (+16/-16) data/ui/Makefile (+16/-16) debian/changelog (+19/-0) libtool (+4/-4) ltmain.sh (+2/-2) module/Makefile (+16/-16) po/Makefile (+1/-1) po/Makefile.in (+1/-1) sendto/Makefile (+16/-16) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/blueman/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 21. By Jackson Doak
-
* Merge from debian unstable. Remaining changes:
- debian/patches/ 01_dont_ autostart_ lxde.patch:
+ Don't autostart the applet in LXDE
- debian/patches/ 02_dont_ crash_on_ non-bluetooth_ card.patch:
+ Avoid crashing when receiving event for cards blueman shouldn't handle
- debian/control: Don't depend on python-appindicator
- debian/patches/ 03_filemanager_ fix.patch:
+ Add support for more filemanagers
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.