[Pkg-bluetooth-commits] r485 - in /bluez-utils/trunk/debian: NEWS README.Debian bluez-utils.bluetooth.init bluez-utils.preinst changelog

filippo at users.alioth.debian.org filippo at users.alioth.debian.org
Thu Jul 12 12:09:20 UTC 2007


Author: filippo
Date: Thu Jul 12 12:09:20 2007
New Revision: 485

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=485
Log:
more (mostly stupid) bug fixing

Modified:
    bluez-utils/trunk/debian/NEWS
    bluez-utils/trunk/debian/README.Debian
    bluez-utils/trunk/debian/bluez-utils.bluetooth.init
    bluez-utils/trunk/debian/bluez-utils.preinst
    bluez-utils/trunk/debian/changelog

Modified: bluez-utils/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/NEWS?rev=485&op=diff
==============================================================================
--- bluez-utils/trunk/debian/NEWS (original)
+++ bluez-utils/trunk/debian/NEWS Thu Jul 12 12:09:20 2007
@@ -1,15 +1,15 @@
 bluez-utils (3.7-1) unstable; urgency=low
 
- this version reverts the /etc/bluetooth/passkeys infrastructure as agents for
- passkeys are not supposed to be system-wide.
- A bluez-passkey-gnome is provided as a passkey agent, plus there's a example
- passkey-agent in /usr/share/doc/bluez-utils/examples/passkey-agent.c 
+  This version reverts the /etc/bluetooth/passkeys infrastructure as agents for
+  passkeys are not supposed to be system-wide.
+  A bluez-passkey-gnome is provided as a passkey agent, plus there's a example
+  passkey-agent in /usr/share/doc/bluez-utils/examples/passkey-agent.c 
 
  -- Filippo Giunchedi <filippo at debian.org>  Sat,  7 Oct 2006 11:43:09 +0200
 
 bluez-utils (3.1-3) unstable; urgency=low
 
-  this version includes a new management for outgoing passkey (PIN) requests
+  This version includes a new management for outgoing passkey (PIN) requests
   while the incoming passkeys defaults to 1234 in /etc/bluetooth/hcid.conf.
   See README.Debian for further informations. 
 
@@ -17,18 +17,18 @@
 
 bluez-utils (3.1-1) unstable; urgency=low
 
-  this new upstream version removes the need for external pin helper, pin
-  requests are handled via dbus. the default pin (or now-called "passkey") is
+  This new upstream version removes the need for external pin helper, pin
+  requests are handled via dbus.  The default pin (or now-called "passkey") is
   set to 1234 for backward compatibility.
 
-  also, udev rules for pcmcia card are included along with
+  Also, udev rules for pcmcia card are included along with
   /lib/udev/bluetooth.sh (setserial required) in the bluez-pcmcia-support.
 
  -- Filippo Giunchedi <filippo at debian.org>  Wed, 26 Jul 2006 11:37:02 +0200
 
 bluez-utils (2.24-1) unstable; urgency=low
 
-  this version moves /etc/{init.d,default}/bluez-utils to
+  This version moves /etc/{init.d,default}/bluez-utils to
   /etc/{init.d,default}/bluetooth for LSB compilance.
   If local modifications are detected the new files will be installed with
   the ".dpkg-new" suffix

Modified: bluez-utils/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/README.Debian?rev=485&op=diff
==============================================================================
--- bluez-utils/trunk/debian/README.Debian (original)
+++ bluez-utils/trunk/debian/README.Debian Thu Jul 12 12:09:20 2007
@@ -55,7 +55,7 @@
 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
+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.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/bluez-utils.bluetooth.init?rev=485&op=diff
==============================================================================
--- bluez-utils/trunk/debian/bluez-utils.bluetooth.init (original)
+++ bluez-utils/trunk/debian/bluez-utils.bluetooth.init Thu Jul 12 12:09:20 2007
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 ### BEGIN INIT INFO
 # Provides: bluetooth
 # Required-Start:    $local_fs $syslog $remote_fs
@@ -63,19 +63,19 @@
 
 # disable nonessential daemons if not present
 if test "$DUND_ENABLED" != "0"; then
-	if ! test -f $DUND_DAEMON; then
+	if ! test -x $DUND_DAEMON; then
 		DUND_ENABLED=0
 	fi
 fi
 
 if test "$PAND_ENABLED" != "0"; then
