[Pkg-bluetooth-maintainers] Bug#706986: Bug#706986: bluez: New upstream release: BlueZ 5
Emilio Pozuelo Monfort
pochu at debian.org
Wed May 15 08:15:36 UTC 2013
Hi Nobuhiro,
On 15/05/13 01:32, Nobuhiro Iwamatsu wrote:
> Hi,
>
> Thank you for your report.
> I am working about this. I will upload bluez 5 to expermental in this week.
Cool! In the meanwhile I prepared a package myself. It's still very rough but
just in case it's useful to you I'm attaching a debdiff here.
Thanks,
Emilio
-------------- next part --------------
diff -ruNp bluez-4.101/debian/bluez.bluetooth.init bluez-5.4/debian/bluez.bluetooth.init
--- bluez-4.101/debian/bluez.bluetooth.init 2011-06-03 06:09:01.000000000 +0200
+++ bluez-5.4/debian/bluez.bluetooth.init 2013-05-08 11:37:51.775753988 +0200
@@ -36,7 +36,7 @@ RFCOMM=/usr/bin/$RFCOMM_NAME
RFCOMM_CONF=/etc/bluetooth/$RFCOMM_NAME.conf
SDPTOOL=/usr/bin/sdptool
-SSD_OPTIONS="--oknodo --quiet --exec $DAEMON"
+SSD_OPTIONS="--oknodo --quiet --background --exec $DAEMON"
test -f $DAEMON || exit 0
diff -ruNp bluez-4.101/debian/bluez.install bluez-5.4/debian/bluez.install
--- bluez-4.101/debian/bluez.install 2012-07-23 05:47:58.000000000 +0200
+++ bluez-5.4/debian/bluez.install 2013-05-15 10:12:39.868271245 +0200
@@ -1,35 +1,36 @@
-etc/bluetooth/main.conf
-etc/bluetooth/rfcomm.conf
-input/input.conf etc/bluetooth
-audio/audio.conf etc/bluetooth
-network/network.conf etc/bluetooth
-serial/serial.conf etc/bluetooth
-proximity/proximity.conf etc/bluetooth
+src/main.conf etc/bluetooth
+#etc/bluetooth/rfcomm.conf
+profiles/input/input.conf etc/bluetooth
+profiles/audio/audio.conf etc/bluetooth
+profiles/network/network.conf etc/bluetooth
+#serial/serial.conf etc/bluetooth
+profiles/proximity/proximity.conf etc/bluetooth
etc/dbus-1
-usr/sbin
+usr/lib/bluez
+usr/bin/bluetoothctl
+usr/bin/bccmd
+usr/bin/btmon
usr/bin/rctest
+usr/bin/hciattach
+usr/bin/hciconfig
+usr/bin/hcidump
usr/bin/hcitool
usr/bin/sdptool
-usr/bin/dfutool
usr/bin/ciptool
-usr/bin/gatttool
usr/bin/l2ping
usr/bin/l2test
usr/bin/rfcomm
lib/udev/hid2hci
-lib/udev/rules.d/97-bluetooth-hid2hci.rules
+lib/udev/rules.d/97-hid2hci.rules
lib/systemd
-# usr/share/dbus-1
+usr/lib/systemd
+usr/share/dbus-1
usr/share/man/man1/sdptool.1
+usr/share/man/man1/bccmd.1
+usr/share/man/man1/hciattach.1
+usr/share/man/man1/hciconfig.1
+usr/share/man/man1/hcidump.1
usr/share/man/man1/hcitool.1
-usr/share/man/man1/dfutool.1
usr/share/man/man1/ciptool.1
-usr/share/man/man1/hciemu.1
usr/share/man/man1/rfcomm.1
usr/share/man/man1/rctest.1
-usr/share/man/man8/bluetoothd.8
-usr/share/man/man8/hid2hci.8
-usr/share/man/man8/hciattach.8
-usr/share/man/man8/l2ping.8
-usr/share/man/man8/hciconfig.8
-usr/share/man/man8/bccmd.8
diff -ruNp bluez-4.101/debian/bluez.links bluez-5.4/debian/bluez.links
--- bluez-4.101/debian/bluez.links 1970-01-01 01:00:00.000000000 +0100
+++ bluez-5.4/debian/bluez.links 2013-05-08 11:50:17.015724969 +0200
@@ -0,0 +1 @@
+usr/lib/bluez/bluetooth/bluetoothd usr/sbin/bluetoothd
diff -ruNp bluez-4.101/debian/changelog bluez-5.4/debian/changelog
--- bluez-4.101/debian/changelog 2012-07-24 05:36:26.000000000 +0200
+++ bluez-5.4/debian/changelog 2013-05-15 10:13:32.384270347 +0200
@@ -1,3 +1,9 @@
+bluez (5.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 06 May 2013 10:04:11 +0200
+
bluez (4.101-1) experimental; urgency=low
* New upstream release. Update to 4.101.
diff -ruNp bluez-4.101/debian/control bluez-5.4/debian/control
--- bluez-4.101/debian/control 2012-03-22 05:19:58.000000000 +0100
+++ bluez-5.4/debian/control 2013-05-08 11:39:32.699750058 +0200
@@ -3,16 +3,14 @@ Section: admin
Priority: optional
Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
Uploaders: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.97), quilt,
+Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.97),
autotools-dev,
flex,
bison,
- gstreamer-tools,
libasound2-dev (>= 1.0.24.1),
+ libdbus-1-dev (>= 1.4),
libdbus-glib-1-dev,
libglib2.0-dev (>= 2.16),
- libgstreamer0.10-dev (>= 0.10.30),
- libgstreamer-plugins-base0.10-dev (>= 0.10.30),
libnl-dev,
libsndfile1-dev,
libusb-dev,
@@ -95,75 +93,75 @@ Description: Bluetooth tools and daemons
.
This package contains the debugging symbols.
-Package: bluez-alsa
-Replaces: bluez-audio
-Architecture: linux-any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, bluez
-Description: Bluetooth ALSA support
- This package contains a driver operate with the ALSA stack.
- .
- BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
- project distributed under GNU General Public License (GPL).
-
-Package: bluez-gstreamer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, bluez
-Replaces: bluez-audio
-Description: Bluetooth GStreamer support
- This package contains a plugin to operate with GStreamer applications.
- .
- BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
- project distributed under GNU General Public License (GPL).
-
-Package: bluez-cups
-Architecture: linux-any
-Depends: ${shlibs:Depends}, cups, ${misc:Depends}
-Description: Bluetooth printer driver for CUPS
- This package contains a driver to let CUPS print to Bluetooth-connected
- printers.
- .
- BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
- project distributed under GNU General Public License (GPL).
-
-Package: bluez-pcmcia-support
-Architecture: linux-any
-Priority: extra
-Depends: pcmciautils, ${misc:Depends}
-Recommends: setserial
-Description: PCMCIA support files for BlueZ 2.0 Bluetooth tools
- This package contains files to enable PCMCIA card services to recognise
- and initialise PCMCIA Bluetooth devices.
- .
- BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
- project distributed under GNU General Public License (GPL).
-
-Package: bluez-compat
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: BlueZ 3.x compatibility binaries
- This package provides the legacy binaries that were reminiscent of the
- BlueZ 3.x pairing methods. These binaries are not supported, and will
- go away again in the future. The provided binaries are:
- .
- hidd
- dund
- pand
-
-Package: bluez-utils
-Depends: bluetooth
-Architecture: all
-Section: oldlibs
-Priority: extra
-Description: Transitional package
- This is a transitional package to assist with moving people to the
- BlueZ 4.x stack.
-
-Package: bluez-audio
-Depends: bluez-alsa (>= 4.94-3), bluez-gstreamer (>= 4)
-Architecture: all
-Section: oldlibs
-Priority: extra
-Description: Transitional package
- This is a transitional package to assist with moving people to the
- BlueZ 4.x stack.
+#Package: bluez-alsa
+#Replaces: bluez-audio
+#Architecture: linux-any
+#Multi-Arch: same
+#Depends: ${shlibs:Depends}, ${misc:Depends}, bluez
+#Description: Bluetooth ALSA support
+# This package contains a driver operate with the ALSA stack.
+# .
+# BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+# project distributed under GNU General Public License (GPL).
+#
+#Package: bluez-gstreamer
+#Architecture: linux-any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, bluez
+#Replaces: bluez-audio
+#Description: Bluetooth GStreamer support
+# This package contains a plugin to operate with GStreamer applications.
+# .
+# BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+# project distributed under GNU General Public License (GPL).
+#
+#Package: bluez-cups
+#Architecture: linux-any
+#Depends: ${shlibs:Depends}, cups, ${misc:Depends}
+#Description: Bluetooth printer driver for CUPS
+# This package contains a driver to let CUPS print to Bluetooth-connected
+# printers.
+# .
+# BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+# project distributed under GNU General Public License (GPL).
+#
+#Package: bluez-pcmcia-support
+#Architecture: linux-any
+#Priority: extra
+#Depends: pcmciautils, ${misc:Depends}
+#Recommends: setserial
+#Description: PCMCIA support files for BlueZ 2.0 Bluetooth tools
+# This package contains files to enable PCMCIA card services to recognise
+# and initialise PCMCIA Bluetooth devices.
+# .
+# BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+# project distributed under GNU General Public License (GPL).
+#
+#Package: bluez-compat
+#Architecture: linux-any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: BlueZ 3.x compatibility binaries
+# This package provides the legacy binaries that were reminiscent of the
+# BlueZ 3.x pairing methods. These binaries are not supported, and will
+# go away again in the future. The provided binaries are:
+# .
+# hidd
+# dund
+# pand
+#
+#Package: bluez-utils
+#Depends: bluetooth
+#Architecture: all
+#Section: oldlibs
+#Priority: extra
+#Description: Transitional package
+# This is a transitional package to assist with moving people to the
+# BlueZ 4.x stack.
+#
+#Package: bluez-audio
+#Depends: bluez-alsa (>= 4.94-3), bluez-gstreamer (>= 4)
+#Architecture: all
+#Section: oldlibs
+#Priority: extra
+#Description: Transitional package
+# This is a transitional package to assist with moving people to the
+# BlueZ 4.x stack.
diff -ruNp bluez-4.101/debian/libbluetooth3.symbols bluez-5.4/debian/libbluetooth3.symbols
--- bluez-4.101/debian/libbluetooth3.symbols 2012-07-23 05:53:23.000000000 +0200
+++ bluez-5.4/debian/libbluetooth3.symbols 2013-05-06 10:39:49.000000000 +0200
@@ -12,13 +12,13 @@ libbluetooth.so.3 libbluetooth3 #MINVER#
bt_error at Base 4.91
bt_free at Base 4.91
bt_malloc at Base 4.91
- bt_string_to_uuid at Base 4.91
- bt_uuid128_create at Base 4.91
- bt_uuid16_create at Base 4.91
- bt_uuid32_create at Base 4.91
- bt_uuid_cmp at Base 4.91
- bt_uuid_to_string at Base 4.91
- bt_uuid_to_uuid128 at Base 4.91
+# bt_string_to_uuid at Base 4.91
+# bt_uuid128_create at Base 4.91
+# bt_uuid16_create at Base 4.91
+# bt_uuid32_create at Base 4.91
+# bt_uuid_cmp at Base 4.91
+# bt_uuid_to_string at Base 4.91
+# bt_uuid_to_uuid128 at Base 4.91
hci_authenticate_link at Base 4.91
hci_bustostr at Base 4.91
hci_change_link_key at Base 4.91
diff -ruNp bluez-4.101/debian/patches/series bluez-5.4/debian/patches/series
--- bluez-4.101/debian/patches/series 2012-07-23 05:47:07.000000000 +0200
+++ bluez-5.4/debian/patches/series 2013-05-06 10:10:07.000000000 +0200
@@ -1,7 +1,7 @@
-01_lower_sink_ranking.patch
-02_disable_hal.patch
-03-Fix-return-code-of-hid2hci.patch
-06-alsalib.patch
+#01_lower_sink_ranking.patch
+#02_disable_hal.patch
+#03-Fix-return-code-of-hid2hci.patch
+#06-alsalib.patch
# 07-fix-639356.patch
# 08-0001-systemd-install-systemd-unit-files.patch
-09_fix_ftbfs_with_c99.patch
+#09_fix_ftbfs_with_c99.patch
diff -ruNp bluez-4.101/debian/rules bluez-5.4/debian/rules
--- bluez-4.101/debian/rules 2012-01-12 06:05:01.000000000 +0100
+++ bluez-5.4/debian/rules 2013-05-15 10:12:54.112271001 +0200
@@ -40,6 +40,12 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-wiimote \
--enable-thermometer \
--enable-capng \
+ --enable-library \
+ --enable-monitor \
+ --enable-udev \
+ --enable-obex \
+ --enable-client \
+ --enable-systemd \
--with-systemdunitdir=/lib/systemd/system
DEB_DESTDIR := $(CURDIR)/debian/tmp
@@ -54,12 +60,12 @@ install/bluez::
install -D -m 0755 $(CURDIR)/debian/bluez_agent.udev \
$(CURDIR)/debian/bluez/lib/udev/bluez
- install -D -m 0755 $(CURDIR)/test/agent \
- $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
- for d in $(TEST_PROGRAM_LIST) ; do \
- install -D -m 0755 $(CURDIR)/test/$$d \
- $(CURDIR)/debian/bluez/usr/bin/bluez-$$d ; \
- done
+# install -D -m 0755 $(CURDIR)/test/agent \
+# $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
+# for d in $(TEST_PROGRAM_LIST) ; do \
+# install -D -m 0755 $(CURDIR)/test/$$d \
+# $(CURDIR)/debian/bluez/usr/bin/bluez-$$d ; \
+# done
install -D -m 0644 $(CURDIR)/debian/README.examples \
$(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
@@ -69,8 +75,8 @@ binary-install/bluez-gstreamer::
dh_gstscancodecs -pbluez-gstreamer
binary-install/bluez::
- install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \
- $(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
+# install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \
+# $(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
install -D -m 0755 $(CURDIR)/debian/bluez-udev \
$(CURDIR)/debian/bluez/lib/udev/bluez-udev
More information about the Pkg-bluetooth-maintainers
mailing list