[Pkg-bluetooth-commits] r484 - in /bluez-utils/trunk/debian: README.Debian bluez-utils.bluetooth.default bluez-utils.bluetooth.init bluez-utils.postinst bluez-utils.preinst changelog control patches/001_pand_manpage.patch rules
filippo at users.alioth.debian.org
filippo at users.alioth.debian.org
Mon Jul 9 17:31:43 UTC 2007
Author: filippo
Date: Mon Jul 9 17:31:43 2007
New Revision: 484
URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=484
Log:
almost ready for upload.. I hope
Added:
bluez-utils/trunk/debian/patches/001_pand_manpage.patch
Modified:
bluez-utils/trunk/debian/README.Debian
bluez-utils/trunk/debian/bluez-utils.bluetooth.default
bluez-utils/trunk/debian/bluez-utils.bluetooth.init
bluez-utils/trunk/debian/bluez-utils.postinst
bluez-utils/trunk/debian/bluez-utils.preinst
bluez-utils/trunk/debian/changelog
bluez-utils/trunk/debian/control
bluez-utils/trunk/debian/rules
Modified: bluez-utils/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/README.Debian?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/README.Debian (original)
+++ bluez-utils/trunk/debian/README.Debian Mon Jul 9 17:31:43 2007
@@ -44,18 +44,19 @@
---------------------------
For asking a PIN when necessary a passkey agent is required, the
-bluez-passkey-gnome provides one, another one is provided as an example in
+bluez-gnome provides one, another one is provided as an example in
/usr/share/doc/bluez-utils/examples/passkey-agent.c
The old infrastructure /etc/bluetooth/passkey has been removed since the agent
is supposed to be started by a user session. It is not meant to be system-wide.
-Note to the tech-savy:
-If you are stuck in console and absolutely need to pair with your
-bluetooth device have a look at
-/var/lib/bluetooth/<your_device_address>/pincodes. Please note that
-this mode of operation is _not_ _supported_. Don't mess with files in
-/var/lib/bluetooth/ unless you know what you are doing. I repeat:
-manually adding a pincode for a remote device is NOT SUPPORTED.
+Note to the tech-savvy:
+If you are stuck in console and absolutely need to pair with your bluetooth
+device have a look at /var/lib/bluetooth/<your_device_address>/pincodes.
+Please note that this mode of operation is _not_ _supported_.
+The format is (one per line): <remote_address><whitespace><pincode>
+Don't mess with files in /var/lib/bluetooth/ unless you know what you are
+doing. I repeat: manually adding a pincode for a remote device is NOT
+SUPPORTED.
Keyboard and mouse support
--------------------------
Modified: bluez-utils/trunk/debian/bluez-utils.bluetooth.default
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/bluez-utils.bluetooth.default?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/bluez-utils.bluetooth.default (original)
+++ bluez-utils/trunk/debian/bluez-utils.bluetooth.default Mon Jul 9 17:31:43 2007
@@ -10,11 +10,15 @@
# 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
#
-# To have Bluetooth mouse and keyboard support, get the
-# Linux 2.6.6 patch or better from bluez.org, and set
-# HIDD_ENABLED to 1.
+# HID daemon
HIDD_ENABLED=0
HIDD_OPTIONS="--master --server"
# to make hidd always use a particular interface, use something
@@ -67,6 +71,9 @@
# 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
Modified: bluez-utils/trunk/debian/bluez-utils.bluetooth.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/bluez-utils.bluetooth.init?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/bluez-utils.bluetooth.init (original)
+++ bluez-utils/trunk/debian/bluez-utils.bluetooth.init Mon Jul 9 17:31:43 2007
@@ -13,7 +13,7 @@
# 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>
+# LSB 3.0 compilance and enhancements by Filippo Giunchedi <filippo at debian.org>
#
# startup control over dund and pand can be changed by editing
# /etc/default/bluetooth
@@ -27,6 +27,7 @@
HCID_OPTIONS="-x -s"
HID2HCI=/usr/sbin/hid2hci
+HID2HCI_ENABLED=1
UART_CONF=/etc/bluetooth/uart
@@ -91,7 +92,11 @@
for o in $SDPTOOL_OPTIONS ; do
#echo "execing $SDPTOOL $o"
IFS=" "
- $SDPTOOL $o &>/dev/null
+ if [ "$VERBOSE" != "no" ]; then
+ $SDPTOOL $o
+ else
+ $SDPTOOL $o &>/dev/null 2>&1
+ fi
done
IFS="$oldifs"
fi
@@ -101,7 +106,7 @@
enable_hci_input()
{
if [ "$VERBOSE" != no ]; then
- log_success_msg "Switching on Bluetooth input devices..."
+ log_progress_msg "hid_devices"
$HID2HCI --tohci
else
$HID2HCI --tohci >/dev/null 2>&1
@@ -111,7 +116,7 @@
disable_hci_input()
{
if [ "$VERBOSE" != no ]; then
- log_success_msg "Switching Bluetooth input devices back to HID mode..."
+ log_progress_msg "hid_devices"
$HID2HCI --tohid
else
$HID2HCI --tohid >/dev/null 2>&1
@@ -122,12 +127,12 @@
{
if test "$DUND_ENABLED" != "0"; then
start-stop-daemon --start --quiet --exec $DUND_DAEMON -- $DUND_OPTIONS
- [ "$VERBOSE" != no ] && log_success_msg "Starting $DUND_NAME..."
+ [ "$VERBOSE" != no ] && log_progress_msg "pand"
fi
if test "$PAND_ENABLED" != "0"; then
start-stop-daemon --start --quiet --exec $PAND_DAEMON -- $PAND_OPTIONS
- [ "$VERBOSE" != no ] && log_success_msg "Starting $PAND_NAME..."
+ [ "$VERBOSE" != no ] && log_progress_msg "pand"
fi
}
@@ -136,11 +141,11 @@
{
if test "$DUND_ENABLED" != "0"; then
start-stop-daemon --stop --quiet --exec $DUND_DAEMON || true
- [ "$VERBOSE" != no ] && log_success_msg "Stopping $DUND_NAME..."
+ [ "$VERBOSE" != no ] && log_progress_msg "pand"
fi
if test "$PAND_ENABLED" != "0"; then
start-stop-daemon --stop --quiet --exec $PAND_DAEMON || true
- [ "$VERBOSE" != no ] && log_success_msg "Stopping $PAND_NAME..."
+ [ "$VERBOSE" != no ] && log_progress_msg "pand"
fi
}
@@ -148,7 +153,7 @@
{
if test "$HIDD_ENABLED" != "0"; then
start-stop-daemon --start --quiet --exec $HIDD_DAEMON -- $HIDD_OPTIONS
- [ "$VERBOSE" != no ] && log_success_msg "Starting $HIDD_NAME..."
+ [ "$VERBOSE" != no ] && log_progress_msg "hidd"
fi
}
@@ -157,7 +162,7 @@
if test "$HIDD_ENABLED" != "0"; then
$HIDD_DAEMON --killall
start-stop-daemon --stop --quiet --exec $HIDD_DAEMON || true
- [ "$VERBOSE" != no ] && log_success_msg "Stopping $HIDD_NAME..."
+ [ "$VERBOSE" != no ] && log_progress_msg "hidd"
fi
}
@@ -184,7 +189,7 @@
# rfcomm must always succeed for now: users
# may not yet have an rfcomm-enabled kernel
if [ "$VERBOSE" != no ]; then
- log_success_msg "Starting $RFCOMM_NAME..."
+ log_progress_msg "rfcomm"
$RFCOMM -f $RFCOMM_CONF bind all || true
else
$RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || true
@@ -196,7 +201,7 @@
{
if [ -x $RFCOMM ] ; then
if [ "$VERBOSE" != no ]; then
- log_success_msg "Stopping $RFCOMM_NAME..."
+ log_progress_msg "rfcomm"
$RFCOMM unbind all || true
else
$RFCOMM unbind all >/dev/null 2>&1 || true
@@ -208,7 +213,7 @@
{
if [ -x $RFCOMM ] && [ -f $RFCOMM_CONF ] ; then
if [ "$VERBOSE" != no ]; then
- log_success_msg "Restarting $RFCOMM_NAME..."
+ log_progress_msg "rfcomm"
$RFCOMM unbind all || true
$RFCOMM -f $RFCOMM_CONF bind all || true
else
@@ -233,7 +238,9 @@
start_uarts || true
start_hid || true
- enable_hci_input || true
+ if "$HID2HCI_ENABLED" == "1"; then
+ enable_hci_input || true
+ fi
start_rfcomm || true
start_pan || true
log_end_msg 0
@@ -247,10 +254,12 @@
fi
stop_pan || true
stop_rfcomm || true
- disable_hci_input || true
+ if "$HID2HCI_ENABLED" == "1"; then
+ disable_hci_input || true
+ fi
stop_hid || true
start-stop-daemon --stop --quiet --exec $HCID || true
- log_progress_msg "$HCID_NAME"
+ log_progress_msg "hcid"
stop_uarts || true
log_end_msg 0
;;
@@ -266,7 +275,7 @@
exit 0
fi
start-stop-daemon --start --quiet --exec $HCID -- $HCID_OPTIONS || true
- log_progress_msg "$HCID_NAME"
+ log_progress_msg "hcid"
start_pan || true
start_hid || true
restart_rfcomm
Modified: bluez-utils/trunk/debian/bluez-utils.postinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/bluez-utils.postinst?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/bluez-utils.postinst (original)
+++ bluez-utils/trunk/debian/bluez-utils.postinst Mon Jul 9 17:31:43 2007
@@ -28,7 +28,7 @@
mv_conffile "/etc/init.d/bluez-utils" "/etc/init.d/bluetooth"
mv_conffile "/etc/default/bluez-utils" "/etc/default/bluetooth"
-
+ mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf" "/etc/dbus-1/system.d/bluetooth.conf"
# update modules.conf
/sbin/update-modules >/dev/null 2>&1
Modified: bluez-utils/trunk/debian/bluez-utils.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/bluez-utils.preinst?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/bluez-utils.preinst (original)
+++ bluez-utils/trunk/debian/bluez-utils.preinst Mon Jul 9 17:31:43 2007
@@ -21,6 +21,10 @@
prep_mv_conffile "/etc/init.d/bluez-utils"
prep_mv_conffile "/etc/default/bluez-utils"
fi
+
+ if dpkg --compare-versions "$2" le "3.7-1"; then
+ mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf"
+ fi
esac
#DEBHELPER#
Modified: bluez-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/changelog?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/changelog (original)
+++ bluez-utils/trunk/debian/changelog Mon Jul 9 17:31:43 2007
@@ -1,16 +1,28 @@
bluez-utils (3.12-1) UNRELEASED; urgency=low
-
- * New upstream release
+
+ The "sorry this was long due" release
+
+ * New upstream release (Closes: #425678, #388635)
+ * finish libbluetooth2-dev transition (Closes: #427270)
* completely remove devfs support
* remove modprobe.d/bluez as well as it is in the standard aliases
* remove bluez-passkey-gnome from Recommends since now it is provided by
- bluez-gnome
- * don't do anything on stop in init.d/bluetooth if BLUETOOTH_ENABLED
+ bluez-gnome (Closes: #429300)
+ * don't do anything on stop in init.d/bluetooth if BLUETOOTH_ENABLED == 0
(Closes: #406624)
* Refer to /etc/default/bluetooth in init script, instead of bluez-utils
(Closes: #426750)
-
- -- Filippo Giunchedi <filippo at debian.org> Wed, 04 Jul 2007 15:38:58 +0200
+ * Move /etc/dbus-1/system.d/bluez-hcid.conf to bluetooth.conf
+ * Add HCID_OPTIONS to init script, with default set to "-x -s"
+ (Closes: #412751)
+ * This release removes sdpd, instead the "-s" flag is passed to hcid
+ * Stop shipping /usr/lib/bluetooth dir (Closes: #427159)
+ * Add HID2HCI_ENABLED switch to init/default scripts
+ * Remove mention of /etc/bluetooth/pan/dev-up from pand.1 manpage and add a
+ note to /etc/default/bluetooth (Closes: #398190)
+ * fix README.Debian.gz passkey incorrect name (Closes: #379403)
+
+ -- Filippo Giunchedi <filippo at debian.org> Mon, 09 Jul 2007 18:19:01 +0200
bluez-utils (3.7-1) unstable; urgency=low
Modified: bluez-utils/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/control?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/control (original)
+++ bluez-utils/trunk/debian/control Mon Jul 9 17:31:43 2007
@@ -3,7 +3,7 @@
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>
-Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.12), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.35), libusb-dev
+Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.12), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev
Standards-Version: 3.7.2
Package: bluez-utils
Added: bluez-utils/trunk/debian/patches/001_pand_manpage.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/patches/001_pand_manpage.patch?rev=484&op=file
==============================================================================
--- bluez-utils/trunk/debian/patches/001_pand_manpage.patch (added)
+++ bluez-utils/trunk/debian/patches/001_pand_manpage.patch Mon Jul 9 17:31:43 2007
@@ -1,0 +1,12 @@
+Index: pand/pand.1
+===================================================================
+--- pand/pand.1 (revision 481)
++++ pand/pand.1 (working copy)
+@@ -73,5 +73,5 @@
+ Disconnect automatically on exit
+
+ .SH SCRIPTS
+-pand will execute \fB/etc/bluetooth/pan/dev-up\fR \fIdevice\fR \fIdestination\fR when
+-the interface becomes available.
++The devup/devdown script will be called with bluetooth device as first argument
++and bluetooth destination address as second argument
Modified: bluez-utils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/rules?rev=484&op=diff
==============================================================================
--- bluez-utils/trunk/debian/rules (original)
+++ bluez-utils/trunk/debian/rules Mon Jul 9 17:31:43 2007
@@ -10,7 +10,8 @@
DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
#DH_ALWAYS_EXCLUDE = "README"
# FIXME test --enable-alsa
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci
+#DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --enable-input --enable-network --enable-serial
DEB_DESTDIR := $(CURDIR)/debian/tmp
install/bluez-utils::
More information about the Pkg-bluetooth-commits
mailing list