diff -Nru blueman-1.23-git201403102151/debian/changelog blueman-1.23-git201403102151/debian/changelog --- blueman-1.23-git201403102151/debian/changelog 2014-03-10 21:03:02.000000000 +0000 +++ blueman-1.23-git201403102151/debian/changelog 2014-04-09 07:22:59.000000000 +0000 @@ -1,9 +1,35 @@ +blueman (1.23-git201403102151-1ubuntu1) trusty; urgency=medium + + * 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 + + -- Jackson Doak Wed, 09 Apr 2014 16:54:36 +1000 + blueman (1.23-git201403102151-1) unstable; urgency=low * New upstream snapshot (Closes: #741174) -- Christopher Schramm Mon, 10 Mar 2014 22:01:00 +0100 +blueman (1.23-git201312311147-1ubuntu1) trusty; urgency=medium + + * 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 + + -- Jackson Doak Tue, 21 Jan 2014 08:54:58 +1100 + blueman (1.23-git201312311147-1) unstable; urgency=low * Snapshot from (new :)) upstream repository (Closes: #674519, #705859, @@ -12,6 +38,18 @@ -- Christopher Schramm Tue, 31 Dec 2013 11:47:00 +0100 +blueman (1.23+update1-2ubuntu1) saucy; urgency=low + + * 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) + + -- Jackson Doak Wed, 14 Aug 2013 07:56:24 +1000 + blueman (1.23+update1-2) unstable; urgency=low * Add libpulse-mainloop-glib0 to dependencies (Closes: #706121) @@ -19,6 +57,17 @@ -- Christopher Schramm Fri, 26 Jul 2013 23:57:00 +0200 +blueman (1.23+update1-1ubuntu1) saucy; urgency=low + + * 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 + + -- Jeremy Bicha Wed, 03 Jul 2013 21:40:14 -0400 + blueman (1.23+update1-1) unstable; urgency=low * Slight upstream changes (Closes: #691655) diff -Nru blueman-1.23-git201403102151/debian/control blueman-1.23-git201403102151/debian/control --- blueman-1.23-git201403102151/debian/control 2014-03-10 21:03:02.000000000 +0000 +++ blueman-1.23-git201403102151/debian/control 2014-04-09 07:22:59.000000000 +0000 @@ -1,7 +1,8 @@ Source: blueman Section: x11 Priority: optional -Maintainer: Christopher Schramm +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christopher Schramm Homepage: https://launchpad.net/blueman Standards-Version: 3.9.5 X-Python-Version: >= 2.5 @@ -16,8 +17,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, dbus, bluez (>= 4.61), obex-data-server (>= 0.4.3), python-gtk2 (>= 2.12), python-dbus, python-gi, python-notify, notification-daemon, - librsvg2-common, gnome-icon-theme, python-appindicator, - libpulse-mainloop-glib0 + librsvg2-common, gnome-icon-theme, libpulse-mainloop-glib0 Recommends: python-gconf, policykit-1 Description: Graphical bluetooth manager Blueman is a GTK+ bluetooth management utility for GNOME using bluez D-Bus diff -Nru blueman-1.23-git201403102151/debian/patches/01_dont_autostart_lxde.patch blueman-1.23-git201403102151/debian/patches/01_dont_autostart_lxde.patch --- blueman-1.23-git201403102151/debian/patches/01_dont_autostart_lxde.patch 1970-01-01 00:00:00.000000000 +0000 +++ blueman-1.23-git201403102151/debian/patches/01_dont_autostart_lxde.patch 2014-04-09 07:22:59.000000000 +0000 @@ -0,0 +1,12 @@ +Description: The applet is a bit too heavy for the default Lubuntu install +Bug: https://bugs.launchpad.net/bugs/958890 +Author: Julien Lavergne +Index: blueman-1.22~bzr707/data/blueman.desktop.in +=================================================================== +--- blueman-1.22~bzr707.orig/data/blueman.desktop.in 2010-12-27 23:13:14.000000000 +0100 ++++ blueman-1.22~bzr707/data/blueman.desktop.in 2012-03-19 00:14:35.000000000 +0100 +@@ -7,3 +7,4 @@ + Terminal=false + Type=Application + Categories= ++NotShowIn=LXDE diff -Nru blueman-1.23-git201403102151/debian/patches/02_dont_crash_on_non-bluetooth_card.patch blueman-1.23-git201403102151/debian/patches/02_dont_crash_on_non-bluetooth_card.patch --- blueman-1.23-git201403102151/debian/patches/02_dont_crash_on_non-bluetooth_card.patch 1970-01-01 00:00:00.000000000 +0000 +++ blueman-1.23-git201403102151/debian/patches/02_dont_crash_on_non-bluetooth_card.patch 2014-04-09 07:22:59.000000000 +0000 @@ -0,0 +1,30 @@ +From: Mathieu Trudel-Lapierre +Subject: Avoid crashing when receiving event for cards blueman shouldn't handle +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/precise/+source/blueman/+bug/962469 + +We'll run card_cb for every CHANGE or CARD event. Some of those may be for +changes to non-bluetooth device; in which case we don't need to handle them. + +It's a little less efficient to do this in card_cb() than in on_pulse_event() +directly, but doing it this way makes for much clearer code as to what we're +trying to achieve exactly. + +--- + blueman/plugins/applet/PulseAudio.py | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: b/blueman/plugins/applet/PulseAudio.py +=================================================================== +--- a/blueman/plugins/applet/PulseAudio.py ++++ b/blueman/plugins/applet/PulseAudio.py +@@ -210,6 +210,10 @@ class PulseAudio(AppletPlugin): + if (EventType.CARD | EventType.CHANGE) == event: + dprint(event) + def card_cb(c): ++ if "bluez.path" not in c["proplist"]: ++ # we're dealing with an event on a non-bluetooth device, we don't care ++ # about those. ++ return + dprint(c) + m = self.loaded_modules[c["proplist"]["bluez.path"]] + if c["owner_module"] == m.id: diff -Nru blueman-1.23-git201403102151/debian/patches/03_filemanager_fix.patch blueman-1.23-git201403102151/debian/patches/03_filemanager_fix.patch --- blueman-1.23-git201403102151/debian/patches/03_filemanager_fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ blueman-1.23-git201403102151/debian/patches/03_filemanager_fix.patch 2014-04-09 07:22:59.000000000 +0000 @@ -0,0 +1,24 @@ +Description: fix file manager access + This makes blueman look at more filemanagers than just thunar and nautilus +Bug: https://bugs.launchpad.net/bugs/1001648 + +--- + apps/blueman-browse | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/apps/blueman-browse ++++ b/apps/blueman-browse +@@ -48,7 +48,12 @@ class Browse: + conf.props.browse_command = DEF_BROWSE_COMMAND + if "nautilus" in DEF_BROWSE_COMMAND: + if not have("nautilus"): +- conf.props.browse_command = "thunar obex://[%d]" ++ if have("thunar"): ++ conf.props.browse_command = "thunar obex://[%d]" ++ elif have ("pcmanfm"): ++ conf.props.browse_command = "pcmanfm obex://[%d]" ++ else: ++ conf.props.browse_command = "xdg-open obex://[%d]" + + cmd = conf.props.browse_command.replace("%d", addr) + args = cmd.split(" ") diff -Nru blueman-1.23-git201403102151/debian/patches/series blueman-1.23-git201403102151/debian/patches/series --- blueman-1.23-git201403102151/debian/patches/series 2014-03-10 21:03:02.000000000 +0000 +++ blueman-1.23-git201403102151/debian/patches/series 2014-04-09 07:22:59.000000000 +0000 @@ -1 +1,4 @@ dhcpclient_priority +01_dont_autostart_lxde.patch +02_dont_crash_on_non-bluetooth_card.patch +03_filemanager_fix.patch