tags 499529 help thanks I tried to change the package to accomodate the new version but failed due to GStreamer, which I know nothing about and thus I am stuck. But maybe my help, exported and attached as a Git patch series, can help...
Here is the error I got stuck on: dh_gstscancodecs -pbluez-audio (gst-inspect-0.10:9412): GStreamer-WARNING **: Failed to load plugin 'debian/bluez-audio/usr/lib/gstreamer-0.10/libgstbluetooth.so': libbluetooth.so.3: cannot open shared object file: No such file or directory /usr/bin/dh_gstscancodecs: gst-inspect-0.10 failed on debian/bluez-audio/usr/lib/gstreamer-0.10/libgstbluetooth.so: 65280 make: *** [binary-install/bluez-audio] Error 255 Even though [EMAIL PROTECTED]:/tmp/bluez-utils-4.17$ dh_gstscancodecs --help Usage: dh_gstscancodecs [options] dh_gstscancodecs is a part of debhelper. See debhelper(7) and dh_gstscancodecs(1) for complete usage instructions. promises nice things, dh_gstscancodecs(1) does not exist. ./debian/tmp/usr/lib/libbluetooth.so.3 exists, but dh_gstscancodecs takes neither -l or -L so I cannot tell it about the location where to look for the library. LD_LIBRARY_PATH also does not work. I filed #504840 about that. dh_gstscancodecs -v does not actually show me the commands it uses (#504837), so it's a bit useless. I tried the experimental GStreamer packages too, but the same problems persist. -- .''`. martin f. krafft <[EMAIL PROTECTED]> : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~madduck - http://debiansystem.info `- Debian - when you have better things to do than fixing systems
From 50e7e1de1177ab2d81e45f51ce41e28c214856b9 Mon Sep 17 00:00:00 2001 From: martin f. krafft <[EMAIL PROTECTED]> Date: Fri, 7 Nov 2008 16:26:55 +0100 Subject: [PATCH] record new upstream in changelog Signed-off-by: martin f. krafft <[EMAIL PROTECTED]> --- debian/changelog | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4db556..06e06fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bluez-utils (4.17-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream version. + + -- martin f. krafft <[EMAIL PROTECTED]> Fri, 07 Nov 2008 16:25:56 +0100 + bluez-utils (3.36-2) unstable; urgency=medium * Add patch to always make example passkey-agent register as default agent, -- 1.6.0.2
From 989aa96396c323f087b2738272794d07e14a2ad8 Mon Sep 17 00:00:00 2001 From: martin f. krafft <[EMAIL PROTECTED]> Date: Fri, 7 Nov 2008 16:24:10 +0100 Subject: [PATCH] hcid is no longer, this patch is obsolete Signed-off-by: martin f. krafft <[EMAIL PROTECTED]> --- debian/bluez-utils.install | 2 -- debian/patches/002_hcid_conf_defaults.patch | 20 -------------------- 2 files changed, 0 insertions(+), 22 deletions(-) delete mode 100644 debian/patches/002_hcid_conf_defaults.patch diff --git a/debian/bluez-utils.install b/debian/bluez-utils.install index 52646ba..d891609 100644 --- a/debian/bluez-utils.install +++ b/debian/bluez-utils.install @@ -1,8 +1,6 @@ -debian/tmp/etc/bluetooth/hcid.conf debian/tmp/etc/bluetooth/rfcomm.conf debian/tmp/etc/dbus*/* debian/tmp/usr/bin/* debian/tmp/usr/sbin/* debian/tmp/usr/share/man/man1/* -debian/tmp/usr/share/man/man5/* debian/tmp/usr/share/man/man8/* diff --git a/debian/patches/002_hcid_conf_defaults.patch b/debian/patches/002_hcid_conf_defaults.patch deleted file mode 100644 index 50eb6ec..0000000 --- a/debian/patches/002_hcid_conf_defaults.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- hcid/hcid.conf.orig 2004-05-26 12:47:42.000000000 +0100 -+++ hcid/hcid.conf 2004-05-26 12:50:43.000000000 +0100 -@@ -21,7 +21,7 @@ - pairing multi; - - # Default PIN code for incoming connections -- passkey "BlueZ"; -+ passkey "1234"; - } - - # Default settings for HCI devices -@@ -20,7 +29,7 @@ - # Local device name - # %d - device id - # %h - host name -- name "BlueZ (%d)"; -+ name "%h-%d"; - - # Local device class - class 0x100; -- 1.6.0.2
From c1edbde7c553ed1ae1ab982783c37da8331b0f86 Mon Sep 17 00:00:00 2001 From: martin f. krafft <[EMAIL PROTECTED]> Date: Fri, 7 Nov 2008 16:25:24 +0100 Subject: [PATCH] remove passkey-agent example Signed-off-by: martin f. krafft <[EMAIL PROTECTED]> --- debian/bluez-utils.examples | 1 - debian/passkey-agent-makefile | 4 ---- .../patches/007_always_default_passkey_agent.patch | 20 -------------------- debian/rules | 1 - 4 files changed, 0 insertions(+), 26 deletions(-) delete mode 100644 debian/bluez-utils.examples delete mode 100644 debian/passkey-agent-makefile delete mode 100644 debian/patches/007_always_default_passkey_agent.patch diff --git a/debian/bluez-utils.examples b/debian/bluez-utils.examples deleted file mode 100644 index cc442e8..0000000 --- a/debian/bluez-utils.examples +++ /dev/null @@ -1 +0,0 @@ -test/passkey-agent.c diff --git a/debian/passkey-agent-makefile b/debian/passkey-agent-makefile deleted file mode 100644 index 9c28dc2..0000000 --- a/debian/passkey-agent-makefile +++ /dev/null @@ -1,4 +0,0 @@ -# this Makefile is for building passkey-agent.c, it depends on pkg-config libdbus-1-dev (and build-essential) packages -# After compilation launch as "./passkey-agent <your_passkey>" -passkey-agent: passkey-agent.c - $(CC) `pkg-config --libs --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE -DVERSION="\"unknown\"" -o passkey-agent passkey-agent.c diff --git a/debian/patches/007_always_default_passkey_agent.patch b/debian/patches/007_always_default_passkey_agent.patch deleted file mode 100644 index 3af068f..0000000 --- a/debian/patches/007_always_default_passkey_agent.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- test/passkey-agent.c.orig 2008-10-06 16:15:04.000000000 +0200 -+++ test/passkey-agent.c 2008-10-06 16:15:23.000000000 +0200 -@@ -310,7 +310,7 @@ - printf("Bluetooth passkey agent ver %s\n\n", VERSION); - - printf("Usage:\n" -- "\tpasskey-agent [--default] [--path agent-path] <passkey> [address]\n" -+ "\tpasskey-agent [--path agent-path] <passkey>\n" - "\n"); - } - -@@ -327,7 +327,7 @@ - struct sigaction sa; - DBusConnection *conn; - char match_string[128], default_path[128], *agent_path = NULL; -- int opt, use_default = 0; -+ int opt, use_default = 1; - - snprintf(default_path, sizeof(default_path), - "/org/bluez/passkey_agent_%d", getpid()); diff --git a/debian/rules b/debian/rules index f76c9c1..c980f1d 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,6 @@ install/bluez-utils:: mv $(DEB_DESTDIR)/usr/share/man/man1/l2ping.1 \ $(DEB_DESTDIR)/usr/share/man/man8/l2ping.8 - install -D -m 0644 $(CURDIR)/debian/passkey-agent-makefile $(CURDIR)/debian/bluez-utils/usr/share/doc/bluez-utils/examples/Makefile install -D -m 0644 $(CURDIR)/debian/bluez-utils.override $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils install/bluetooth:: -- 1.6.0.2
From 5cc6232b427b471ea8b8ec58372dde2554639326 Mon Sep 17 00:00:00 2001 From: martin f. krafft <[EMAIL PROTECTED]> Date: Fri, 7 Nov 2008 16:45:16 +0100 Subject: [PATCH] use upstream init scripts Signed-off-by: martin f. krafft <[EMAIL PROTECTED]> --- debian/bluez-utils.bluetooth.default | 94 ----------- debian/bluez-utils.bluetooth.init | 304 ---------------------------------- debian/rules | 3 + 3 files changed, 3 insertions(+), 398 deletions(-) delete mode 100644 debian/bluez-utils.bluetooth.default delete mode 100644 debian/bluez-utils.bluetooth.init diff --git a/debian/bluez-utils.bluetooth.default b/debian/bluez-utils.bluetooth.default deleted file mode 100644 index bdd89fa..0000000 --- a/debian/bluez-utils.bluetooth.default +++ /dev/null @@ -1,94 +0,0 @@ -# Defaults for bluez-utils - -# This file supersedes /etc/default/bluez-pan. If -# that exists on your system, you should use this -# file instead and remove the old one. Until you -# do so, the contents of this file will be ignored. - -# start bluetooth on boot? -# compatibility note: If this variable is not found bluetooth will -# start -BLUETOOTH_ENABLED=1 - -# This setting will switch HID devices (e.g mouse/keyboad) to HCI mode, that is -# you will have bluetooth functionality from your dongle instead of only HID. -# 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=1 - -############ HIDD -# -# HID daemon -HIDD_ENABLED=0 -HIDD_OPTIONS="--master --server" -# to make hidd always use a particular interface, use something -# like this, substituting the bdaddr of the interface: -# HIDD_OPTIONS="-i AA:BB:CC:DD:EE:FF --server" -# -# remove '--master' if you're having trouble working with Ericsson -# T630 phones with hidd operational at the same time. - -############ DUND -# -# Run dund -- this allows ppp logins. 1 for enabled, 0 for disabled. -DUND_ENABLED=0 - -# Arguments to dund: defaults to acting as a server -DUND_OPTIONS="--listen --persist" - -# Run dund --help to see the full array of options. -# Here are some examples: -# -# Connect to any nearby host offering access -# DUND_OPTIONS="--search" -# -# Connect to host 00:11:22:33:44:55 -# DUND_OPTIONS="--connect 00:11:22:33:44:55" -# -# Listen on channel 3 -# DUND_OPTIONS="--listen --channel 3" - -# Special consideration is needed for certain devices. Microsoft -# users see the --msdun option. Ericsson P800 users will need to -# listen on channel 3 and also run 'sdptool add --channel=3 SP' - -############ PAND -# -# Run pand -- ethernet: creates new network interfaces bnep<N> -# that can be configured in /etc/network/interfaces -# set to 1 for enabled, 0 for disabled -PAND_ENABLED=0 - -# Arguments to pand -# Read the PAN howto for ways to set this up -# http://bluez.sourceforge.net/contrib/HOWTO-PAN -# in later versions of pand it used to execute /etc/bluetooth/pan/dev-up -# automatically, now you will need to use the --devup/--devdown options. See -# the pand manpage for more informations -PAND_OPTIONS="" - -# example pand lines -# -# Act as the controller of an ad-hoc network -# PAND_OPTIONS="--listen --role GN" -# -# Act as a network access point: routes to other networks -# PAND_OPTIONS="--listen --role NAP" -# -# Act as a client of an ad-hoc controller with number 00:11:22:33:44:55 -# PAND_OPTIONS="--role PANU --connect 00:11:22:33:44:55" -# -# Connect to any nearby network controller (access point or ad-hoc) -# PAND_OPTIONS="--role PANU --search" - -############ SDPTOOL -# this variable controls the options passed to sdptool on boot, useful if you -# need to setup sdpd on boot. -# options are ;-separated, i.e. for every ; an sdptool instance will be -# launched -# -# examples: -# SDPTOOL_OPTIONS="add --channel=3 SP" # ericsson P800 serial profile -# SDPTOOL_OPTIONS="add --channel=8 OPUSH ; add --channel=9 FTRN" # motorola -# # object push and file transfer -SDPTOOL_OPTIONS="" diff --git a/debian/bluez-utils.bluetooth.init b/debian/bluez-utils.bluetooth.init deleted file mode 100644 index 405601d..0000000 --- a/debian/bluez-utils.bluetooth.init +++ /dev/null @@ -1,304 +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-utils Bluetooth subsystem starting and stopping -# -# originally from bluez's scripts/bluetooth.init -# -# Edd Dumbill <[EMAIL PROTECTED]> -# LSB 3.0 compilance and enhancements by Filippo Giunchedi <[EMAIL PROTECTED]> -# -# startup control over dund and pand can be changed by editing -# /etc/default/bluetooth - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC=bluetooth - -HCID=/usr/sbin/hcid -HCIATTACH=/usr/sbin/hciattach -HCID_NAME=hcid -HCID_OPTIONS="-x -s" - -HID2HCI=/usr/sbin/hid2hci -HID2HCI_ENABLED=1 - -UART_CONF=/etc/bluetooth/uart - -RFCOMM=/usr/bin/rfcomm -RFCOMM_NAME=rfcomm -RFCOMM_CONF=/etc/bluetooth/rfcomm.conf -SDPTOOL=/usr/bin/sdptool - - -DUND_DAEMON=/usr/bin/dund -DUND_NAME=dund -PAND_DAEMON=/usr/bin/pand -PAND_NAME=pand -HIDD_DAEMON=/usr/bin/hidd -HIDD_NAME=hidd - -DUND_ENABLED=0 -PAND_ENABLED=0 -HIDD_ENABLED=0 -DUND_OPTIONS="" -PAND_OPTIONS="" -HIDD_OPTIONS="--master --server" - -test -f /etc/default/bluetooth && . /etc/default/bluetooth -test -f /etc/default/rcS && . /etc/default/rcS - -. /lib/lsb/init-functions - -# test for essential daemons -test -x $HCID || exit 0 -test -x $HCIATTACH || exit 0 -test -x $RFCOMM || exit 0 - -# disable nonessential daemons if not present -if test "$DUND_ENABLED" != "0"; then - if ! test -x $DUND_DAEMON; then - DUND_ENABLED=0 - fi -fi - -if test "$PAND_ENABLED" != "0"; then - if ! test -x $PAND_DAEMON; then - PAND_ENABLED=0 - fi -fi - -if test "$HIDD_ENABLED" != "0"; then - if ! test -x $HIDD_DAEMON; then - HIDD_ENABLED=0 - fi -fi - -set -e - -run_sdptool() -{ - test -x $SDPTOOL || return 1 - - if ! test -z "$SDPTOOL_OPTIONS" ; then - oldifs="$IFS" - 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 - IFS="$oldifs" - fi - -} - -enable_hci_input() -{ - if [ "$VERBOSE" != no ]; then - log_progress_msg "hid_devices" - $HID2HCI --tohci - else - $HID2HCI --tohci >/dev/null 2>&1 - fi -} - -disable_hci_input() -{ - if [ "$VERBOSE" != no ]; then - log_progress_msg "hid_devices" - $HID2HCI --tohid - else - $HID2HCI --tohid >/dev/null 2>&1 - fi -} - -start_pan() -{ - if test "$DUND_ENABLED" != "0"; then - start-stop-daemon --start --quiet --exec $DUND_DAEMON -- $DUND_OPTIONS - [ "$VERBOSE" != no ] && log_progress_msg "dund" - - fi - if test "$PAND_ENABLED" != "0"; then - start-stop-daemon --start --quiet --exec $PAND_DAEMON -- $PAND_OPTIONS - [ "$VERBOSE" != no ] && log_progress_msg "pand" - fi -} - - -stop_pan() -{ - if test "$DUND_ENABLED" != "0"; then - start-stop-daemon --stop --quiet --exec $DUND_DAEMON || true - [ "$VERBOSE" != no ] && log_progress_msg "dund" - fi - if test "$PAND_ENABLED" != "0"; then - start-stop-daemon --stop --quiet --exec $PAND_DAEMON || true - [ "$VERBOSE" != no ] && log_progress_msg "pand" - fi -} - -start_hid() -{ - if test "$HIDD_ENABLED" != "0"; then - start-stop-daemon --start --quiet --exec $HIDD_DAEMON -- $HIDD_OPTIONS - [ "$VERBOSE" != no ] && log_progress_msg "hidd" - fi -} - -stop_hid() -{ - if test "$HIDD_ENABLED" != "0"; then - $HIDD_DAEMON --killall - start-stop-daemon --stop --quiet --exec $HIDD_DAEMON || true - [ "$VERBOSE" != no ] && log_progress_msg "hidd" - fi -} - -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 || true -} - -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 || true - else - $RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || true - fi - fi -} - -stop_rfcomm() -{ - if [ -x $RFCOMM ] ; then - if [ "$VERBOSE" != no ]; then - log_progress_msg "rfcomm" - $RFCOMM unbind all || true - else - $RFCOMM unbind all >/dev/null 2>&1 || true - fi - fi -} - -restart_rfcomm() -{ - if [ -x $RFCOMM ] && [ -f $RFCOMM_CONF ] ; then - if [ "$VERBOSE" != no ]; then - log_progress_msg "rfcomm" - $RFCOMM unbind all || true - $RFCOMM -f $RFCOMM_CONF bind all || true - else - $RFCOMM unbind all >/dev/null 2>&1|| true - $RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || true - 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 --quiet --exec $HCID -- $HCID_OPTIONS || true - log_progress_msg "hcid" - - run_sdptool || true - - start_uarts || true - - start_hid || true - if test "$HID2HCI_ENABLED" = "1"; then - enable_hci_input || true - fi - start_rfcomm || true - start_pan || true - 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_pan || true - stop_rfcomm || true - if test "$HID2HCI_ENABLED" = "1"; then - disable_hci_input || true - fi - stop_hid || true - start-stop-daemon --stop --quiet --exec $HCID || true - log_progress_msg "hcid" - stop_uarts || true - log_end_msg 0 - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" - if test "$HID2HCI_ENABLED" = "1"; then - disable_hci_input || true - fi - stop_hid || true - stop_pan || true - start-stop-daemon --stop --quiet --exec $HCID || true - sleep 1 - 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 --quiet --exec $HCID -- $HCID_OPTIONS || true - log_progress_msg "hcid" - start_hid || true - if test "$HID2HCI_ENABLED" = "1"; then - enable_hci_input || true - fi - restart_rfcomm - start_pan || true - log_end_msg 0 - ;; - *) - N=/etc/init.d/bluetooth - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 - -# vim:noet diff --git a/debian/rules b/debian/rules index c980f1d..2f9101a 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,9 @@ install/bluez-utils:: install -D -m 0644 $(CURDIR)/debian/bluez-utils.override $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils + cp -f $(CURDIR)/scripts/bluetooth.init $(CURDIR)/debian/bluez-utils.init + cp -f $(CURDIR)/scripts/bluetooth.default $(CURDIR)/debian/bluez-utils.default + install/bluetooth:: install -D -m 0644 $(CURDIR)/debian/bluetooth.override $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth -- 1.6.0.2
digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)