[maemo-commits] [maemo-commits] r15923 - projects/connectivity/bluez-debian/trunk

Mon Sep 1 10:25:11 EEST 2008

Author: jh
Date: 2008-09-01 10:25:09 +0300 (Mon, 01 Sep 2008)
New Revision: 15923

Added:
   projects/connectivity/bluez-debian/trunk/bluez-test.dirs
   projects/connectivity/bluez-debian/trunk/bluez-test.install
   projects/connectivity/bluez-debian/trunk/bluez.bluetooth.default
   projects/connectivity/bluez-debian/trunk/bluez.bluetooth.init
   projects/connectivity/bluez-debian/trunk/bluez.dirs
   projects/connectivity/bluez-debian/trunk/bluez.install
Removed:
   projects/connectivity/bluez-debian/trunk/bluez-utils-test.dirs
   projects/connectivity/bluez-debian/trunk/bluez-utils-test.install
   projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.default
   projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.init
   projects/connectivity/bluez-debian/trunk/bluez-utils.dirs
   projects/connectivity/bluez-debian/trunk/bluez-utils.install
Modified:
   projects/connectivity/bluez-debian/trunk/control
   projects/connectivity/bluez-debian/trunk/rules
Log:
Rename bluez-utils binary package to bluez

Copied: projects/connectivity/bluez-debian/trunk/bluez-test.dirs (from rev 15922, projects/connectivity/bluez-debian/trunk/bluez-utils-test.dirs)

Copied: projects/connectivity/bluez-debian/trunk/bluez-test.install (from rev 15922, projects/connectivity/bluez-debian/trunk/bluez-utils-test.install)

Deleted: projects/connectivity/bluez-debian/trunk/bluez-utils-test.dirs
===================================================================

--- projects/connectivity/bluez-debian/trunk/bluez-utils-test.dirs	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/bluez-utils-test.dirs	2008-09-01 07:25:09 UTC (rev 15923)
@@ -1,2 +0,0 @@
-usr/bin
-etc/bluetooth

Deleted: projects/connectivity/bluez-debian/trunk/bluez-utils-test.install
===================================================================
--- projects/connectivity/bluez-debian/trunk/bluez-utils-test.install	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/bluez-utils-test.install	2008-09-01 07:25:09 UTC (rev 15923)
@@ -1,13 +0,0 @@
-debian/tmp/usr/bin/bluez-*
-debian/tmp/usr/sbin/bccmd
-debian/tmp/usr/bin/l2ping
-debian/tmp/usr/bin/ciptool
-debian/tmp/usr/bin/dund
-debian/tmp/usr/bin/hidd
-debian/tmp/usr/bin/pand
-debian/tmp/usr/bin/hcitool
-debian/tmp/usr/bin/sdptool
-debian/tmp/usr/bin/rfcomm
-debian/tmp/usr/sbin/hciconfig
-debian/tmp/usr/sbin/hciattach
-debian/tmp/etc/bluetooth/rfcomm.conf

Deleted: projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.default
===================================================================
--- projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.default	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.default	2008-09-01 07:25:09 UTC (rev 15923)
@@ -1,5 +0,0 @@
-if test -x /usr/sbin/dsmetool; then
-	USE_DSMETOOL="yes"
-else
-	USE_DSMETOOL="no"
-fi

Deleted: projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.init
===================================================================
--- projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.init	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.init	2008-09-01 07:25:09 UTC (rev 15923)
@@ -1,65 +0,0 @@
-#! /bin/sh
-#
-# bluetooth    Bluetooth subsystem starting and stopping
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Bluetooth daemon"
-
-DAEMON=/usr/sbin/bluetoothd
-DAEMON_NAME=bluetoothd
-DAEMON_OPTIONS="-d"
-
-test -f /etc/default/bluetooth && . /etc/default/bluetooth
-
-# test for essential daemons
-test -x $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC:"
-	if [ "$USE_DSMETOOL" = "yes" ]; then
-	        dsmetool -n -1 -t "$DAEMON -n $DAEMON_OPTIONS" || true
-	        echo -n " $DAEMON_NAME"
-	else
-	        start-stop-daemon --start --quiet --exec "$DAEMON $DAEMON_OPTIONS" || true
-	        echo -n " $DAEMON_NAME"
-	fi
-	echo "."
-	;;
-  stop)
-	echo -n "Stopping $DESC:"
-	if [ "$USE_DSMETOOL" = "yes" ]; then
-		dsmetool -k "$DAEMON -n $DAEMON_OPTIONS" || true
-		echo -n " $DAEMON_NAME"
-	else
-		start-stop-daemon --stop --quiet --exec "$DAEMON $DAEMON_OPTIONS" || true
-		echo -n " $DAEMON_NAME"
-	fi
-	echo "."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC:"
-	if [ "$USE_DSMETOOL" = "yes" ]; then
-		dsmetool -k "$DAEMON -n $DAEMON_OPTIONS" || true
-		sleep 1
-		dsmetool -n -1 -t "$DAEMON -n $DAEMON_OPTIONS" || true
-	else
-		start-stop-daemon --stop --quiet --exec "$DAEMON $DAEMON_OPTIONS" || true
-		sleep 1
-		start-stop-daemon --start --quiet --exec "$DAEMON $DAEMON_OPTIONS" || true
-	fi
-	echo -n " $DAEMON_NAME"
-	echo "."
-	;;
-  *)
-	N=/etc/init.d/bluetooth
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

