[Pkg-bluetooth-commits] r967 - in /packages/bluez/trunk/debian: changelog rules

iwamatsu at users.alioth.debian.org iwamatsu at users.alioth.debian.org
Thu Sep 9 07:17:59 UTC 2010


Author: iwamatsu
Date: Thu Sep  9 07:17:55 2010
New Revision: 967

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=967
Log:
Update debian/rules and debian/changelog

Modified:
    packages/bluez/trunk/debian/changelog
    packages/bluez/trunk/debian/rules

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=967&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Thu Sep  9 07:17:55 2010
@@ -1,8 +1,13 @@
-bluez (4.69-2) unstable; urgency=low
-
+bluez (4.70-1) unstable; urgency=low
+
+  * New upstream release.
   * Update debian/bluez.bluetooth.init (Closes: #593172).
   * Update debian/bluez.preinst (Closes: #592982, #568301).
-
+  * Update debian/control.
+    - python-gobject and python-dbus move from Suggests to Depends.
+  * Replase bluetooth-agent to bluez-simple-agent.
+  * Some test program move to usr/bin.
+ 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Fri, 03 Sep 2010 08:43:02 +0900
 
 bluez (4.69-1) unstable; urgency=low

Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=967&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Thu Sep  9 07:17:55 2010
@@ -31,46 +31,72 @@
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
+TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \
+               test-discovery test-input test-manager test-network test-serial \
+               test-service test-telephony 
+
 #install/bluetooth::
-	#install -D -m 0644 $(CURDIR)/debian/bluetooth.override $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
+	#install -D -m 0644 $(CURDIR)/debian/bluetooth.override \
+		$(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
 
 install/bluez::
 	# conf files
-	install -D -m 0644 $(CURDIR)/input/input.conf $(CURDIR)/debian/bluez/etc/bluetooth/input.conf
-	install -D -m 0644 $(CURDIR)/audio/audio.conf $(CURDIR)/debian/bluez/etc/bluetooth/audio.conf
-	install -D -m 0644 $(CURDIR)/network/network.conf $(CURDIR)/debian/bluez/etc/bluetooth/network.conf
-	install -D -m 0644 $(CURDIR)/serial/serial.conf $(CURDIR)/debian/bluez/etc/bluetooth/serial.conf
+	install -D -m 0644 $(CURDIR)/input/input.conf \
+		$(CURDIR)/debian/bluez/etc/bluetooth/input.conf
+	install -D -m 0644 $(CURDIR)/audio/audio.conf \
+		$(CURDIR)/debian/bluez/etc/bluetooth/audio.conf
+	install -D -m 0644 $(CURDIR)/network/network.conf \
+		$(CURDIR)/debian/bluez/etc/bluetooth/network.conf
+	install -D -m 0644 $(CURDIR)/serial/serial.conf \
+		$(CURDIR)/debian/bluez/etc/bluetooth/serial.conf
 	
 	# 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
+	# sed -i 's at RUN+="/usr/sbin/hid2hci at RUN+="/lib/udev/bluez@'
+	#	scripts/bluetooth-hid2hci.rules
 	# 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
+	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
 
 	# misc
-	install -D -m 0755 $(CURDIR)/test/agent $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
-	install -D -m 0644 $(CURDIR)/debian/README.examples $(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
+	# install -D -m 0755 $(CURDIR)/test/agent \
+	# 	$(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
+	for d in $(TEST_PROGRAM_LIST) ; do \
+		install -D -m 0755 $(CURDIR)/test/$$d \
+			$(CURDIR)/debian/bluez/usr/bin/bluez-$$d ; \
+	done
+
+	install -D -m 0644 $(CURDIR)/debian/README.examples \
+		$(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
 
 #install/bluez-utils::
-	#install -D -m 0644 $(CURDIR)/debian/bluez-utils.override $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils
+	#install -D -m 0644 $(CURDIR)/debian/bluez-utils.override \
+	#	$(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils
 
 install/bluez-alsa::
-	install -D -m 0644 $(CURDIR)/audio/bluetooth.conf $(CURDIR)/debian/bluez-alsa/usr/share/alsa/bluetooth.conf
+	install -D -m 0644 $(CURDIR)/audio/bluetooth.conf \
+		$(CURDIR)/debian/bluez-alsa/usr/share/alsa/bluetooth.conf
 
 install/bluez-pcmcia-support::
-	cp -f $(CURDIR)/scripts/bluetooth-serial.rules $(CURDIR)/debian/bluez-pcmcia-support.udev
+	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/;\
+		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
+	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
+		dh_gstscancodecs -pbluez-gstreamer
 
 binary-install/bluez::
-	install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf $(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
+	install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \
+		 $(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
 
 binary-install/bluez-pcmcia-support::
 	chmod a+x $(CURDIR)/debian/bluez-pcmcia-support/lib/udev/bluetooth_serial




More information about the Pkg-bluetooth-commits mailing list