[Pkg-bluetooth-commits] r1435 - in /packages/bluez/trunk/debian: bluez.bluetooth.init changelog

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue Jul 22 06:00:10 2014
New Revision: 1435

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1435
Log:
Update bluez.bluetooth.init. (Closes: #754830)

Remove -f option of rfcomm.


Modified:
    packages/bluez/trunk/debian/bluez.bluetooth.init
    packages/bluez/trunk/debian/changelog

Modified: packages/bluez/trunk/debian/bluez.bluetooth.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.bluetooth.init?rev=1435&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.bluetooth.init	(original)
+++ packages/bluez/trunk/debian/bluez.bluetooth.init	Tue Jul 22 06:00:10 2014
@@ -34,7 +34,6 @@
 
 RFCOMM_NAME=rfcomm
 RFCOMM=/usr/bin/$RFCOMM_NAME
-RFCOMM_CONF=/etc/bluetooth/$RFCOMM_NAME.conf
 SDPTOOL=/usr/bin/sdptool
 
 # If you want to be ignore error of "org.freedesktop.hostname1",
@@ -103,14 +102,14 @@
 
 start_rfcomm()
 {
-	if [ -x $RFCOMM ] && [ -f $RFCOMM_CONF ] ; then
+	if [ -x $RFCOMM ] ; 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 || :
+		       $RFCOMM bind all || :
                 else
-		       $RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || :
+		       $RFCOMM bind all >/dev/null 2>&1 || :
                 fi
 	fi
 }
@@ -133,10 +132,10 @@
                if [ "$VERBOSE" != no ]; then
 		       log_progress_msg  "${RFCOMM##*/}"
 		       $RFCOMM unbind all || :
-		       $RFCOMM -f $RFCOMM_CONF bind all || :
+		       $RFCOMM bind all || :
                else
 		       $RFCOMM unbind all >/dev/null 2>&1|| :
-		       $RFCOMM -f $RFCOMM_CONF bind all >/dev/null 2>&1 || :
+		       $RFCOMM bind all >/dev/null 2>&1 || :
                fi
 	fi
 }

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=1435&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog	(original)
+++ packages/bluez/trunk/debian/changelog	Tue Jul 22 06:00:10 2014
@@ -5,6 +5,8 @@
   * Add support user session of obexd. (Closes: #754675)
     Add patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
     and patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch.
+  * Update bluez.bluetooth.init. (Closes: #754830)
+    Remove -f option of rfcomm.
 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Tue, 22 Jul 2014 09:25:12 +0900