lp:~noskcaj/ubuntu/utopic/blueman/merge2
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/utopic/blueman/merge2
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 150988 lines (+40913/-69328)288 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/-355)
.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)
CHANGELOG.md (+8/-0)
Makefile (+0/-886)
Makefile.in (+3/-5)
README.md (+5/-5)
acinclude.m4 (+2/-2)
apps/Makefile (+0/-600)
apps/Makefile.in (+3/-5)
apps/blueman-adapters (+27/-21)
apps/blueman-applet (+14/-10)
apps/blueman-assistant (+77/-56)
apps/blueman-browse (+7/-11)
apps/blueman-manager (+57/-61)
apps/blueman-mechanism (+3/-3)
apps/blueman-sendto (+45/-39)
apps/blueman-services (+13/-9)
autogen.sh (+2/-2)
autom4te.cache/output.0 (+382/-298)
autom4te.cache/output.1 (+382/-298)
autom4te.cache/requests (+225/-225)
autom4te.cache/traces.0 (+100/-109)
autom4te.cache/traces.1 (+173/-171)
blueman/Constants.py (+0/-26)
blueman/Functions.py (+35/-34)
blueman/Makefile (+0/-780)
blueman/Makefile.in (+3/-5)
blueman/bluez/Adapter.py (+146/-269)
blueman/bluez/Agent.py (+35/-118)
blueman/bluez/AgentManager.py (+21/-0)
blueman/bluez/AudioSink.py (+13/-0)
blueman/bluez/AudioSource.py (+13/-0)
blueman/bluez/BaseInterface.py (+0/-51)
blueman/bluez/BlueZInterface.py (+33/-62)
blueman/bluez/Device.py (+44/-120)
blueman/bluez/Headset.py (+25/-0)
blueman/bluez/Makefile (+0/-589)
blueman/bluez/Makefile.am (+20/-15)
blueman/bluez/Makefile.in (+21/-17)
blueman/bluez/Manager.py (+60/-125)
blueman/bluez/Network.py (+13/-0)
blueman/bluez/NetworkServer.py (+21/-0)
blueman/bluez/PropertiesBlueZInterface.py (+69/-0)
blueman/bluez/Serial.py (+13/-0)
blueman/bluez/ServiceInterface.py (+7/-29)
blueman/bluez/__init__.py (+5/-23)
blueman/bluez/errors.py (+61/-53)
blueman/bluez/utils.py (+0/-35)
blueman/gui/Animation.py (+4/-4)
blueman/gui/CellRendererPixbufTable.py (+9/-9)
blueman/gui/CommonUi.py (+5/-6)
blueman/gui/DeviceList.py (+57/-107)
blueman/gui/DeviceSelectorDialog.py (+9/-11)
blueman/gui/DeviceSelectorList.py (+10/-9)
blueman/gui/DeviceSelectorWidget.py (+17/-20)
blueman/gui/GenericList.py (+147/-186)
blueman/gui/GsmSettings.py (+8/-7)
blueman/gui/GtkAnimation.py (+51/-82)
blueman/gui/Makefile (+0/-762)
blueman/gui/Makefile.in (+3/-5)
blueman/gui/MessageArea.py (+46/-37)
blueman/gui/Notification.py (+168/-183)
blueman/gui/NstBluetooth.py (+18/-18)
blueman/gui/PixbufTable.py (+1/-1)
blueman/gui/applet/Makefile (+0/-581)
blueman/gui/applet/Makefile.in (+3/-5)
blueman/gui/applet/PluginDialog.py (+34/-34)
blueman/gui/manager/Makefile (+0/-586)
blueman/gui/manager/Makefile.in (+3/-5)
blueman/gui/manager/ManagerDeviceList.py (+35/-34)
blueman/gui/manager/ManagerDeviceMenu.py (+95/-95)
blueman/gui/manager/ManagerMenu.py (+35/-32)
blueman/gui/manager/ManagerProgressbar.py (+22/-22)
blueman/gui/manager/ManagerStats.py (+23/-23)
blueman/gui/manager/ManagerToolbar.py (+7/-3)
blueman/iniparse/Makefile (+0/-583)
blueman/iniparse/Makefile.in (+3/-5)
blueman/main/Config.py (+1/-1)
blueman/main/Device.py (+17/-14)
blueman/main/DhcpClient.py (+74/-23)
blueman/main/FakeDevice.py (+1/-1)
blueman/main/HalManager.py (+4/-4)
blueman/main/KillSwitch.py (+7/-7)
blueman/main/KillSwitchNG.py (+9/-9)
blueman/main/Makefile (+0/-770)
blueman/main/Makefile.in (+3/-5)
blueman/main/PPPConnection.py (+221/-234)
blueman/main/PluginManager.py (+7/-7)
blueman/main/PulseAudioUtils.py (+8/-8)
blueman/main/SignalTracker.py (+6/-6)
blueman/main/applet/BluezAgent.py (+35/-43)
blueman/main/applet/Makefile (+0/-582)
blueman/main/applet/Makefile.in (+3/-5)
blueman/main/applet/Transfer.py (+4/-4)
blueman/ods/Makefile (+0/-585)
blueman/ods/Makefile.in (+3/-5)
blueman/ods/OdsBase.py (+3/-3)
blueman/ods/OdsManager.py (+8/-8)
blueman/ods/OdsServer.py (+7/-7)
blueman/ods/OdsServerSession.py (+7/-7)
blueman/ods/OdsSession.py (+8/-8)
blueman/plugins/AppletPlugin.py (+3/-3)
blueman/plugins/ConfigPlugin.py (+4/-4)
blueman/plugins/Makefile (+0/-774)
blueman/plugins/Makefile.in (+3/-5)
blueman/plugins/applet/AppIndicator.py (+14/-13)
blueman/plugins/applet/AuthAgent.py (+22/-9)
blueman/plugins/applet/DBusService.py (+16/-29)
blueman/plugins/applet/DhcpClient.py (+55/-76)
blueman/plugins/applet/DiscvManager.py (+14/-15)
blueman/plugins/applet/ExitItem.py (+3/-3)
blueman/plugins/applet/Headset.py (+29/-47)
blueman/plugins/applet/KillSwitch.py (+2/-2)
blueman/plugins/applet/Makefile (+0/-587)
blueman/plugins/applet/Makefile.am (+1/-1)
blueman/plugins/applet/Makefile.in (+7/-9)
blueman/plugins/applet/Menu.py (+60/-79)
blueman/plugins/applet/NMDUNSupport.py (+3/-3)
blueman/plugins/applet/NMIntegration.py (+7/-11)
blueman/plugins/applet/NMMonitor.py (+6/-6)
blueman/plugins/applet/NMPANSupport.py (+345/-345)
blueman/plugins/applet/NetUsage.py (+29/-49)
blueman/plugins/applet/Networking.py (+6/-8)
blueman/plugins/applet/PPPSupport.py (+3/-3)
blueman/plugins/applet/PowerManager.py (+13/-18)
blueman/plugins/applet/PulseAudio.py (+0/-359)
blueman/plugins/applet/RecentConns.py (+22/-24)
blueman/plugins/applet/SerialManager.py (+133/-157)
blueman/plugins/applet/ShowConnected.py (+10/-14)
blueman/plugins/applet/StandardItems.py (+11/-11)
blueman/plugins/applet/StatusIcon.py (+26/-29)
blueman/plugins/applet/TransferService.py (+2/-2)
blueman/plugins/config/File.py (+122/-136)
blueman/plugins/config/Gconf.py (+17/-14)
blueman/plugins/config/Makefile (+0/-582)
blueman/plugins/config/Makefile.in (+3/-5)
blueman/plugins/manager/Makefile (+0/-763)
blueman/plugins/manager/Makefile.in (+3/-5)
blueman/plugins/manager/PulseAudioProfile.py (+15/-17)
blueman/plugins/manager/Services.py (+76/-12)
blueman/plugins/mechanism/Config.py (+2/-2)
blueman/plugins/mechanism/Makefile (+0/-582)
blueman/plugins/mechanism/Makefile.in (+3/-5)
blueman/plugins/mechanism/Network.py (+2/-2)
blueman/plugins/services/Audio.py (+3/-3)
blueman/plugins/services/Makefile (+0/-583)
blueman/plugins/services/Makefile.in (+3/-5)
blueman/plugins/services/Network.py (+7/-7)
blueman/plugins/services/Transfer.py (+3/-3)
config.h (+0/-84)
configure (+382/-298)
configure.ac (+20/-14)
data/Makefile (+0/-765)
data/Makefile.in (+3/-5)
data/blueman.desktop.in (+0/-1)
data/configs/Makefile (+0/-666)
data/configs/Makefile.in (+3/-5)
data/configs/blueman-applet.service (+0/-3)
data/configs/org.blueman.Mechanism.service (+0/-4)
data/icons/Makefile (+0/-664)
data/icons/Makefile.in (+3/-5)
data/icons/hicolor/16x16/Makefile (+0/-665)
data/icons/hicolor/16x16/Makefile.in (+3/-5)
data/icons/hicolor/16x16/actions/Makefile (+0/-542)
data/icons/hicolor/16x16/actions/Makefile.in (+3/-5)
data/icons/hicolor/16x16/devices/Makefile (+0/-542)
data/icons/hicolor/16x16/devices/Makefile.in (+3/-5)
data/icons/hicolor/16x16/status/Makefile (+0/-545)
data/icons/hicolor/16x16/status/Makefile.am (+4/-1)
data/icons/hicolor/16x16/status/Makefile.in (+7/-6)
data/icons/hicolor/32x32/Makefile (+0/-663)
data/icons/hicolor/32x32/Makefile.in (+3/-5)
data/icons/hicolor/32x32/actions/Makefile (+0/-544)
data/icons/hicolor/32x32/actions/Makefile.in (+3/-5)
data/icons/hicolor/48x48/Makefile (+0/-665)
data/icons/hicolor/48x48/Makefile.in (+3/-5)
data/icons/hicolor/48x48/actions/Makefile (+0/-542)
data/icons/hicolor/48x48/actions/Makefile.in (+3/-5)
data/icons/hicolor/48x48/devices/Makefile (+0/-555)
data/icons/hicolor/48x48/devices/Makefile.in (+3/-5)
data/icons/hicolor/48x48/status/Makefile (+0/-571)
data/icons/hicolor/48x48/status/Makefile.am (+4/-1)
data/icons/hicolor/48x48/status/Makefile.in (+7/-6)
data/icons/hicolor/Makefile (+0/-682)
data/icons/hicolor/Makefile.in (+3/-5)
data/icons/hicolor/scalable/Makefile (+0/-665)
data/icons/hicolor/scalable/Makefile.in (+3/-5)
data/icons/hicolor/scalable/actions/Makefile (+0/-542)
data/icons/hicolor/scalable/actions/Makefile.in (+3/-5)
data/icons/hicolor/scalable/devices/Makefile (+0/-543)
data/icons/hicolor/scalable/devices/Makefile.in (+3/-5)
data/icons/hicolor/scalable/status/Makefile (+0/-540)
data/icons/hicolor/scalable/status/Makefile.am (+1/-1)
data/icons/hicolor/scalable/status/Makefile.in (+4/-6)
data/icons/hicolor/scalable/status/blueman-tray-active.svg (+0/-245)
data/icons/hicolor/scalable/status/blueman-tray-disabled.svg (+0/-291)
data/icons/hicolor/scalable/status/blueman-tray.svg (+0/-234)
data/icons/hicolor/scalable/status/bluetooth-active.svg (+245/-0)
data/icons/hicolor/scalable/status/bluetooth-disabled.svg (+291/-0)
data/icons/hicolor/scalable/status/bluetooth.svg (+234/-0)
data/icons/main_icon/Makefile (+0/-510)
data/icons/main_icon/Makefile.in (+3/-5)
data/man/Makefile (+0/-570)
data/man/Makefile.in (+3/-5)
data/ui/Makefile (+0/-552)
data/ui/Makefile.in (+3/-5)
data/ui/adapters-tab.ui (+6/-5)
data/ui/adapters.ui (+3/-3)
data/ui/applet-passkey.ui (+7/-5)
data/ui/applet-plugins-widget.ui (+8/-5)
data/ui/assistant.ui (+7/-5)
data/ui/device-list-widget.ui (+5/-3)
data/ui/gsm-settings.ui (+4/-3)
data/ui/manager-main.ui (+10/-5)
data/ui/net-usage.ui (+8/-8)
data/ui/send-dialog.ui (+5/-5)
data/ui/services-audio.ui (+7/-5)
data/ui/services-network.ui (+15/-11)
data/ui/services-transfer.ui (+13/-7)
data/ui/services.ui (+6/-4)
debian/changelog (+30/-0)
debian/control (+10/-9)
debian/patches/02_dont_crash_on_non-bluetooth_card.patch (+0/-30)
debian/patches/03_filemanager_fix.patch (+1/-1)
debian/patches/dhcpclient_priority (+10/-10)
debian/patches/series (+0/-1)
libtool (+0/-10083)
module/.deps/_blueman_la-_blueman.Plo (+0/-1)
module/.deps/_blueman_la-libblueman.Plo (+0/-1)
module/.deps/_blueman_la-modem-prober.Plo (+0/-1)
module/Makefile (+0/-734)
module/Makefile.am (+3/-2)
module/Makefile.in (+9/-8)
module/_blueman.pyx (+3/-3)
po/LINGUAS (+7/-0)
po/Makefile (+0/-364)
po/Makefile.in (+0/-222)
po/POTFILES (+0/-143)
po/ast.po (+1778/-0)
po/be.po (+778/-944)
po/bg.po (+575/-747)
po/bs.po (+657/-606)
po/cs.po (+592/-764)
po/da.po (+854/-836)
po/de.po (+602/-784)
po/el.po (+673/-749)
po/en_AU.po (+1777/-0)
po/en_GB.po (+594/-773)
po/es.po (+634/-857)
po/et.po (+538/-630)
po/eu.po (+1778/-0)
po/fi.po (+554/-725)
po/fr.po (+614/-762)
po/gl.po (+657/-884)
po/hi.po (+1778/-0)
po/hr.po (+562/-736)
po/hu.po (+570/-722)
po/id.po (+928/-868)
po/it.po (+804/-802)
po/ja.po (+657/-628)
po/ko.po (+721/-765)
po/lt.po (+552/-702)
po/mk.po (+1778/-0)
po/mr.po (+1778/-0)
po/ms.po (+1769/-0)
po/nb.po (+529/-569)
po/nl.po (+580/-706)
po/pl.po (+603/-717)
po/pt.po (+761/-743)
po/pt_BR.po (+740/-835)
po/ru.po (+624/-874)
po/sk.po (+728/-783)
po/sl.po (+876/-861)
po/sr.po (+539/-540)
po/sv.po (+573/-790)
po/ta.po (+509/-511)
po/tr.po (+596/-729)
po/uk.po (+572/-797)
po/zh_CN.po (+588/-747)
po/zh_TW.po (+561/-698)
sendto/.deps/libnstblueman_la-nautilus-bluetooth-sendto.Plo (+0/-1)
sendto/Makefile (+0/-709)
sendto/Makefile.am (+2/-2)
sendto/Makefile.in (+7/-8)
stamp-h1 (+0/-1)
Related source package recipes
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 22. 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/ 03_filemanager_ fix.patch:
+ Add support for more filemanagers
* Drop 02_dont_crash_on_ non-bluetooth_ card.patch. No longer needed
* Upstream snapshot for unstable (Closes: #754973, #741961)
* Upstream snapshot of new major version with (yet incomplete) BlueZ 5 support
* Add dependency bluez (<< 5)
* Update homepage to GitHub home - 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 - 20. 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 - 19. 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 - 18. By Dmitry Shachnev
-
* 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
* Add debian/patches/ 03_filemanager_ fix.patch (LP: #1001648) - 17. By Jeremy Bícha
-
* Sync with Debian (LP: #1010606, #1037216). 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 - 16. By Micah Gersten
-
* Fix for python multiarch paths; Add build dep on dh-autoreconf; Add
autoreconf.mk to rules
- update debian/control
- add debian/rules
- add debian/patches/ 03_python_ multiarch_ include. patch
- update debian/patches/ series - 15. By Mathieu Trudel-Lapierre
-
debian/
patches/ 02_dont_ crash_on_ non-bluetooth_ card.patch: do not crash when
receiving events from PulseAudio for non-bluetooth cards. (LP: #962469) - 14. By Micah Gersten
-
* Cherry pick fixes from 1.23-1:
+ Homepage field is a source declaration, not a binary
- update debian/control
+ Drop XB-Python-Version from the binary package (missed in the initial
dh_python2 conversion)
- update debian/control
* Don't install any files in /usr/lib/nautilus- sendto (LP: #956124)
- update debian/rules - 13. By Micah Gersten
-
* New upstream release (FFe: LP: #961873)
- fixes LP: #437883, #709171[ Julien Lavergne <email address hidden> ]
* debian/patches:
- 01_dont_autostart_ lxde.patch: Don't autostart applet on LXDE (LP: #958890)
* debian/rules:
- Don't use simple-patchsys.mk as the package is 3.0 (quilt)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/utopic/blueman
