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

Proposed by Simon Fels on 2015-09-14
Status: Merged
Approved by: Sebastien Bacher on 2015-09-14
Approved revision: 3
Merged at revision: 2
Proposed branch: lp:~bluetooth/bluez/add-citrain-support
Merge into: lp:~bluetooth/bluez/vivid-phone-overlay
Diff against target: 168 lines (+65/-64)
4 files modified
.bzr-builddeb/default.conf (+1/-1)
debian/bluez.install (+2/-0)
debian/changelog (+8/-0)
debian/rules (+54/-63)
To merge this branch: bzr merge lp:~bluetooth/bluez/add-citrain-support
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-09-14 Approve on 2015-09-14
Review via email: mp+270940@code.launchpad.net

Description of the change

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

To post a comment you must log in.
3. By Simon Fels on 2015-09-14

Switch to split mode for bzr-builddeb

Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1[BUILDDEB]1[BUILDDEB]
2merge = True2split = True
33
=== 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 @@
34usr/share/man/man8/hciconfig.834usr/share/man/man8/hciconfig.8
35usr/share/man/man8/bccmd.835usr/share/man/man8/bccmd.8
36debian/source_bluez.py usr/share/apport/package-hooks36debian/source_bluez.py usr/share/apport/package-hooks
37debian/bluetooth-dbus.conf etc/dbus-1/system.d
38usr/share/dbus-1/system-services/org.bluez.service
3739
=== 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 @@
1bluez (4.101-0ubuntu25.1~overlay5) UNRELEASED; urgency=medium
2
3 * debian/rules:
4 - Migrate from cdbs to debhelper to make it possible to build our
5 packages with the Ubuntu citrain infrastructure.
6
7 -- Simon Fels <simon.fels@canonical.com> Mon, 14 Sep 2015 11:18:54 +0200
8
1bluez (4.101-0ubuntu25.1~overlay4) vivid; urgency=medium9bluez (4.101-0ubuntu25.1~overlay4) vivid; urgency=medium
210
3 * debian/patches/force-adapter-class.patch:11 * debian/patches/force-adapter-class.patch:
412
=== 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 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# build rules for bluez2# Uncomment this to turn on verbose mode.
33#export DH_VERBOSE=1
4include /usr/share/cdbs/1/rules/debhelper.mk4
5include /usr/share/cdbs/1/rules/autoreconf.mk5CONFIGURE_FLAGS := \
6include /usr/share/cdbs/1/class/autotools.mk6 --disable-silent-rules \
7include /usr/share/cdbs/1/rules/patchsys-quilt.mk7 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
88 --libexec=\$${prefix}/lib/ \
9LDFLAGS += -Wl,--as-needed9 --enable-static \
1010 --disable-hal \
11DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"11 --enable-sap \
1212 --enable-health \
13# Workaround a bug in cdbs, which doesn't run dh_install and dh_systemd13 --enable-gstreamer \
14# in the correct order, by pointing dh_systemd_enable and dh_systemd_start14 --enable-alsa \
15# at the uninstalled service file.15 --enable-usb \
16# Once the bug #715504 in cdbs has been fixed, this workaround should be16 --enable-tools \
17# removed again.17 --enable-bccmd \
18DEB_DH_SYSTEMD_ENABLE_ARGS_bluez = src/bluetooth.service18 --enable-pcmcia \
19DEB_DH_SYSTEMD_START_ARGS_bluez = src/bluetooth.service19 --enable-hid2hci \
2020 --enable-dfutool \
21DEB_CONFIGURE_EXTRA_FLAGS := LDFLAGS=-Wl,--as-needed \21 --enable-hidd \
22 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \22 --enable-pand \
23 --enable-static \23 --enable-dund \
24 --disable-hal \24 --enable-cups \
25 --enable-sap \25 --enable-test \
26 --enable-health \26 --enable-datafiles \
27 --enable-gstreamer \27 --enable-debug \
28 --enable-alsa \28 --enable-dbusoob \
29 --enable-usb \29 --enable-wiimote \
30 --enable-tools \30 --enable-gatt \
31 --enable-bccmd \31 --with-telephony=ofono \
32 --enable-pcmcia \32 --with-systemdunitdir=/lib/systemd/system
33 --enable-hid2hci \33
34 --enable-dfutool \34%:
35 --enable-hidd \35 dh $@ --with autoreconf,systemd
36 --enable-pand \36
37 --enable-dund \37override_dh_auto_configure:
38 --enable-cups \38 dh_auto_configure -- $(CONFIGURE_FLAGS)
39 --enable-test \39
40 --enable-datafiles \40override_dh_installinit:
41 --enable-debug \41 dh_installinit -pbluez --name=bluetooth --restart-after-upgrade
42 --enable-dbusoob \
43 --enable-wiimote \
44 --enable-gatt \
45 --with-telephony=ofono \
46 --with-systemdunitdir=/lib/systemd/system
47
48DEB_DESTDIR := $(CURDIR)/debian/tmp
49# for debug pakcages
50DEB_DBG_PACKAGES = bluez-dbg libbluetooth3-dbg
5142
52TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \43TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \
53 test-discovery test-input test-manager test-network test-serial \44 test-discovery test-input test-manager test-network test-serial \
54 test-service test-telephony list-devices45 test-service test-telephony list-devices
5546
56install/bluez::47override_dh_install:
48 dh_install --list-missing
49 LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
50 dh_gstscancodecs -pbluez-gstreamer
51
57 install -D -m 0755 $(CURDIR)/test/agent \52 install -D -m 0755 $(CURDIR)/test/agent \
58 $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent53 $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
59 for d in $(TEST_PROGRAM_LIST) ; do \54 for d in $(TEST_PROGRAM_LIST) ; do \
@@ -64,16 +59,12 @@
64 install -D -m 0644 $(CURDIR)/debian/README.examples \59 install -D -m 0644 $(CURDIR)/debian/README.examples \
65 $(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README60 $(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
6661
67binary-install/bluez-gstreamer::62
68 LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \63override_dh_strip:
69 dh_gstscancodecs -pbluez-gstreamer64 dh_strip -a --dbg-package=bluez-dbg libbluetooth3-dbg
7065
71binary-install/bluez::66override_dh_systemd_enable:
72 install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \67 dh_systemd_enable -pbluez bluetooth.service
73 $(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf68
7469override_dh_systemd_start:
75common-install-arch::70 dh_systemd_start -pbluez --restart-after-upgrade bluetooth.service
76 dh_python3
77
78clean::
79 -rm -f $(CURDIR)/debian/bluez-pcmcia-support.udev

Subscribers

People subscribed via source and target branches

to all changes: