Merge lp:~bluetooth/bluez/add-citrain-support into lp:~bluetooth/bluez/vivid-phone-overlay

[Simon Fels]

This converts our packaging infrastructure to be ready for citrain builds. The following changes are needed:

* convert from cdbs to debhelper
* switch to split mode for bzr-buildpackage

[lp:~bluetooth/bluez/add-citrain-support]

3. By Simon Fels on 2015-09-14

Switch to split mode for bzr-builddeb

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me.

review: Approve

=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	2015-09-11 09:01:46 +0000
+++ .bzr-builddeb/default.conf	2015-09-14 10:06:47 +0000
@@ -1,2 +1,2 @@
 [BUILDDEB]
-merge = True
+split = True

=== modified file 'debian/bluez.install'
--- debian/bluez.install	2015-09-11 09:01:46 +0000
+++ debian/bluez.install	2015-09-14 10:06:47 +0000
@@ -34,3 +34,5 @@
 usr/share/man/man8/hciconfig.8
 usr/share/man/man8/bccmd.8
 debian/source_bluez.py usr/share/apport/package-hooks
+debian/bluetooth-dbus.conf etc/dbus-1/system.d
+usr/share/dbus-1/system-services/org.bluez.service

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-11 09:01:46 +0000
+++ debian/changelog	2015-09-14 10:06:47 +0000
@@ -1,3 +1,11 @@
+bluez (4.101-0ubuntu25.1~overlay5) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - Migrate from cdbs to debhelper to make it possible to build our
+      packages with the Ubuntu citrain infrastructure.
+
+ -- Simon Fels <[e-mail]>  Mon, 14 Sep 2015 11:18:54 +0200
+
 bluez (4.101-0ubuntu25.1~overlay4) vivid; urgency=medium
 
   * debian/patches/force-adapter-class.patch:

=== modified file 'debian/rules'
--- debian/rules	2015-09-11 09:01:46 +0000
+++ debian/rules	2015-09-14 10:06:47 +0000
@@ -1,59 +1,54 @@
 #!/usr/bin/make -f
-# build rules for bluez
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-LDFLAGS += -Wl,--as-needed
-
-DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
-
-# Workaround a bug in cdbs, which doesn't run dh_install and dh_systemd
-# in the correct order, by pointing dh_systemd_enable and dh_systemd_start
-# at the uninstalled service file.
-# Once the bug #715504 in cdbs has been fixed, this workaround should be
-# removed again.
-DEB_DH_SYSTEMD_ENABLE_ARGS_bluez = src/bluetooth.service
-DEB_DH_SYSTEMD_START_ARGS_bluez = src/bluetooth.service
-
-DEB_CONFIGURE_EXTRA_FLAGS := LDFLAGS=-Wl,--as-needed \
-                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-                             --enable-static \
-                             --disable-hal \
-                             --enable-sap \
-                             --enable-health \
-                             --enable-gstreamer \
-                             --enable-alsa \
-                             --enable-usb \
-                             --enable-tools \
-                             --enable-bccmd \
-                             --enable-pcmcia \
-                             --enable-hid2hci \
-                             --enable-dfutool \
-                             --enable-hidd \
-                             --enable-pand \
-                             --enable-dund \
-                             --enable-cups \
-                             --enable-test \
-                             --enable-datafiles \
-                             --enable-debug \
-                             --enable-dbusoob \
-                             --enable-wiimote \
-                             --enable-gatt \
-                             --with-telephony=ofono \
-                             --with-systemdunitdir=/lib/systemd/system
-
-DEB_DESTDIR := $(CURDIR)/debian/tmp
-# for debug pakcages
-DEB_DBG_PACKAGES = bluez-dbg libbluetooth3-dbg
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CONFIGURE_FLAGS := \
+	--disable-silent-rules \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+	--libexec=\$${prefix}/lib/ \
+	--enable-static \
+	--disable-hal \
+	--enable-sap \
+	--enable-health \
+	--enable-gstreamer \
+	--enable-alsa \
+	--enable-usb \
+	--enable-tools \
+	--enable-bccmd \
+	--enable-pcmcia \
+	--enable-hid2hci \
+	--enable-dfutool \
+	--enable-hidd \
+	--enable-pand \
+	--enable-dund \
+	--enable-cups \
+	--enable-test \
+	--enable-datafiles \
+	--enable-debug \
+	--enable-dbusoob \
+	--enable-wiimote \
+	--enable-gatt \
+	--with-telephony=ofono \
+	--with-systemdunitdir=/lib/systemd/system
+
+%:
+	dh $@ --with autoreconf,systemd
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_FLAGS)
+
+override_dh_installinit:
+	dh_installinit -pbluez --name=bluetooth --restart-after-upgrade
 
 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 list-devices
 
-install/bluez::
+override_dh_install:
+	dh_install --list-missing
+	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
+		dh_gstscancodecs -pbluez-gstreamer
+
 	install -D -m 0755 $(CURDIR)/test/agent \
 		$(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
 	for d in $(TEST_PROGRAM_LIST) ; do \
@@ -64,16 +59,12 @@
 	install -D -m 0644 $(CURDIR)/debian/README.examples \
 		$(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
 
-binary-install/bluez-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
-
-common-install-arch::
-	dh_python3
-
-clean::
-	-rm -f $(CURDIR)/debian/bluez-pcmcia-support.udev
+
+override_dh_strip:
+	dh_strip -a --dbg-package=bluez-dbg libbluetooth3-dbg
+
+override_dh_systemd_enable:
+	dh_systemd_enable -pbluez bluetooth.service
+
+override_dh_systemd_start:
+	dh_systemd_start -pbluez --restart-after-upgrade bluetooth.service