lp:~noskcaj/ubuntu/trusty/blueman/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/trusty/blueman/merge
Branch merges
- Julian Taylor (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 138284 lines (+99836/-21877)190 files modified.gitignore (+44/-0)
.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/-99)
.pc/applied-patches (+0/-10)
.pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py (+0/-82)
.pc/exception/blueman/main/PluginManager.py (+0/-307)
.pc/icon/blueman/plugins/applet/PowerManager.py (+0/-256)
.pc/nautilus/blueman/Constants.py (+0/-26)
.pc/pulseaudio/blueman/plugins/applet/PulseAudio.py (+0/-364)
.pc/python_multiarch/acinclude.m4 (+0/-107)
.pc/website/blueman/Constants.py (+0/-26)
.pc/website/blueman/Constants.py.in (+0/-26)
.pc/website/data/configs/org.blueman.policy.in (+0/-49)
AUTHORS (+0/-2)
CHANGELOG.md (+12/-0)
ChangeLog (+0/-1939)
INSTALL (+0/-234)
Makefile (+885/-0)
Makefile.in (+246/-162)
README.md (+83/-0)
aclocal.m4 (+2037/-1173)
apps/Makefile (+600/-0)
apps/Makefile.in (+120/-36)
apps/blueman-adapters (+205/-215)
apps/blueman-applet (+72/-92)
apps/blueman-assistant (+355/-370)
apps/blueman-browse (+59/-84)
apps/blueman-manager (+245/-247)
apps/blueman-mechanism (+106/-101)
apps/blueman-sendto (+366/-387)
apps/blueman-services (+136/-142)
autogen.sh (+35/-0)
autom4te.cache/output.0 (+16601/-0)
autom4te.cache/output.1 (+16597/-0)
autom4te.cache/requests (+324/-0)
autom4te.cache/traces.0 (+3516/-0)
autom4te.cache/traces.1 (+1026/-0)
blueman/Constants.py (+1/-1)
blueman/Constants.py.in (+2/-2)
blueman/Functions.py (+283/-254)
blueman/Makefile (+780/-0)
blueman/Makefile.in (+207/-132)
blueman/bluez/Makefile (+589/-0)
blueman/bluez/Makefile.in (+140/-44)
blueman/gui/DeviceList.py (+533/-565)
blueman/gui/DeviceSelectorDialog.py (+47/-69)
blueman/gui/DeviceSelectorList.py (+64/-83)
blueman/gui/DeviceSelectorWidget.py (+112/-138)
blueman/gui/Makefile (+762/-0)
blueman/gui/Makefile.in (+206/-132)
blueman/gui/applet/Makefile (+581/-0)
blueman/gui/applet/Makefile.in (+140/-44)
blueman/gui/manager/Makefile (+586/-0)
blueman/gui/manager/Makefile.in (+140/-44)
blueman/gui/manager/ManagerDeviceMenu.py (+431/-450)
blueman/gui/manager/ManagerMenu.py (+203/-235)
blueman/gui/manager/ManagerStats.py (+137/-158)
blueman/gui/manager/ManagerToolbar.py (+136/-155)
blueman/iniparse/Makefile (+583/-0)
blueman/iniparse/Makefile.in (+140/-44)
blueman/main/Device.py (+119/-145)
blueman/main/FakeDevice.py (+8/-12)
blueman/main/KillSwitch.py (+114/-128)
blueman/main/Makefile (+770/-0)
blueman/main/Makefile.in (+206/-132)
blueman/main/PluginManager.py (+277/-292)
blueman/main/SignalTracker.py (+81/-102)
blueman/main/applet/BluezAgent.py (+262/-254)
blueman/main/applet/Makefile (+582/-0)
blueman/main/applet/Makefile.in (+140/-44)
blueman/main/applet/Transfer.py (+254/-260)
blueman/ods/Makefile (+585/-0)
blueman/ods/Makefile.in (+140/-44)
blueman/plugins/Makefile (+774/-0)
blueman/plugins/Makefile.in (+206/-132)
blueman/plugins/applet/AuthAgent.py (+52/-71)
blueman/plugins/applet/DBusService.py (+163/-158)
blueman/plugins/applet/DhcpClient.py (+0/-1)
blueman/plugins/applet/DiscvManager.py (+118/-137)
blueman/plugins/applet/KillSwitch.py (+111/-131)
blueman/plugins/applet/Makefile (+587/-0)
blueman/plugins/applet/Makefile.in (+140/-44)
blueman/plugins/applet/NMIntegration.py (+106/-122)
blueman/plugins/applet/NetUsage.py (+374/-356)
blueman/plugins/applet/Networking.py (+61/-95)
blueman/plugins/applet/PowerManager.py (+227/-247)
blueman/plugins/applet/PulseAudio.py (+0/-4)
blueman/plugins/applet/RecentConns.py (+371/-381)
blueman/plugins/applet/ShowConnected.py (+106/-123)
blueman/plugins/applet/StatusIcon.py (+174/-190)
blueman/plugins/config/Makefile (+582/-0)
blueman/plugins/config/Makefile.in (+140/-44)
blueman/plugins/manager/Makefile (+763/-0)
blueman/plugins/manager/Makefile.in (+206/-132)
blueman/plugins/manager/PulseAudioProfile.py (+141/-159)
blueman/plugins/manager/Services.py (+317/-334)
blueman/plugins/mechanism/Makefile (+582/-0)
blueman/plugins/mechanism/Makefile.in (+140/-44)
blueman/plugins/services/Makefile (+583/-0)
blueman/plugins/services/Makefile.in (+140/-44)
compile (+347/-0)
config.guess (+234/-178)
config.h (+84/-0)
config.sub (+189/-112)
configure (+2423/-1295)
configure.ac (+5/-5)
data/Makefile (+765/-0)
data/Makefile.in (+196/-132)
data/blueman.desktop.in (+0/-1)
data/configs/Makefile (+666/-0)
data/configs/Makefile.in (+138/-51)
data/configs/blueman-applet.service (+3/-0)
data/configs/org.blueman.Mechanism.service (+4/-0)
data/configs/org.blueman.policy.in (+1/-1)
data/icons/Makefile (+664/-0)
data/icons/Makefile.in (+178/-123)
data/icons/hicolor/16x16/Makefile (+665/-0)
data/icons/hicolor/16x16/Makefile.in (+178/-123)
data/icons/hicolor/16x16/actions/Makefile (+542/-0)
data/icons/hicolor/16x16/actions/Makefile.in (+114/-31)
data/icons/hicolor/16x16/devices/Makefile (+542/-0)
data/icons/hicolor/16x16/devices/Makefile.in (+114/-31)
data/icons/hicolor/16x16/status/Makefile (+545/-0)
data/icons/hicolor/16x16/status/Makefile.in (+114/-31)
data/icons/hicolor/32x32/Makefile (+663/-0)
data/icons/hicolor/32x32/Makefile.in (+178/-123)
data/icons/hicolor/32x32/actions/Makefile (+544/-0)
data/icons/hicolor/32x32/actions/Makefile.in (+114/-31)
data/icons/hicolor/48x48/Makefile (+665/-0)
data/icons/hicolor/48x48/Makefile.in (+178/-123)
data/icons/hicolor/48x48/actions/Makefile (+542/-0)
data/icons/hicolor/48x48/actions/Makefile.in (+114/-31)
data/icons/hicolor/48x48/devices/Makefile (+555/-0)
data/icons/hicolor/48x48/devices/Makefile.in (+114/-31)
data/icons/hicolor/48x48/status/Makefile (+571/-0)
data/icons/hicolor/48x48/status/Makefile.in (+114/-31)
data/icons/hicolor/Makefile (+682/-0)
data/icons/hicolor/Makefile.in (+180/-124)
data/icons/hicolor/scalable/Makefile (+665/-0)
data/icons/hicolor/scalable/Makefile.in (+178/-123)
data/icons/hicolor/scalable/actions/Makefile (+542/-0)
data/icons/hicolor/scalable/actions/Makefile.in (+114/-31)
data/icons/hicolor/scalable/devices/Makefile (+543/-0)
data/icons/hicolor/scalable/devices/Makefile.in (+114/-31)
data/icons/hicolor/scalable/status/Makefile (+540/-0)
data/icons/hicolor/scalable/status/Makefile.am (+1/-1)
data/icons/hicolor/scalable/status/Makefile.in (+115/-32)
data/icons/hicolor/scalable/status/blueman-tray-disabled.svg (+291/-0)
data/icons/hicolor/scalable/status/blueman-tray.svg (+234/-0)
data/icons/main_icon/Makefile (+510/-0)
data/icons/main_icon/Makefile.in (+104/-27)
data/man/Makefile (+570/-0)
data/man/Makefile.in (+123/-48)
data/ui/Makefile (+552/-0)
data/ui/Makefile.in (+114/-31)
debian/changelog (+21/-0)
debian/control (+1/-1)
debian/patches/03_filemanager_fix.patch (+14/-10)
debian/patches/exception (+0/-13)
debian/patches/icon (+0/-12)
debian/patches/nautilus (+0/-13)
debian/patches/pulseaudio (+0/-13)
debian/patches/python_multiarch (+0/-15)
debian/patches/series (+0/-6)
debian/patches/website (+0/-37)
depcomp (+347/-186)
install-sh (+21/-14)
libtool (+10083/-0)
ltmain.sh (+2657/-1409)
missing (+159/-320)
module/.deps/_blueman_la-_blueman.Plo (+1/-0)
module/.deps/_blueman_la-libblueman.Plo (+1/-0)
module/.deps/_blueman_la-modem-prober.Plo (+1/-0)
module/Makefile (+734/-0)
module/Makefile.in (+201/-84)
module/_blueman.c (+0/-2874)
module/modem-prober.c (+3/-4)
po/Makefile (+364/-0)
po/Makefile.in (+222/-0)
po/Makefile.in.in (+9/-4)
po/POTFILES (+143/-0)
po/blueman.pot (+1774/-0)
po/cy.po (+1707/-0)
po/de.po (+2/-2)
py-compile (+46/-22)
sendto/.deps/libnstblueman_la-nautilus-bluetooth-sendto.Plo (+1/-0)
sendto/Makefile (+709/-0)
sendto/Makefile.in (+204/-85)
stamp-h1 (+1/-0)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 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 - 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/trusty/blueman