[Pkg-bluetooth-commits] r1277 - in /packages/bluez/trunk/debian: bluez.install bluez.links control rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Mon May 20 05:12:16 2013
New Revision: 1277

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1277
Log:
Convert from CDBS to dh

Modified:
    packages/bluez/trunk/debian/bluez.install
    packages/bluez/trunk/debian/bluez.links
    packages/bluez/trunk/debian/control
    packages/bluez/trunk/debian/rules

Modified: packages/bluez/trunk/debian/bluez.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.install?rev=1277&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.install (original)
+++ packages/bluez/trunk/debian/bluez.install Mon May 20 05:12:16 2013
@@ -3,14 +3,14 @@
 profiles/audio/audio.conf etc/bluetooth
 profiles/network/network.conf etc/bluetooth
 profiles/proximity/proximity.conf etc/bluetooth
-usr/lib/bluez
+# usr/lib/*/bluez
+usr/lib/*/bluetooth/bluetoothd usr/lib/bluetooth
 usr/bin/bluetoothctl
 usr/bin/bccmd
 usr/bin/btmon
 usr/bin/rctest
 usr/bin/hciattach
 usr/bin/hciconfig
-usr/bin/hcidump
 usr/bin/hcitool
 usr/bin/sdptool
 usr/bin/ciptool
@@ -19,6 +19,7 @@
 usr/bin/rfcomm
 lib/udev/hid2hci
 lib/udev/rules.d/97-hid2hci.rules
+#-- for systemd
 # lib/systemd 
 # usr/lib/systemd
 # usr/share/dbus-1
@@ -26,7 +27,6 @@
 usr/share/man/man1/bccmd.1
 usr/share/man/man1/hciattach.1
 usr/share/man/man1/hciconfig.1
-usr/share/man/man1/hcidump.1
 usr/share/man/man1/hcitool.1
 usr/share/man/man1/ciptool.1
 usr/share/man/man1/rfcomm.1

Modified: packages/bluez/trunk/debian/bluez.links
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.links?rev=1277&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.links (original)
+++ packages/bluez/trunk/debian/bluez.links Mon May 20 05:12:16 2013
@@ -1,1 +1,1 @@
-usr/lib/bluez/bluetooth/bluetoothd usr/sbin/bluetoothd
+usr/lib/bluetooth/bluetoothd usr/sbin/bluetoothd

Modified: packages/bluez/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/control?rev=1277&op=diff
==============================================================================
--- packages/bluez/trunk/debian/control (original)
+++ packages/bluez/trunk/debian/control Mon May 20 05:12:16 2013
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
 Uploaders: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Build-Depends: debhelper (>= 9), cdbs (>= 0.4.97), quilt,
+Build-Depends: debhelper (>= 9), quilt,
                autotools-dev,
                flex,
                bison,

Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=1277&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Mon May 20 05:12:16 2013
@@ -1,18 +1,12 @@
 #!/usr/bin/make -f
-# build rules for bluez
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-LDFLAGS += -Wl,--as-needed
-
-DEB_UPDATE_RCD_PARAMS = "start 25 2 3 4 5 . stop 74 0 1 6 ."
-DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
-DEB_CONFIGURE_EXTRA_FLAGS := \
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+CONFIGURE_FLAGS := \
+	--disable-silent-rules \
 	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-static \
-	--enable-pie \
 	--enable-usb \
 	--enable-tools \
 	--enable-cups \
@@ -23,20 +17,17 @@
 	--enable-udev \
 	--enable-obex \
 	--enable-client \
+	--enable-experimental \
 	--disable-systemd 
 
-#	--enable-systemd 
+%:
+	dh $@
 
-DEB_DESTDIR := $(CURDIR)/debian/tmp
-# for debug pakcages
-DEB_DBG_PACKAGES = bluez-dbg libbluetooth3-dbg
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_FLAGS)
 
-install/bluez::
-	install -D -m 0755 $(CURDIR)/debian/bluez_agent.udev \
-		$(CURDIR)/debian/bluez/lib/udev/bluez
+override_dh_installinit:
+	dh_installinit --name=bluetooth -- start 25 2 3 4 5 . stop 74 0 1 6 .
 
-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 0755 $(CURDIR)/debian/bluez-udev \
-		$(CURDIR)/debian/bluez/lib/udev/bluez-udev
+override_dh_strip:
+	dh_strip -a --dbg-package=bluez-dbg libbluetooth3-dbg