[Pkg-bluetooth-commits] r755 - in /packages/bluez-utils/branches/experimental/3.36-1exp1/debian: NEWS bluez-utils.bluetooth.default bluez-utils.bluetooth.init bluez-utils.install bluez-utils.main.conf changelog rules
filippo at users.alioth.debian.org
filippo at users.alioth.debian.org
Sat Sep 6 09:56:22 UTC 2008
Author: filippo
Date: Sat Sep 6 09:56:22 2008
New Revision: 755
URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=755
Log:
* Install plugins, replacing external daemons. Add entry in NEWS.Debian (Closes: #482081, #477838)
* Ship /etc/bluetooth/main.conf with examples for disabling plugins.
Added:
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.main.conf
Modified:
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/NEWS
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.default
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.init
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.install
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog
packages/bluez-utils/branches/experimental/3.36-1exp1/debian/rules
Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/NEWS?rev=755&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/NEWS (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/NEWS Sat Sep 6 09:56:22 2008
@@ -1,3 +1,11 @@
+bluez-utils (3.36-1exp1) unstable; urgency=low
+
+ Starting with this version the remaining external daemons are replaced by
+ hcid plugins, thus pand/dund/hidd are gone.
+ See /etc/bluetooth/main.conf for disabling plugins.
+
+ -- Filippo Giunchedi <filippo at debian.org> Sat, 06 Sep 2008 11:50:12 +0200
+
bluez-utils (3.30-2) unstable; urgency=low
This upstream version switches the service infrastructure from external
Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.default
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.default?rev=755&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.default (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.default Sat Sep 6 09:56:22 2008
@@ -1,11 +1,6 @@
# 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?
+# Start bluetooth on boot?
# compatibility note: If this variable is not found bluetooth will
# start
BLUETOOTH_ENABLED=1
@@ -15,6 +10,11 @@
# 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
+
+# WARNING:
+# Starting with 3.36-1exp1 the old hidd/dund/pand daemons are gone, replaced by
+# hcid plugins. See /etc/bluetooth/main.conf for enabling/disabling plugins.
+# The options below are thus ignored by the init script.
############ HIDD
#
Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.init?rev=755&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.init (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.bluetooth.init Sat Sep 6 09:56:22 2008
@@ -36,21 +36,6 @@
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
@@ -60,25 +45,6 @@
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
@@ -123,49 +89,6 @@
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
@@ -236,16 +159,14 @@
start-stop-daemon --start --quiet --exec $HCID -- $HCID_OPTIONS || true
log_progress_msg "hcid"
- run_sdptool || true
+ #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)
@@ -255,12 +176,10 @@
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
@@ -271,8 +190,6 @@
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
@@ -283,12 +200,10 @@
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
;;
*)
@@ -297,6 +212,7 @@
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
+# XXX send SIGHUP on reload
esac
exit 0
Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.install?rev=755&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.install (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.install Sat Sep 6 09:56:22 2008
@@ -6,3 +6,6 @@
debian/tmp/usr/share/man/man1/*
debian/tmp/usr/share/man/man5/*
debian/tmp/usr/share/man/man8/*
+debian/tmp/usr/lib/bluetooth/plugins/network.so
+debian/tmp/usr/lib/bluetooth/plugins/input.so
+debian/tmp/usr/lib/bluetooth/plugins/serial.so
Added: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.main.conf
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.main.conf?rev=755&op=file
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.main.conf (added)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/bluez-utils.main.conf Sat Sep 6 09:56:22 2008
@@ -1,0 +1,4 @@
+[General]
+# Uncomment the following line to disable plugins.
+# Plugins are loaded from /usr/lib/bluetooth/plugins/
+#DisablePlugins=network;serial
Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog?rev=755&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog Sat Sep 6 09:56:22 2008
@@ -1,8 +1,10 @@
bluez-utils (3.36-1exp1) experimental; urgency=low
* Fix disabling of plugins (debian/patches/001_fix_plugin_disabling.diff)
-
- -- Filippo Giunchedi <filippo at debian.org> Sat, 06 Sep 2008 10:33:50 +0200
+ * Install plugins, replacing external daemons. Add entry in NEWS.Debian (Closes: #482081, #477838)
+ * Ship /etc/bluetooth/main.conf with examples for disabling plugins.
+
+ -- Filippo Giunchedi <filippo at debian.org> Sat, 06 Sep 2008 11:48:18 +0200
bluez-utils (3.36-1) unstable; urgency=medium
Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/rules?rev=755&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/rules (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/rules Sat Sep 6 09:56:22 2008
@@ -9,7 +9,7 @@
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 := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --disable-sdpd --enable-glib --enable-pcmciarules --enable-audio --enable-alsa --enable-dfutool
DEB_DESTDIR := $(CURDIR)/debian/tmp
@@ -23,6 +23,7 @@
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 -D -m 0644 $(CURDIR)/debian/bluez-utils.main.conf $(CURDIR)/debian/bluez-utils/etc/bluetooth/main.conf
install/bluetooth::
install -D -m 0644 $(CURDIR)/debian/bluetooth.override $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
More information about the Pkg-bluetooth-commits
mailing list