-	if ! test -f $PAND_DAEMON; then
+	if ! test -x $PAND_DAEMON; then
 		PAND_ENABLED=0
 	fi
 fi
 
 if test "$HIDD_ENABLED" != "0"; then
-	if ! test -f $HIDD_DAEMON; then
+	if ! test -x $HIDD_DAEMON; then
 		HIDD_ENABLED=0
 	fi
 fi
@@ -227,7 +227,7 @@
   start)
 	log_daemon_msg "Starting $DESC"
 	
-	if test "$BLUETOOTH_ENABLED" == "0"; then
+	if test "$BLUETOOTH_ENABLED" = "0"; then
 		log_progress_msg "disabled. see /etc/default/bluetooth"
 		log_end_msg 0
 		exit 0
@@ -235,10 +235,13 @@
 
 	start-stop-daemon --start --quiet --exec $HCID -- $HCID_OPTIONS || true
 	log_progress_msg "hcid"
+	
+	run_sdptool || true
+
 	start_uarts || true
 	
 	start_hid || true
-	if "$HID2HCI_ENABLED" == "1"; then
+	if test "$HID2HCI_ENABLED" = "1"; then
 		enable_hci_input || true
 	fi
 	start_rfcomm || true
@@ -247,14 +250,14 @@
     ;;
   stop)
 	log_daemon_msg "Stopping $DESC"
-	if test "$BLUETOOTH_ENABLED" == "0"; then
+	if test "$BLUETOOTH_ENABLED" = "0"; then
 		log_progress_msg "disabled."
 		log_end_msg 0
 		exit 0
 	fi
 	stop_pan || true
 	stop_rfcomm || true
-	if "$HID2HCI_ENABLED" == "1"; then
+	if test "$HID2HCI_ENABLED" = "1"; then
 		disable_hci_input || true
 	fi
 	stop_hid || true
@@ -269,7 +272,7 @@
 	stop_pan || true
 	start-stop-daemon --stop --quiet --exec $HCID || true
 	sleep 1
-	if test "$BLUETOOTH_ENABLED" == "0"; then
+	if test "$BLUETOOTH_ENABLED" = "0"; then
 		log_progress_msg "disabled. see /etc/default/bluetooth"
 		log_end_msg 0
 		exit 0

Modified: bluez-utils/trunk/debian/bluez-utils.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/bluez-utils.preinst?rev=485&op=diff
==============================================================================
--- bluez-utils/trunk/debian/bluez-utils.preinst (original)
+++ bluez-utils/trunk/debian/bluez-utils.preinst Thu Jul 12 12:09:20 2007
@@ -4,26 +4,26 @@
 
 # Prepare to move a conffile without triggering a dpkg question
 prep_mv_conffile() {
-    CONFFILE="$1"
+	CONFFILE="$1"
 
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
-        if [ "$md5sum" = "$old_md5sum" ]; then
-            rm -f "$CONFFILE"
-        fi
-    fi
+	if [ -e "$CONFFILE" ]; then
+		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+		old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+		if [ "$md5sum" = "$old_md5sum" ]; then
+			rm -f "$CONFFILE"
+		fi
+	fi
 }
 
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" le "2.19-1"; then
-        prep_mv_conffile "/etc/init.d/bluez-utils"
-        prep_mv_conffile "/etc/default/bluez-utils"
-    fi
+	if dpkg --compare-versions "$2" le "2.19-1"; then
+		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"
+		prep_mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf"
 	fi
 esac
         

Modified: bluez-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/bluez-utils/trunk/debian/changelog?rev=485&op=diff
==============================================================================
--- bluez-utils/trunk/debian/changelog (original)
+++ bluez-utils/trunk/debian/changelog Thu Jul 12 12:09:20 2007
@@ -21,8 +21,10 @@
   * 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
+  * fix NEWS.Debian capital lettering (Closes: #416158)
+  * Removed bashisms from etc/init.d/bluetooth, shell is back to bin/sh
+
+ -- Filippo Giunchedi <filippo at debian.org>  Thu, 12 Jul 2007 12:52:33 +0200
 
 bluez-utils (3.7-1) unstable; urgency=low
 




More information about the Pkg-bluetooth-commits mailing list