[Pkg-bluetooth-maintainers] Bug#499529: [PATCH] Merge in bluez-libs.

Mon Nov 24 19:07:14 UTC 2008

Ok, the following patch on top of madduck's seems to work for me.
I haven't stress-tested it in any way, but at least it all builds,
installs, and at least detects my headset and a few other devices.

Signed-off-by: Jason Riedy <jason at acm.org>
---
 debian/changelog                |    3 ++-
 debian/control                  |   27 ++++++++++++++++++++++++++-
 debian/libbluetooth-dev.install |    6 ++++++
 debian/libbluetooth2.install    |    1 +
 debian/rules                    |   15 +++++++++++++--
 5 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 debian/libbluetooth-dev.install
 create mode 100644 debian/libbluetooth2.install

diff --git a/debian/changelog b/debian/changelog
index 06e06fe..980eb62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-bluez-utils (4.17-0.1) unstable; urgency=low
+bluez-utils (4.19-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * New upstream version.
+  * Merge bluez-libs.
 
  -- martin f. krafft <madduck at debian.org>  Fri, 07 Nov 2008 16:25:56 +0100
 
diff --git a/debian/control b/debian/control
index 4f5cf58..b92aceb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,37 @@ Section: admin
 Priority: optional
 Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
 Uploaders: Edd Dumbill <ejad at debian.org>, Filippo Giunchedi <filippo at debian.org>, Mario Iseli <mario at debian.org>
-Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.33), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev, libgstreamer-plugins-base0.10-dev, libgstreamer0.10-dev, gstreamer-tools (>= 0.10.14), libasound2-dev, libhal-dev, libexpat1-dev
+Build-Depends: bison, flex, debhelper (>= 5), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev, libgstreamer-plugins-base0.10-dev, libgstreamer0.10-dev, gstreamer-tools (>= 0.10.14), libasound2-dev, libhal-dev, libexpat1-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/bluez-utils
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils
 Homepage: http://www.bluez.org
 Standards-Version: 3.8.0
 
+Package: libbluetooth-dev
+Section: libdevel
+Provides: libbluetooth2-dev
+Conflicts: libbluetooth-dev, libsdp2-dev (<= 1.5.2), bluez-pan
+Replaces: libsdp2-dev (<= 1.5.2)
+Depends: libbluetooth2 (= ${binary:Version}), libc6-dev | libc-dev
+Suggests: pkg-config
+Priority: extra
+Architecture: any
+Description: Development files for using the BlueZ Linux Bluetooth library
+ BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+ project distributed under GNU General Public License (GPL).
+Tag: special::not-yet-tagged, special::not-yet-tagged::b
+
+Package: libbluetooth2
+Section: libs
+Conflicts: libsdp2 (<= 1.5-2)
+Replaces: libsdp2 (<= 1.5-2)
+Depends: ${shlibs:Depends}
+Architecture: any
+Description: Library to use the BlueZ Linux Bluetooth stack
+ BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+ project distributed under GNU General Public License (GPL).
+Tag: special::not-yet-tagged, special::not-yet-tagged::b
+
 Package: bluez-utils
 Architecture: any
 Depends: ${shlibs:Depends}, module-init-tools, makedev (<< 3.3.8.2-0) | udev, lsb-base (>= 3.0-3), dbus
diff --git a/debian/libbluetooth-dev.install b/debian/libbluetooth-dev.install
new file mode 100644
index 0000000..a1852c5
--- /dev/null
+++ b/debian/libbluetooth-dev.install
@@ -0,0 +1,6 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/pkgconfig/*
+
diff --git a/debian/libbluetooth2.install b/debian/libbluetooth2.install
new file mode 100644
index 0000000..c45ebcf
--- /dev/null
+++ b/debian/libbluetooth2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 7bac1c8..9f0b179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # build rules for bluez-utils
 
+soname=2
+
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -9,10 +11,19 @@ include /usr/share/cdbs/1/class/autotools.mk
 DEB_UPDATE_RCD_PARAMS = "start 25 2 3 4 5 . stop 74 0 1 6 ."
 DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
 #DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --disable-sdpd --enable-glib --enable-pcmciarules --enable-audio --enable-alsa 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --disable-sdpd --enable-glib --enable-pcmciarules --enable-audio --enable-alsa --enable-hidd --enable-pand --enable-dund --enable-dfutool
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --disable-sdpd --enable-glib --enable-pcmciarules --enable-audio --enable-alsa --enable-hidd --enable-pand --enable-dund --enable-dfutool
+
+DEB_INSTALL_DOCS_libbluetooth${soname} = debian/README.Debian
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
+binary-install/libbluetooth-dev::
+	rm -f $(CURDIR)/debian/libbluetooth-dev/usr/share/doc/libbluetooth-dev/README
+	install -D -m 0644 $(CURDIR)/bluez.m4 $(CURDIR)/debian/libbluetooth-dev/usr/share/aclocal/bluez.m4
+
+binary-install/libbluetooth${soname}::
+	rm -f $(CURDIR)/debian/libbluetooth${soname}/usr/share/doc/libbluetooth${soname}/README
+
 install/bluez-utils::
 	# modutils config file
 	#install -D -m 0644 $(CURDIR)/debian/modutils \
@@ -33,7 +44,7 @@ install/bluez-audio::
 	install -D -m 0644 $(CURDIR)/audio/audio.conf $(CURDIR)/debian/bluez-audio/etc/bluetooth/audio.conf
 
 binary-install/bluez-audio::
-	LD_LIBRARY_PATH="$(CURDIR)/debian/bluez-utils/usr/lib:$(LD_LIBRARY_PATH)" dh_gstscancodecs -pbluez-audio
+	LD_LIBRARY_PATH="$(CURDIR)/debian/libbluetooth$(soname)/usr/lib:$(LD_LIBRARY_PATH)" dh_gstscancodecs -pbluez-audio
 
 install/bluez-pcmcia-support::
 	cp -f $(CURDIR)/scripts/bluetooth.rules $(CURDIR)/debian/bluez-pcmcia-support.udev
-- 
1.6.0.2





