[Pkg-bluetooth-maintainers] Bug#636633: bluez: Cleanup of packaging, multiarch patch
Daniel Schaal
farbing at web.de
Thu Aug 4 18:54:03 UTC 2011
Package: bluez
Version: 4.94-3
Severity: wishlist
Tags: patch
Attached are a few patches to update and cleanup the packaging
for 4.96, and also to move the library to multiarch paths.
0001-switch-to-3.0-quilt-refresh-patches.patch:
switch to 3.0 (quilt), refresh patches
change format to 3.0 (quilt), remove simple-patchsys.mk
and add quilt series file for patches
0002-add-systemd-unit-update-configure-flags.patch:
add systemd unit, update configure flags
Remove obsolete configure flags and add new plugins:
- proximity
- sap
- wiimote
- thermometer
- dbusoob
Add --with-systemdunitdir=/lib/systemd/system to configure
flags and install bluetooth.service
0003-switch-to-debhelper-overrides-decruft-rules-file-and.patch:
switch to debhelper overrides, decruft rules file and strip debian/tmp/ from .install files
Remove debian/tmp/ from all install files.
Remove most install commands from rules file and move them
to .install files.
Use debhelper overrides and remove old hacks from rules file
0004-use-dpkg-maintscript-helper-to-handle-conffiles-remo.patch:
use dpkg-maintscript-helper to handle conffiles, remove init script
Remove custom {rm|mv}_conffile handling and use dpkg-maintscript-helper
and remove the init script, now handled by udev
0005-remove-obsolete-bluez_agent.udev-and-maintainer-scri.patch:
remove obsolete bluez_agent.udev and maintainer scripts
remove empty maintainer scripts and obsolete bluez_agent.udev
0006-add-debug-packages.patch:
add debug packages
add libbluetooth3-dbg and bluez-dbg packages
0007-add-libreadline-dev-and-install-gatttool.patch:
add libreadline-dev and install gatttool
gatttool needs libreadline-dev, add dependency and install
gatttool
0008-update-bluez.lintian-overrides.patch:
update bluez.lintian-overrides
0009-use-set-e-in-preinst-scripts-and-don-t-refer-to-syml.patch:
use set -e in preinst scripts and don't refer to symlinked licenses in copyright
Fix some lintian pedantic warnings
0010-switch-to-multiarch.patch
switch to multiarch
change debhelper compat to 9, update install files for multiarch
and mark library Multi-Arch: same
Thanks,
Daniel Schaal
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-switch-to-3.0-quilt-refresh-patches.patch
Type: text/x-c
Size: 11245 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-bluetooth-maintainers/attachments/20110804/65d9f366/attachment-0001.bin>
-------------- next part --------------
>From 49d1aae8f0f9eafec2fccd2a06828f2df7c4c8ba Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Wed, 3 Aug 2011 18:22:07 +0200
Subject: [PATCH 02/10] add systemd unit, update configure flags
Remove obsolete configure flags and add new plugins:
- proximity
- sap
- wiimote
- thermometer
- dbusoob
Add --with-systemdunitdir=/lib/systemd/system to configure
flags and install bluetooth.service
---
debian/bluez.install | 1 +
debian/rules | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/debian/bluez.install b/debian/bluez.install
index 4da2667..de8efba 100644
--- a/debian/bluez.install
+++ b/debian/bluez.install
@@ -5,3 +5,4 @@ debian/tmp/usr/sbin/*
debian/tmp/usr/bin/*
debian/tmp/usr/share/man/man*
debian/tmp/lib/udev/hid2hci /lib/udev
+debian/tmp/lib/systemd
diff --git a/debian/rules b/debian/rules
index 236eb87..b7504e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ DEB_DH_AUTORECONF_ARGS = "-ivf"
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 := --enable-health \
- --enable-attrib \
--enable-gstreamer \
--enable-alsa \
--enable-usb \
@@ -27,9 +26,15 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-health \
--enable-dund \
--enable-pnat \
--enable-tracer \
- --enable-udevrules \
- --enable-configfiles \
- --enable-capng
+ --enable-capng \
+ --enable-proximity \
+ --enable-sap \
+ --enable-datafiles \
+ --enable-wiimote \
+ --disable-hal \
+ --enable-thermometer \
+ --enable-dbusoob \
+ --with-systemdunitdir=/lib/systemd/system
DEB_DESTDIR := $(CURDIR)/debian/tmp
--
1.7.5.4
-------------- next part --------------
>From 3faff926796e07611047ebef46793831a198e253 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Wed, 3 Aug 2011 19:31:57 +0200
Subject: [PATCH 03/10] switch to debhelper overrides, decruft rules file and
strip debian/tmp/ from .install files
Remove debian/tmp/ from all install files.
Remove most install commands from rules file and move them
to .install files.
Use debhelper overrides and remove old hacks from rules file
---
debian/bluez-alsa.install | 3 +-
debian/bluez-compat.install | 6 +++
debian/bluez-cups.install | 2 +-
debian/bluez-gstreamer.install | 3 +-
debian/bluez-pcmcia-support.install | 3 +-
debian/bluez.install | 41 +++++++++++++++++----
debian/control | 3 +-
debian/libbluetooth-dev.install | 8 ++--
debian/libbluetooth3.install | 3 +-
debian/rules | 69 +++++------------------------------
10 files changed, 62 insertions(+), 79 deletions(-)
diff --git a/debian/bluez-alsa.install b/debian/bluez-alsa.install
index c8d71e7..62b3a07 100644
--- a/debian/bluez-alsa.install
+++ b/debian/bluez-alsa.install
@@ -1 +1,2 @@
-debian/tmp/usr/lib/*/alsa-lib/*.so
+usr/lib/*/alsa-lib/*.so
+usr/share/alsa/bluetooth.conf
diff --git a/debian/bluez-compat.install b/debian/bluez-compat.install
index e69de29..0333ace 100644
--- a/debian/bluez-compat.install
+++ b/debian/bluez-compat.install
@@ -0,0 +1,6 @@
+usr/bin/pand
+usr/share/man/man1/pand.1
+usr/bin/dund
+usr/share/man/man1/dund.1
+usr/bin/hidd
+usr/share/man/man1/hidd.1
diff --git a/debian/bluez-cups.install b/debian/bluez-cups.install
index fd6f5ea..62032eb 100644
--- a/debian/bluez-cups.install
+++ b/debian/bluez-cups.install
@@ -1 +1 @@
-debian/tmp/usr/lib/cups/backend/*
+usr/lib/cups/backend/bluetooth
diff --git a/debian/bluez-gstreamer.install b/debian/bluez-gstreamer.install
index 0e7ecaf..c4fca01 100644
--- a/debian/bluez-gstreamer.install
+++ b/debian/bluez-gstreamer.install
@@ -1,2 +1 @@
-debian/tmp/usr/lib/gstreamer-*/*.so
-
+usr/lib/gstreamer-*/*.so
diff --git a/debian/bluez-pcmcia-support.install b/debian/bluez-pcmcia-support.install
index 4cf0c1c..d41b9d8 100644
--- a/debian/bluez-pcmcia-support.install
+++ b/debian/bluez-pcmcia-support.install
@@ -1 +1,2 @@
-scripts/bluetooth_serial /lib/udev
+lib/udev/bluetooth_serial
+lib/udev/rules.d/97-bluetooth-serial.rules
diff --git a/debian/bluez.install b/debian/bluez.install
index de8efba..c8c8992 100644
--- a/debian/bluez.install
+++ b/debian/bluez.install
@@ -1,8 +1,33 @@
-debian/tmp/etc/bluetooth/main.conf
-debian/tmp/etc/bluetooth/rfcomm.conf
-debian/tmp/etc/dbus*/*
-debian/tmp/usr/sbin/*
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/man/man*
-debian/tmp/lib/udev/hid2hci /lib/udev
-debian/tmp/lib/systemd
+etc/bluetooth/main.conf
+etc/bluetooth/rfcomm.conf
+etc/dbus-1
+usr/sbin
+usr/bin/rctest
+usr/bin/hcitool
+usr/bin/sdptool
+usr/bin/dfutool
+usr/bin/ciptool
+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-bluetooth.rules
+lib/systemd
+input/input.conf etc/bluetooth
+audio/audio.conf etc/bluetooth
+network/network.conf etc/bluetooth
+serial/serial.conf etc/bluetooth
+usr/share/man/man1/sdptool.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 --git a/debian/control b/debian/control
index 56da3c7..f13a538 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ 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 (>= 7),
+Build-Depends: debhelper (>= 7.0.50),
dh-autoreconf(>= 4),
autotools-dev,
- cdbs,
flex,
bison,
gstreamer-tools,
diff --git a/debian/libbluetooth-dev.install b/debian/libbluetooth-dev.install
index 8ec9dff..e3b0bad 100644
--- a/debian/libbluetooth-dev.install
+++ b/debian/libbluetooth-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/pkgconfig/*
+usr/include/bluetooth
+usr/lib/libbluetooth.so
+usr/lib/libbluetooth.la
+usr/lib/pkgconfig
diff --git a/debian/libbluetooth3.install b/debian/libbluetooth3.install
index c45ebcf..d6df6e9 100644
--- a/debian/libbluetooth3.install
+++ b/debian/libbluetooth3.install
@@ -1 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/libbluetooth.so.3
+usr/lib/libbluetooth.so.3.*
diff --git a/debian/rules b/debian/rules
index b7504e6..5ba8eeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,11 @@
#!/usr/bin/make -f
# build rules for bluez
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
+%:
+ dh $@ --with autoreconf --parallel
-DEB_DH_AUTORECONF_ARGS = "-ivf"
-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 := --enable-health \
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-health \
--enable-gstreamer \
--enable-alsa \
--enable-usb \
@@ -36,35 +32,15 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-health \
--enable-dbusoob \
--with-systemdunitdir=/lib/systemd/system
-DEB_DESTDIR := $(CURDIR)/debian/tmp
+override_dh_installinit:
+ dh_installinit --name=bluetooth -- start 25 2 3 4 5 . stop 74 0 1 6 .
TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \
test-discovery test-input test-manager test-network test-serial \
test-service test-telephony
-#install/bluetooth::
- #install -D -m 0644 $(CURDIR)/debian/bluetooth.override \
- $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
-
-install/bluez::
- # conf files
- install -D -m 0644 $(CURDIR)/input/input.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/input.conf
- install -D -m 0644 $(CURDIR)/audio/audio.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/audio.conf
- install -D -m 0644 $(CURDIR)/network/network.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/network.conf
- install -D -m 0644 $(CURDIR)/serial/serial.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/serial.conf
-
- # udev rules, actually upstream version is changed with
- # sed -i 's at RUN+="/usr/sbin/hid2hci at RUN+="/lib/udev/bluez@'
- # scripts/bluetooth-hid2hci.rules
- # and the diff is in debian/patches/010_udev_rules_agent.patch
- install -D -m 0644 $(CURDIR)/scripts/bluetooth-hid2hci.rules \
- $(CURDIR)/debian/bluez/lib/udev/rules.d/62-bluez-hid2hci.rules
- install -D -m 0755 $(CURDIR)/debian/bluez_agent.udev \
- $(CURDIR)/debian/bluez/lib/udev/bluez
+override_dh_auto_install:
+ dh_auto_install
# misc
install -D -m 0755 $(CURDIR)/test/agent \
@@ -77,36 +53,11 @@ install/bluez::
install -D -m 0644 $(CURDIR)/debian/README.examples \
$(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
-#install/bluez-utils::
- #install -D -m 0644 $(CURDIR)/debian/bluez-utils.override \
- # $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils
-
-install/bluez-alsa::
- install -D -m 0644 $(CURDIR)/audio/bluetooth.conf \
- $(CURDIR)/debian/bluez-alsa/usr/share/alsa/bluetooth.conf
-
-install/bluez-pcmcia-support::
- cp -f $(CURDIR)/scripts/bluetooth-serial.rules \
- $(CURDIR)/debian/bluez-pcmcia-support.udev
-
-binary-install/bluez-compat::
- for d in pand dund hidd; do \
- mv -v $(CURDIR)/debian/bluez/usr/bin/$$d \
- $(CURDIR)/debian/bluez-compat/usr/bin/;\
- mv -v $(CURDIR)/debian/bluez/usr/share/man/man1/$$d* \
- $(CURDIR)/debian/bluez-compat/usr/share/man/man1/;\
- done
-
-binary-install/bluez-gstreamer::
LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
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
-binary-install/bluez-pcmcia-support::
- chmod a+x $(CURDIR)/debian/bluez-pcmcia-support/lib/udev/bluetooth_serial
-
-clean::
- -rm -f $(CURDIR)/debian/bluez-pcmcia-support.udev
+override_dh_install:
+ dh_install --list-missing
--
1.7.5.4
-------------- next part --------------
>From eab458260bb8918ecee7bc12244c8b75460256d9 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Thu, 4 Aug 2011 10:53:10 +0200
Subject: [PATCH 04/10] use dpkg-maintscript-helper to handle conffiles,
remove init script
Remove custom {rm|mv}_conffile handling and use dpkg-maintscript-helper
and remove the init script, now handled by udev
---
debian/bluez-alsa.postinst | 10 ++
debian/bluez-alsa.postrm | 10 ++
debian/bluez-alsa.preinst | 32 +-----
debian/bluez-alsa.prerm | 10 ++
debian/bluez.bluetooth.default | 20 ----
debian/bluez.bluetooth.init | 201 ----------------------------------------
debian/bluez.postinst | 34 ++++---
debian/bluez.postrm | 26 +++++
debian/bluez.preinst | 74 ++++-----------
debian/bluez.prerm | 26 +++++
debian/rules | 3 -
11 files changed, 127 insertions(+), 319 deletions(-)
create mode 100644 debian/bluez-alsa.postinst
create mode 100644 debian/bluez-alsa.postrm
create mode 100644 debian/bluez-alsa.prerm
delete mode 100644 debian/bluez.bluetooth.default
delete mode 100644 debian/bluez.bluetooth.init
create mode 100644 debian/bluez.postrm
create mode 100644 debian/bluez.prerm
diff --git a/debian/bluez-alsa.postinst b/debian/bluez-alsa.postinst
new file mode 100644
index 0000000..c0c5e74
--- /dev/null
+++ b/debian/bluez-alsa.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper \
+ rm_conffile /etc/bluetooth/audio.service 3.24-1+b1 bluez-audio -- "$@"
+fi
+
+#DEBHELPER#
diff --git a/debian/bluez-alsa.postrm b/debian/bluez-alsa.postrm
new file mode 100644
index 0000000..c0c5e74
--- /dev/null
+++ b/debian/bluez-alsa.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper \
+ rm_conffile /etc/bluetooth/audio.service 3.24-1+b1 bluez-audio -- "$@"
+fi
+
+#DEBHELPER#
diff --git a/debian/bluez-alsa.preinst b/debian/bluez-alsa.preinst
index c94567a..c0c5e74 100644
--- a/debian/bluez-alsa.preinst
+++ b/debian/bluez-alsa.preinst
@@ -1,30 +1,10 @@
-#!/bin/sh -e
+#!/bin/sh
-# snippet from http://wiki.debian.org/DpkgConffileHandling
+set -e
-# Remove a no-longer used conffile
-rm_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
- fi
-}
-
-case "$1" in
-install|upgrade)
- if dpkg --compare-versions "$2" le "3.24-1+b1"; then
- rm_conffile bluez-audio "/etc/bluetooth/audio.service"
- fi
-esac
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper \
+ rm_conffile /etc/bluetooth/audio.service 3.24-1+b1 bluez-audio -- "$@"
+fi
#DEBHELPER#
diff --git a/debian/bluez-alsa.prerm b/debian/bluez-alsa.prerm
new file mode 100644
index 0000000..c0c5e74
--- /dev/null
+++ b/debian/bluez-alsa.prerm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper \
+ rm_conffile /etc/bluetooth/audio.service 3.24-1+b1 bluez-audio -- "$@"
+fi
+
+#DEBHELPER#
diff --git a/debian/bluez.bluetooth.default b/debian/bluez.bluetooth.default
deleted file mode 100644
index 5b604a1..0000000
--- a/debian/bluez.bluetooth.default
+++ /dev/null
@@ -1,20 +0,0 @@
-# Defaults for bluez
-
-# start bluetooth on boot?
-# compatibility note: if this variable is _not_ found bluetooth will start
-BLUETOOTH_ENABLED=1
-
-# This setting used to switch HID devices (e.g mouse/keyboad) to HCI mode, that
-# is you will have bluetooth functionality from your dongle instead of only
-# HID. This is accomplished for supported devices by udev in
-# /lib/udev/rules.d/62-bluez-hid2hci.rules by invoking hid2hci with correct
-# parameters.
-# See /usr/share/doc/bluez/NEWS.Debian.gz for further information.
-
-# Older daemons like pand dund and hidd can be found in bluez-compat package as
-# they are deprecated and provided for backward compatibility only.
-
-# Note that not every bluetooth dongle is capable of switching back to HID mode,
-# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=355497
-HID2HCI_ENABLED=0
-HID2HCI_UNDO=0
diff --git a/debian/bluez.bluetooth.init b/debian/bluez.bluetooth.init
deleted file mode 100644
index 6239503..0000000
--- a/debian/bluez.bluetooth.init
+++ /dev/null
@@ -1,201 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: bluetooth
-# Required-Start: $local_fs $syslog $remote_fs dbus
-# Required-Stop: $local_fs $syslog $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start bluetooth daemons
-### END INIT INFO
-#
-# bluez Bluetooth subsystem starting and stopping
-#
-# originally from bluez's scripts/bluetooth.init
-#
-# Edd Dumbill <ejad at debian.org>
-# LSB 3.0 compilance and enhancements by Filippo Giunchedi <filippo at debian.org>
-#
-# Updated for bluez 4.7 by Mario Limonciello <mario_limonciello at dell.com>
-#
-# Note: older daemons like dund pand hidd are now shipped inside the
-# bluez-compat package
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC=bluetooth
-
-DAEMON=/usr/sbin/bluetoothd
-HCIATTACH=/usr/sbin/hciattach
-
-HID2HCI_ENABLED=1
-HID2HCI_UNDO=1
-
-UART_CONF=/etc/bluetooth/uart
-
-RFCOMM_NAME=rfcomm
-RFCOMM=/usr/bin/$RFCOMM_NAME
-RFCOMM_CONF=/etc/bluetooth/$RFCOMM_NAME.conf
-SDPTOOL=/usr/bin/sdptool
-
-SSD_OPTIONS="--oknodo --quiet --exec $DAEMON"
-
-test -f $DAEMON || exit 0
-
-# FIXME: any of the sourced files may fail if/with syntax errors
-test -f /etc/default/bluetooth && . /etc/default/bluetooth
-test -f /etc/default/rcS && . /etc/default/rcS
-
-. /lib/lsb/init-functions
-
-set -e
-
-# FIXME: this function is possibly a no-op
-run_sdptool()
-{
- # declaring IFS local in this function, removes the need to
- # save/restore it
- local IFS o
-
- test -x $SDPTOOL || return 1
-
-# FIXME: where does SDPTOOL_OPTIONS come from?
- if ! test -z "$SDPTOOL_OPTIONS" ; then
- IFS=";"
- for o in $SDPTOOL_OPTIONS ; do
- #echo "execing $SDPTOOL $o"
- IFS=" "
- if [ "$VERBOSE" != no ]; then
- $SDPTOOL $o
- else
- $SDPTOOL $o >/dev/null 2>&1
- fi
- done
- fi
-}
-
-hci_input()
-{
- log_progress_msg "switching to HID/HCI no longer done in init script, see /usr/share/doc/bluez/NEWS.Debian.gz" || :
-}
-alias enable_hci_input=hci_input
-alias disable_hci_input=hci_input
-
-start_uarts()
-{
- [ -f $HCIATTACH ] && [ -f $UART_CONF ] || return
- grep -v '^#' $UART_CONF | while read i; do
- if [ "$VERBOSE" != no ]; then
- $HCIATTACH $i
- else
- $HCIATTACH $i >/dev/null 2>&1
- fi
- done
-}
-
-stop_uarts()
-{
- killall ${HCIATTACH##*/} >/dev/null 2>&1 || :
-}
-
-start_rfcomm()
-{
- if [ -x $RFCOMM ] && [ -f $RFCOMM_CONF ] ; then
- # rfcomm must always succeed for now: users
- # may not yet have an rfcomm-enabled kernel
- if [ "$VERBOSE" != no ]; then
- log_progress_msg "${RFCOMM##*/}"
- $RFCOMM -f $RFCOMM_CONF bind all || :
- else
- $RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || :
- fi
- fi
-}
-
-stop_rfcomm()
-{
- if [ -x $RFCOMM ] ; then
- if [ "$VERBOSE" != no ]; then
- log_progress_msg "${RFCOMM##*/}"
- $RFCOMM unbind all || :
- else
- $RFCOMM unbind all >/dev/null 2>&1 || :
- fi
- fi
-}
-
-restart_rfcomm()
-{
- if [ -x $RFCOMM ] && [ -f $RFCOMM_CONF ] ; then
- if [ "$VERBOSE" != no ]; then
- log_progress_msg "${RFCOMM##*/}"
- $RFCOMM unbind all || :
- $RFCOMM -f $RFCOMM_CONF bind all || :
- else
- $RFCOMM unbind all >/dev/null 2>&1|| :
- $RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || :
- fi
- fi
-}
-
-case $1 in
- start)
- log_daemon_msg "Starting $DESC"
-
- if test "$BLUETOOTH_ENABLED" = 0; then
- log_progress_msg "disabled. see /etc/default/bluetooth"
- log_end_msg 0
- exit 0
- fi
-
- start-stop-daemon --start $SSD_OPTIONS
- log_progress_msg "${DAEMON##*/}"
-
- run_sdptool || :
-
- start_uarts || :
-
- if test "$HID2HCI_ENABLED" = 1; then
- enable_hci_input
- fi
- start_rfcomm || :
-
- if test "$HIDD_ENABLED" = 1 ||
- test "$PAND_ENABLED" = 1 || test "$DUND_ENABLED" = 1; then
- log_progress_msg "compatibily daemons not started, see bluez-compat package"
- fi
-
- log_end_msg 0
- ;;
- stop)
- log_daemon_msg "Stopping $DESC"
- if test "$BLUETOOTH_ENABLED" = 0; then
- log_progress_msg "disabled."
- log_end_msg 0
- exit 0
- fi
- stop_rfcomm || :
- if test "$HID2HCI_UNDO" = 1; then
- disable_hci_input
- fi
- start-stop-daemon --stop $SSD_OPTIONS
- log_progress_msg "${DAEMON}"
- stop_uarts || :
- log_end_msg 0
- ;;
- restart|force-reload)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- status_of_proc "$DAEMON" "$DESC" && exit 0 || exit $?
- ;;
- *)
- N=/etc/init.d/bluetooth
- echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# vim:noet
diff --git a/debian/bluez.postinst b/debian/bluez.postinst
index c6b25cb..5fcdcd5 100644
--- a/debian/bluez.postinst
+++ b/debian/bluez.postinst
@@ -1,20 +1,7 @@
#!/bin/sh
-# snippet from http://www.dpkg.org/dpkg/ConffileHandling
set -e
-# Move a conffile without triggering a dpkg question
-mv_conffile() {
- OLDCONFFILE="$1"
- NEWCONFFILE="$2"
-
- if [ -e "$OLDCONFFILE" ]; then
- echo "Preserving user changes to $NEWCONFFILE ..."
- mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
- mv -f "$OLDCONFFILE" "$NEWCONFFILE"
- fi
-}
-
case "$1" in
configure)
if [ -e /etc/init.d/bluez-utils ]; then
@@ -53,4 +40,25 @@ case "$1" in
;;
esac
+if dpkg-maintscript-helper supports rm_conffile; then
+ for conffile in \
+ "/etc/bluetooth/network.service" \
+ "/etc/bluetooth/serial.service" \
+ "/etc/bluetooth/input.service"; do
+ dpkg-maintscript-helper \
+ rm_conffile "${conffile}" 3.30-1 bluez-utils -- "$@"
+ done
+ dpkg-maintscript-helper \
+ rm_conffile /etc/init.d/bluetooth 4.94-3 bluez -- "$@"
+fi
+
+if dpkg-maintscript-helper supports mv_conffile; then
+ dpkg-maintscript-helper mv_conffile \
+ /etc/dbus-1/system.d/bluez-hcid.conf \
+ /etc/dbus-1/system.d/bluetooth.conf 3.7-1 bluez -- "$@"
+
+ dpkg-maintscript-helper mv_conffile \
+ /etc/modprobe.d/bluez /etc/modprobe.d/bluez.conf 4.42-1 bluez -- "$@"
+fi
+
#DEBHELPER#
diff --git a/debian/bluez.postrm b/debian/bluez.postrm
new file mode 100644
index 0000000..0f40a5e
--- /dev/null
+++ b/debian/bluez.postrm
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ for conffile in \
+ "/etc/bluetooth/network.service" \
+ "/etc/bluetooth/serial.service" \
+ "/etc/bluetooth/input.service"; do
+ dpkg-maintscript-helper \
+ rm_conffile "${conffile}" 3.30-1 bluez-utils -- "$@"
+ done
+ dpkg-maintscript-helper \
+ rm_conffile /etc/init.d/bluetooth 4.94-3 bluez -- "$@"
+fi
+
+if dpkg-maintscript-helper supports mv_conffile; then
+ dpkg-maintscript-helper mv_conffile \
+ /etc/dbus-1/system.d/bluez-hcid.conf \
+ /etc/dbus-1/system.d/bluetooth.conf 3.7-1 bluez -- "$@"
+
+ dpkg-maintscript-helper mv_conffile \
+ /etc/modprobe.d/bluez /etc/modprobe.d/bluez.conf 4.42-1 bluez -- "$@"
+fi
+
+#DEBHELPER#
diff --git a/debian/bluez.preinst b/debian/bluez.preinst
index 3a00885..6a4da98 100644
--- a/debian/bluez.preinst
+++ b/debian/bluez.preinst
@@ -1,62 +1,24 @@
#!/bin/sh -e
-# snippet from http://www.dpkg.org/dpkg/ConffileHandling
+if dpkg-maintscript-helper supports rm_conffile; then
+ for conffile in \
+ "/etc/bluetooth/network.service" \
+ "/etc/bluetooth/serial.service" \
+ "/etc/bluetooth/input.service"; do
+ dpkg-maintscript-helper \
+ rm_conffile "${conffile}" 3.30-1 bluez-utils -- "$@"
+ done
+ dpkg-maintscript-helper \
+ rm_conffile /etc/init.d/bluetooth 4.94-3 bluez -- "$@"
+fi
-# Prepare to move a conffile without triggering a dpkg question
-prep_mv_conffile() {
- CONFFILE="$1"
+if dpkg-maintscript-helper supports mv_conffile; then
+ dpkg-maintscript-helper mv_conffile \
+ /etc/dbus-1/system.d/bluez-hcid.conf \
+ /etc/dbus-1/system.d/bluetooth.conf 3.7-1 bluez -- "$@"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f "$CONFFILE"
- fi
- fi
-}
-
-# Remove a no-longer used conffile
-rm_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
- fi
-}
-
-case "$1" in
-install|upgrade)
- if dpkg --compare-versions "$2" le "3.7-1"; then
- prep_mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf"
- fi
-
- if dpkg --compare-versions "$2" le "3.30-1"; then
- rm_conffile bluez-utils "/etc/bluetooth/network.service"
- rm_conffile bluez-utils "/etc/bluetooth/serial.service"
- rm_conffile bluez-utils "/etc/bluetooth/input.service"
- fi
-
- # now that modprobe whines remove this old conffile, will be
- # http://bugs.debian.org/523050
- base="/etc/modprobe.d/bluez"
- rm_conffile bluez "$base"
- if [ -e "$base.dpkg-bak" ]; then
- if [ -e "$base.conf" ]; then
- echo "$base.conf exists, not touching"
- else
- echo "Moving $base.dpkg-bak to $base.conf"
- mv -f "$base.dpkg-bak" "$base.conf"
- fi
- fi
-esac
+ dpkg-maintscript-helper mv_conffile \
+ /etc/modprobe.d/bluez /etc/modprobe.d/bluez.conf 4.42-1 bluez -- "$@"
+fi
#DEBHELPER#
diff --git a/debian/bluez.prerm b/debian/bluez.prerm
new file mode 100644
index 0000000..0f40a5e
--- /dev/null
+++ b/debian/bluez.prerm
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ for conffile in \
+ "/etc/bluetooth/network.service" \
+ "/etc/bluetooth/serial.service" \
+ "/etc/bluetooth/input.service"; do
+ dpkg-maintscript-helper \
+ rm_conffile "${conffile}" 3.30-1 bluez-utils -- "$@"
+ done
+ dpkg-maintscript-helper \
+ rm_conffile /etc/init.d/bluetooth 4.94-3 bluez -- "$@"
+fi
+
+if dpkg-maintscript-helper supports mv_conffile; then
+ dpkg-maintscript-helper mv_conffile \
+ /etc/dbus-1/system.d/bluez-hcid.conf \
+ /etc/dbus-1/system.d/bluetooth.conf 3.7-1 bluez -- "$@"
+
+ dpkg-maintscript-helper mv_conffile \
+ /etc/modprobe.d/bluez /etc/modprobe.d/bluez.conf 4.42-1 bluez -- "$@"
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 5ba8eeb..504b17b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,6 @@ override_dh_auto_configure:
--enable-dbusoob \
--with-systemdunitdir=/lib/systemd/system
-override_dh_installinit:
- dh_installinit --name=bluetooth -- start 25 2 3 4 5 . stop 74 0 1 6 .
-
TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \
test-discovery test-input test-manager test-network test-serial \
test-service test-telephony
--
1.7.5.4
-------------- next part --------------
>From 102bff4ac7250c7c366b6656497cc459709a478e Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Wed, 3 Aug 2011 21:29:33 +0200
Subject: [PATCH 05/10] remove obsolete bluez_agent.udev and maintainer
scripts
remove empty maintainer scripts and obsolete bluez_agent.udev
---
debian/bluez-pcmcia-support.postinst | 3 ---
debian/bluez-utils.postrm | 6 ------
debian/bluez_agent.udev | 8 --------
3 files changed, 0 insertions(+), 17 deletions(-)
delete mode 100644 debian/bluez-pcmcia-support.postinst
delete mode 100644 debian/bluez-utils.postrm
delete mode 100755 debian/bluez_agent.udev
diff --git a/debian/bluez-pcmcia-support.postinst b/debian/bluez-pcmcia-support.postinst
deleted file mode 100644
index 07fe0c2..0000000
--- a/debian/bluez-pcmcia-support.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
diff --git a/debian/bluez-utils.postrm b/debian/bluez-utils.postrm
deleted file mode 100644
index 20bef02..0000000
--- a/debian/bluez-utils.postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-#Dummy transitional postrm script
-#Don't do anything.
-
-#DEBHELPER#
diff --git a/debian/bluez_agent.udev b/debian/bluez_agent.udev
deleted file mode 100755
index 0d80bb0..0000000
--- a/debian/bluez_agent.udev
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# /usr is not guaranteed to be mounted when udev starts
-
-(
- . /lib/udev/hotplug.functions
- wait_for_file /lib/udev/hid2hci
- exec /lib/udev/hid2hci "$@"
-) &
--
1.7.5.4
-------------- next part --------------
>From 6822ccbda290becf4b953f2986343878ed306d84 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Wed, 3 Aug 2011 21:47:58 +0200
Subject: [PATCH 06/10] add debug packages
add libbluetooth3-dbg and bluez-dbg packages
---
debian/control | 24 ++++++++++++++++++++++++
debian/rules | 5 +++++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/debian/control b/debian/control
index f13a538..230a366 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,17 @@ 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).
+Package: libbluetooth3-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, libbluetooth3 (= ${binary:Version})
+Description: Library to use the BlueZ Linux Bluetooth stack debugging symbols
+ BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+ project distributed under GNU General Public License (GPL).
+ .
+ This package contains the debugging symbols.
+
Package: libbluetooth-dev
Section: libdevel
Provides: libbluetooth3-dev
@@ -67,6 +78,19 @@ Description: Bluetooth tools and daemons
BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
project distributed under GNU General Public License (GPL).
+Package: bluez-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends: ${misc:Depends}, bluez (= ${binary:Version}), libbluetooth3-dbg (= ${binary:Version})
+Description: Bluetooth tools and daemons (debugging symbols)
+ This package contains tools and system daemons for using Bluetooth devices.
+ .
+ BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
+ project distributed under GNU General Public License (GPL).
+ .
+ This package contains the debugging symbols.
+
Package: bluez-alsa
Replaces: bluez-audio
Architecture: linux-any
diff --git a/debian/rules b/debian/rules
index 504b17b..ef7fa59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,3 +58,8 @@ override_dh_auto_install:
override_dh_install:
dh_install --list-missing
+
+override_dh_strip:
+ dh_strip -plibbluetooth3 --dbg-package=libbluetooth3-dbg
+ dh_strip -pbluez --dbg-package=bluez-dbg
+ dh_strip --remaining-packages
--
1.7.5.4
-------------- next part --------------
>From d777a4c44bd826fc4367346c5ac8a98d96bead8e Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Wed, 3 Aug 2011 22:23:03 +0200
Subject: [PATCH 07/10] add libreadline-dev and install gatttool
gatttool needs libreadline-dev, add dependency and install
gatttool
---
debian/bluez.install | 1 +
debian/control | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/debian/bluez.install b/debian/bluez.install
index c8c8992..408f240 100644
--- a/debian/bluez.install
+++ b/debian/bluez.install
@@ -10,6 +10,7 @@ usr/bin/ciptool
usr/bin/l2ping
usr/bin/l2test
usr/bin/rfcomm
+usr/bin/gatttool
lib/udev/hid2hci
lib/udev/rules.d/97-bluetooth-hid2hci.rules
lib/udev/rules.d/97-bluetooth.rules
diff --git a/debian/control b/debian/control
index 230a366..e09b240 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,8 @@ Build-Depends: debhelper (>= 7.0.50),
libsndfile1-dev,
libusb-dev,
libcap-ng-dev,
- libudev-dev
+ libudev-dev,
+ libreadline-dev
Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/bluez/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk
Homepage: http://www.bluez.org
--
1.7.5.4
-------------- next part --------------
>From dae39469829e954109ceb9f2038c964587651923 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Thu, 4 Aug 2011 09:31:54 +0200
Subject: [PATCH 08/10] update bluez.lintian-overrides
---
debian/bluez.lintian-overrides | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/debian/bluez.lintian-overrides b/debian/bluez.lintian-overrides
index d82af16..32b0b1a 100644
--- a/debian/bluez.lintian-overrides
+++ b/debian/bluez.lintian-overrides
@@ -1,23 +1,32 @@
+bluez: binary-without-manpage usr/bin/bluez-simple-endpoint
bluez: binary-without-manpage usr/bin/bluez-simple-service
bluez: binary-without-manpage usr/bin/bluez-test-adapter
+bluez: binary-without-manpage usr/bin/bluez-test-attrib
bluez: binary-without-manpage usr/bin/bluez-test-audio
bluez: binary-without-manpage usr/bin/bluez-test-device
bluez: binary-without-manpage usr/bin/bluez-test-discovery
bluez: binary-without-manpage usr/bin/bluez-test-input
bluez: binary-without-manpage usr/bin/bluez-test-manager
bluez: binary-without-manpage usr/bin/bluez-test-network
+bluez: binary-without-manpage usr/bin/bluez-test-oob
+bluez: binary-without-manpage usr/bin/bluez-test-sap-server
bluez: binary-without-manpage usr/bin/bluez-test-serial
bluez: binary-without-manpage usr/bin/bluez-test-service
bluez: binary-without-manpage usr/bin/bluez-test-telephony
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-simple-agent
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-simple-service
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-adapter
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-audio
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-device
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-discovery
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-input
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-manager
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-network
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-serial
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-service
-bluez: python-script-but-no-python-dep ./usr/bin/bluez-test-telephony
+bluez: binary-without-manpage usr/bin/gatttool
+bluez: python-script-but-no-python-dep usr/bin/bluez-simple-agent
+bluez: python-script-but-no-python-dep usr/bin/bluez-simple-endpoint
+bluez: python-script-but-no-python-dep usr/bin/bluez-simple-service
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-adapter
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-attrib
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-audio
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-device
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-discovery
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-input
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-manager
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-network
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-oob
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-sap-server
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-serial
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-service
+bluez: python-script-but-no-python-dep usr/bin/bluez-test-telephony
--
1.7.5.4
-------------- next part --------------
>From 4f11588004c846f12463a5a6dffb29bfd3b3324e Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Thu, 4 Aug 2011 09:43:58 +0200
Subject: [PATCH 09/10] use set -e in preinst scripts and don't refer to
symlinked licenses in copyright
Fix some lintian pedantic warnings
---
debian/bluez.preinst | 4 +++-
debian/copyright | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/bluez.preinst b/debian/bluez.preinst
index 6a4da98..0f40a5e 100644
--- a/debian/bluez.preinst
+++ b/debian/bluez.preinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if dpkg-maintscript-helper supports rm_conffile; then
for conffile in \
diff --git a/debian/copyright b/debian/copyright
index 7d10398..473140e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -106,7 +106,7 @@ License:
License: GPL version 2 or any later version
On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL', the GNU Lesser
-General Public License can be found in `/usr/share/common-licenses/LGPL' and
+License can be found in `/usr/share/common-licenses/GPL-2', the GNU Lesser
+General Public License can be found in `/usr/share/common-licenses/LGPL-2.1' and
the GNU Free Documentation License can be found in
`/usr/share/common-licenses/GFDL'.
--
1.7.5.4
-------------- next part --------------
>From e9ae3007e7053a1670ca929c63c871f6b829f112 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Thu, 4 Aug 2011 02:22:45 +0200
Subject: [PATCH 10/10] switch to multiarch, add patch to fix cups backend
install dir
change debhelper compat to 9, update install files for multiarch
and mark library Multi-Arch: same
add patch to keep the cups backend at usr/lib/cups/backend
---
debian/bluez-gstreamer.install | 2 +-
debian/compat | 2 +-
debian/control | 5 ++++-
debian/libbluetooth-dev.install | 6 +++---
debian/libbluetooth3.install | 4 ++--
debian/patches/04-change-cups-backend-dir.patch | 11 +++++++++++
debian/patches/series | 1 +
7 files changed, 23 insertions(+), 8 deletions(-)
create mode 100644 debian/patches/04-change-cups-backend-dir.patch
diff --git a/debian/bluez-gstreamer.install b/debian/bluez-gstreamer.install
index c4fca01..08d7c5b 100644
--- a/debian/bluez-gstreamer.install
+++ b/debian/bluez-gstreamer.install
@@ -1 +1 @@
-usr/lib/gstreamer-*/*.so
+usr/lib/*/gstreamer-*/*.so
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index e09b240..5542630 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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 (>= 7.0.50),
+Build-Depends: debhelper (>= 8.1.3),
dh-autoreconf(>= 4),
autotools-dev,
flex,
@@ -29,7 +29,9 @@ Package: libbluetooth3
Section: libs
Conflicts: libsdp2 (<= 1.5-2)
Replaces: libsdp2 (<= 1.5-2)
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Architecture: linux-any
Description: Library to use the BlueZ Linux Bluetooth stack
BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
@@ -40,6 +42,7 @@ Section: debug
Priority: extra
Architecture: any
Depends: ${misc:Depends}, libbluetooth3 (= ${binary:Version})
+Multi-Arch: same
Description: Library to use the BlueZ Linux Bluetooth stack debugging symbols
BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
project distributed under GNU General Public License (GPL).
diff --git a/debian/libbluetooth-dev.install b/debian/libbluetooth-dev.install
index e3b0bad..9ac53e7 100644
--- a/debian/libbluetooth-dev.install
+++ b/debian/libbluetooth-dev.install
@@ -1,4 +1,4 @@
usr/include/bluetooth
-usr/lib/libbluetooth.so
-usr/lib/libbluetooth.la
-usr/lib/pkgconfig
+usr/lib/*/libbluetooth.so
+usr/lib/*/libbluetooth.la
+usr/lib/*/pkgconfig
diff --git a/debian/libbluetooth3.install b/debian/libbluetooth3.install
index d6df6e9..70a2f0b 100644
--- a/debian/libbluetooth3.install
+++ b/debian/libbluetooth3.install
@@ -1,2 +1,2 @@
-usr/lib/libbluetooth.so.3
-usr/lib/libbluetooth.so.3.*
+usr/lib/*/libbluetooth.so.3
+usr/lib/*/libbluetooth.so.3.*
diff --git a/debian/patches/04-change-cups-backend-dir.patch b/debian/patches/04-change-cups-backend-dir.patch
new file mode 100644
index 0000000..51df00c
--- /dev/null
+++ b/debian/patches/04-change-cups-backend-dir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.tools 2011-08-04 18:56:21.000000000 +0200
++++ b/Makefile.tools 2011-08-04 18:56:59.000000000 +0200
+@@ -135,7 +135,7 @@
+
+
+ if CUPS
+-cupsdir = $(libdir)/cups/backend
++cupsdir = /usr/lib/cups/backend
+
+ cups_PROGRAMS = cups/bluetooth
+
diff --git a/debian/patches/series b/debian/patches/series
index 5872160..f5d5b86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
01_lower_sink_ranking.patch
02_disable_hal.patch
03-Fix-return-code-of-hid2hci.patch
+04-change-cups-backend-dir.patch
06-alsalib.patch
--
1.7.5.4
More information about the Pkg-bluetooth-maintainers
mailing list