Merge lp://staging/~noskcaj/ubuntu/trusty/blueman/bugfixes into lp://staging/ubuntu/trusty/blueman
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/blueman/bugfixes |
Merge into: | lp://staging/ubuntu/trusty/blueman |
Diff against target: |
8423 lines (+1169/-3417) 113 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) .tx/config (+7/-0) Makefile (+13/-12) Makefile.in (+3/-2) README.md (+8/-3) aclocal.m4 (+12/-6) apps/Makefile (+11/-11) apps/Makefile.in (+1/-1) autom4te.cache/output.0 (+18/-12) autom4te.cache/output.1 (+18/-12) autom4te.cache/requests (+223/-223) autom4te.cache/traces.0 (+55/-55) autom4te.cache/traces.1 (+2/-2) blueman/Constants.py (+1/-1) blueman/Constants.py.in (+1/-1) blueman/Makefile (+11/-11) blueman/Makefile.in (+1/-1) blueman/bluez/Makefile (+11/-11) blueman/bluez/Makefile.in (+1/-1) blueman/gui/Makefile (+11/-11) blueman/gui/Makefile.in (+1/-1) blueman/gui/applet/Makefile (+11/-11) blueman/gui/applet/Makefile.in (+1/-1) blueman/gui/manager/Makefile (+11/-11) blueman/gui/manager/Makefile.in (+1/-1) blueman/iniparse/Makefile (+11/-11) blueman/iniparse/Makefile.in (+1/-1) blueman/main/Makefile (+11/-11) blueman/main/Makefile.in (+1/-1) blueman/main/applet/Makefile (+11/-11) blueman/main/applet/Makefile.in (+1/-1) blueman/ods/Makefile (+11/-11) blueman/ods/Makefile.in (+1/-1) blueman/plugins/Makefile (+11/-11) blueman/plugins/Makefile.in (+1/-1) blueman/plugins/applet/DhcpClient.py (+1/-1) blueman/plugins/applet/Makefile (+11/-11) blueman/plugins/applet/Makefile.in (+1/-1) blueman/plugins/applet/NMIntegration.py (+1/-1) blueman/plugins/applet/NetUsage.py (+1/-1) blueman/plugins/config/Makefile (+11/-11) blueman/plugins/config/Makefile.in (+1/-1) blueman/plugins/manager/Makefile (+11/-11) blueman/plugins/manager/Makefile.in (+1/-1) blueman/plugins/manager/Services.py (+1/-1) blueman/plugins/mechanism/Makefile (+11/-11) blueman/plugins/mechanism/Makefile.in (+1/-1) blueman/plugins/services/Makefile (+11/-11) blueman/plugins/services/Makefile.in (+1/-1) configure (+18/-12) configure.ac (+1/-1) data/Makefile (+11/-11) data/Makefile.in (+1/-1) data/configs/Makefile (+11/-11) data/configs/Makefile.in (+1/-1) data/configs/org.blueman.policy.in (+1/-1) data/icons/Makefile (+11/-11) data/icons/Makefile.in (+1/-1) data/icons/hicolor/16x16/Makefile (+11/-11) data/icons/hicolor/16x16/Makefile.in (+1/-1) data/icons/hicolor/16x16/actions/Makefile (+11/-11) data/icons/hicolor/16x16/actions/Makefile.in (+1/-1) data/icons/hicolor/16x16/devices/Makefile (+11/-11) data/icons/hicolor/16x16/devices/Makefile.in (+1/-1) data/icons/hicolor/16x16/status/Makefile (+11/-11) data/icons/hicolor/16x16/status/Makefile.in (+1/-1) data/icons/hicolor/32x32/Makefile (+11/-11) data/icons/hicolor/32x32/Makefile.in (+1/-1) data/icons/hicolor/32x32/actions/Makefile (+11/-11) data/icons/hicolor/32x32/actions/Makefile.in (+1/-1) data/icons/hicolor/48x48/Makefile (+11/-11) data/icons/hicolor/48x48/Makefile.in (+1/-1) data/icons/hicolor/48x48/actions/Makefile (+11/-11) data/icons/hicolor/48x48/actions/Makefile.in (+1/-1) data/icons/hicolor/48x48/devices/Makefile (+11/-11) data/icons/hicolor/48x48/devices/Makefile.in (+1/-1) data/icons/hicolor/48x48/status/Makefile (+11/-11) data/icons/hicolor/48x48/status/Makefile.in (+1/-1) data/icons/hicolor/Makefile (+11/-11) data/icons/hicolor/Makefile.in (+1/-1) data/icons/hicolor/scalable/Makefile (+11/-11) data/icons/hicolor/scalable/Makefile.in (+1/-1) data/icons/hicolor/scalable/actions/Makefile (+11/-11) data/icons/hicolor/scalable/actions/Makefile.in (+1/-1) data/icons/hicolor/scalable/devices/Makefile (+11/-11) data/icons/hicolor/scalable/devices/Makefile.in (+1/-1) data/icons/hicolor/scalable/status/Makefile (+11/-11) data/icons/hicolor/scalable/status/Makefile.in (+1/-1) data/icons/main_icon/Makefile (+11/-11) data/icons/main_icon/Makefile.in (+1/-1) data/man/Makefile (+11/-11) data/man/Makefile.in (+1/-1) data/ui/Makefile (+11/-11) data/ui/Makefile.in (+1/-1) debian/changelog (+19/-0) debian/control (+1/-1) libtool (+2/-2) ltmain.sh (+2/-2) missing (+2/-2) module/Makefile (+11/-11) module/Makefile.in (+1/-1) po/Makefile (+2/-2) po/Makefile.in (+1/-1) po/POTFILES (+1/-1) po/POTFILES.in (+1/-1) po/blueman.pot (+0/-1774) po/nl.po (+285/-278) sendto/Makefile (+11/-11) sendto/Makefile.in (+1/-1) |
To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/blueman/bugfixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email: mp+214888@code.staging.launchpad.net |
Description of the change
New upstream bugfix release
To post a comment you must log in.
Uploaded with some manual hackery around the broken .pc/