[Pkg-bluetooth-commits] r660 - in /packages/bluez-utils/trunk/debian: bluez-utils.bluetooth.init bluez-utils.install bluez-utils.postinst

[filippo at users.alioth.debian.org]

Author: filippo
Date: Wed Jan 16 17:20:01 2008
New Revision: 660

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=660
Log:
remove some old cruft

Modified:
    packages/bluez-utils/trunk/debian/bluez-utils.bluetooth.init
    packages/bluez-utils/trunk/debian/bluez-utils.install
    packages/bluez-utils/trunk/debian/bluez-utils.postinst

Modified: packages/bluez-utils/trunk/debian/bluez-utils.bluetooth.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.bluetooth.init?rev=660&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.bluetooth.init (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.bluetooth.init Wed Jan 16 17:20:01 2008
@@ -56,29 +56,8 @@
 
 . /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
 
@@ -109,7 +88,7 @@
                log_progress_msg "hid_devices"
                $HID2HCI --tohci
        else
-               $HID2HCI --tohci >/dev/null 2>&1
+               $HID2HCI --tohci > /dev/null 2>&1
        fi
 }
 
@@ -119,51 +98,8 @@
                log_progress_msg "hid_devices"
                $HID2HCI --tohid
        else
-               $HID2HCI --tohid >/dev/null 2>&1
+               $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 "pand"
-
-	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 "pand"
-	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()
@@ -240,12 +176,9 @@
 
 	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 +188,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
@@ -268,8 +199,6 @@
     ;;
   restart|force-reload)
 	log_daemon_msg "Restarting $DESC"
-	stop_hid || true
-	stop_pan || true
 	start-stop-daemon --stop --quiet --exec $HCID || true
 	sleep 1
 	if test "$BLUETOOTH_ENABLED" = "0"; then
@@ -279,8 +208,6 @@
 	fi
 	start-stop-daemon --start --quiet --exec $HCID -- $HCID_OPTIONS || true
 	log_progress_msg "hcid"
-	start_pan || true
-	start_hid || true
 	restart_rfcomm
 	log_end_msg 0
     ;;

Modified: packages/bluez-utils/trunk/debian/bluez-utils.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.install?rev=660&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.install (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.install Wed Jan 16 17:20:01 2008
@@ -12,3 +12,4 @@
 debian/tmp/etc/bluetooth/network.service
 debian/tmp/usr/lib/bluetooth/bluetoothd-service-serial
 debian/tmp/etc/bluetooth/serial.service
+*/*-api.txt

Modified: packages/bluez-utils/trunk/debian/bluez-utils.postinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.postinst?rev=660&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.postinst (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.postinst Wed Jan 16 17:20:01 2008
@@ -15,12 +15,6 @@
 set -e
 case "$1" in
     configure)
-        # remove bluez-sdpd init, if present
-		if [ -f /etc/init.d/bluez-sdp ]; then
-			/usr/sbin/update-rc.d -f bluez-sdp remove
-			echo "To stop seeing this, remove the now redundant /etc/init.d/bluez-sdp script."
-		fi
-
         if [ -e /etc/init.d/bluez-utils ]; then
             /usr/sbin/update-rc.d -f bluez-utils remove
             # maybe a (medium/low debconf?) notice is best suited here