Deleted: projects/connectivity/bluez-debian/trunk/bluez-utils.dirs
===================================================================
--- projects/connectivity/bluez-debian/trunk/bluez-utils.dirs	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/bluez-utils.dirs	2008-09-01 07:25:09 UTC (rev 15923)
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/bluetooth/plugins
-usr/lib/alsa-lib
-usr/lib/gstreamer-0.10
-etc/bluetooth

Deleted: projects/connectivity/bluez-debian/trunk/bluez-utils.install
===================================================================
--- projects/connectivity/bluez-debian/trunk/bluez-utils.install	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/bluez-utils.install	2008-09-01 07:25:09 UTC (rev 15923)
@@ -1,7 +0,0 @@
-debian/tmp/etc/bluetooth/audio.conf
-debian/tmp/etc/bluetooth/main.conf
-debian/tmp/etc/dbus-1/system.d/*
-debian/tmp/usr/sbin/bluetoothd
-debian/tmp/usr/lib/bluetooth/plugins/*.so
-debian/tmp/usr/lib/alsa-lib/*.so
-debian/tmp/usr/lib/gstreamer-0.10/*.so

Copied: projects/connectivity/bluez-debian/trunk/bluez.bluetooth.default (from rev 15922, projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.default)

Copied: projects/connectivity/bluez-debian/trunk/bluez.bluetooth.init (from rev 15922, projects/connectivity/bluez-debian/trunk/bluez-utils.bluetooth.init)

Copied: projects/connectivity/bluez-debian/trunk/bluez.dirs (from rev 15922, projects/connectivity/bluez-debian/trunk/bluez-utils.dirs)

Copied: projects/connectivity/bluez-debian/trunk/bluez.install (from rev 15922, projects/connectivity/bluez-debian/trunk/bluez-utils.install)

Modified: projects/connectivity/bluez-debian/trunk/control
===================================================================
--- projects/connectivity/bluez-debian/trunk/control	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/control	2008-09-01 07:25:09 UTC (rev 15923)
@@ -5,10 +5,13 @@
 Build-Depends: debhelper (>= 5.0), autotools-dev, cdbs, libdbus-1-dev, libglib2.0-dev, libasound2-dev, libgstreamer-plugins-base0.10-dev
 Standards-Version: 3.7.2
 
-Package: bluez-utils
+Package: bluez
 Architecture: any
 Depends: ${shlibs:Depends}, dbus
 Recommends: dsme, osso-product-info
+Provides: bluez-utils
+Replaces: bluez-utils
+Conflicts: bluez-utils
 Description: Bluetooth tools and daemons
  This package contains tools and system daemons for using Bluetooth devices.
  .
@@ -17,19 +20,25 @@
  .
  More information is available at http://bluez.sourceforge.net/
 
-Package: bluez-utils-test
+Package: bluez-test
 Architecture: any
 Priority: extra
-Depends: bluez-utils (= ${Source-Version}), python, python2.5-gobject, python2.5-dbus
+Depends: bluez (= ${Source-Version}), python, python2.5-gobject, python2.5-dbus
+Provides: bluez-utils-test
+Replaces: bluez-utils-test
+Conflicts: bluez-utils-test
 Description: testing tools for bluez
  This package contains several test tools for testing the BlueZ stack
 
-Package: bluez-utils-dbg
+Package: bluez-dbg
 Section: libdevel
 Architecture: any
-Depends: bluez-utils (= ${Source-Version})
-Description: Debug symbols for bluez-utils
- This package contains debug symbols for the bluez-utils package.
+Depends: bluez (= ${Source-Version})
+Provides: bluez-utils-dbg
+Replaces: bluez-utils-dbg
+Conflicts: bluez-utils-dbg
+Description: Debug symbols for bluez
+ This package contains debug symbols for the bluez package.
 
 Package: libbluetooth3-dev
 Section: libdevel

Modified: projects/connectivity/bluez-debian/trunk/rules
===================================================================
--- projects/connectivity/bluez-debian/trunk/rules	2008-09-01 06:44:53 UTC (rev 15922)
+++ projects/connectivity/bluez-debian/trunk/rules	2008-09-01 07:25:09 UTC (rev 15923)
@@ -8,7 +8,7 @@
 
 DEB_SHLIBDEPS_INCLUDE_libbluetooth3 = debian/libbluetooth3/usr/lib
 
-DEB_UPDATE_RCD_PARAMS_bluez-utils = "start 56 2 3 4 . stop 74 0 1 5 6 ."
+DEB_UPDATE_RCD_PARAMS_bluez = "start 56 2 3 4 . stop 74 0 1 5 6 ."
 
 DEB_DH_INSTALLINIT_ARGS = --name=bluetooth
 
@@ -19,10 +19,10 @@
 				--disable-manpages --disable-pcmcia-rules \
 				--disable-usb --disable-hid2hci --disable-cups
 
-install/bluez-utils::
+install/bluez::
 	install -D -m 0644 audio/audio.conf $(DEB_DESTDIR)/etc/bluetooth/audio.conf
 
-install/bluez-utils-test::
+install/bluez-test::
 	install -D -m 0755 src/simple-agent $(DEB_DESTDIR)/usr/bin/bluez-simple-agent
 	install -D -m 0755 src/test-adapter $(DEB_DESTDIR)/usr/bin/bluez-test-adapter
 	install -D -m 0755 src/test-device $(DEB_DESTDIR)/usr/bin/bluez-test-device


