[Pkg-bluetooth-commits] r852 - in /packages/bluez/trunk/debian: bluez-compat.dirs bluez-compat.install bluez.examples bluez.install rules

[filippo at users.alioth.debian.org]

Author: filippo
Date: Wed Jun 24 13:34:27 2009
New Revision: 852

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=852
Log:
install everything in bluez and move compat daemons into bluez-compat

Added:
    packages/bluez/trunk/debian/bluez-compat.dirs
Modified:
    packages/bluez/trunk/debian/bluez-compat.install
    packages/bluez/trunk/debian/bluez.examples
    packages/bluez/trunk/debian/bluez.install
    packages/bluez/trunk/debian/rules

Added: packages/bluez/trunk/debian/bluez-compat.dirs
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-compat.dirs?rev=852&op=file
==============================================================================
--- packages/bluez/trunk/debian/bluez-compat.dirs (added)
+++ packages/bluez/trunk/debian/bluez-compat.dirs Wed Jun 24 13:34:27 2009
@@ -1,0 +1,2 @@
+usr/bin
+usr/share/man/man1

Modified: packages/bluez/trunk/debian/bluez-compat.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-compat.install?rev=852&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-compat.install (original)
+++ packages/bluez/trunk/debian/bluez-compat.install Wed Jun 24 13:34:27 2009
@@ -1,6 +1,0 @@
-debian/tmp/usr/bin/hidd
-debian/tmp/usr/bin/pand
-debian/tmp/usr/bin/dund
-debian/tmp/usr/share/man/man1/hidd*
-debian/tmp/usr/share/man/man1/pand*
-debian/tmp/usr/share/man/man1/dund*

Modified: packages/bluez/trunk/debian/bluez.examples
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.examples?rev=852&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.examples (original)
+++ packages/bluez/trunk/debian/bluez.examples Wed Jun 24 13:34:27 2009
@@ -1,4 +1,5 @@
 test/simple-agent
+test/simple-service
 test/list-devices
 test/monitor-bluetooth
 test/test-*

Modified: packages/bluez/trunk/debian/bluez.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.install?rev=852&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.install (original)
+++ packages/bluez/trunk/debian/bluez.install Wed Jun 24 13:34:27 2009
@@ -1,17 +1,7 @@
 debian/tmp/etc/bluetooth/main.conf
 debian/tmp/etc/bluetooth/rfcomm.conf
 debian/tmp/etc/dbus*/*
-debian/tmp/usr/bin/hcitool
-debian/tmp/usr/bin/rfcomm
-debian/tmp/usr/bin/dfutool
-debian/tmp/usr/bin/l2ping
-debian/tmp/usr/bin/sdptool
-debian/tmp/usr/bin/ciptool
 debian/tmp/usr/sbin/*
-debian/tmp/usr/share/man/man1/dfutool*
-debian/tmp/usr/share/man/man1/ciptool*
-debian/tmp/usr/share/man/man1/hcitool*
-debian/tmp/usr/share/man/man1/sdptool*
-debian/tmp/usr/share/man/man1/rfcomm*
-debian/tmp/usr/share/man/man8/*
+debian/tmp/usr/bin/*
+debian/tmp/usr/share/man/man*
 debian/tmp/usr/lib/bluetooth/plugins/*.so

Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=852&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Wed Jun 24 13:34:27 2009
@@ -39,7 +39,7 @@
 	
 	# udev rules, actually upstream version is changed with
 	# sed -i 's at RUN+="/usr/sbin/hid2hci at RUN+="/lib/udev/bluez@' scripts/bluetooth-hid2hci.rules
-	# and the diff is in debian/patches/
+	# and the diff is in debian/patches/010_udev_rules_agent.patch
 	install -D -m 0644 $(CURDIR)/scripts/bluetooth-hid2hci.rules $(CURDIR)/debian/bluez/lib/udev/rules.d/62-bluez-hid2hci.rules
 	install -D -m 0755 $(CURDIR)/debian/bluez_agent.udev $(CURDIR)/debian/bluez/lib/udev/bluez
 
@@ -57,6 +57,12 @@
 install/bluez-pcmcia-support::
 	cp -f $(CURDIR)/scripts/bluetooth-serial.rules $(CURDIR)/debian/bluez-pcmcia-support.udev
 
+binary-install/bluez-compat::
+	for d in pand dund hidd; do \
+		mv -v $(CURDIR)/debian/bluez/usr/bin/$$d $(CURDIR)/debian/bluez-compat/usr/bin/;\
+		mv -v $(CURDIR)/debian/bluez/usr/share/man/man1/$$d* $(CURDIR)/debian/bluez-compat/usr/share/man/man1/;\
+	done
+
 binary-install/bluez-gstreamer::
 	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" dh_gstscancodecs -pbluez-gstreamer