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
1=== modified file '.bzr-builddeb/default.conf'
2--- .bzr-builddeb/default.conf 2015-09-11 09:01:46 +0000
3+++ .bzr-builddeb/default.conf 2015-09-14 10:06:47 +0000
4@@ -1,2 +1,2 @@
5 [BUILDDEB]
6-merge = True
7+split = True
8
9=== modified file 'debian/bluez.install'
10--- debian/bluez.install 2015-09-11 09:01:46 +0000
11+++ debian/bluez.install 2015-09-14 10:06:47 +0000
12@@ -34,3 +34,5 @@
13 usr/share/man/man8/hciconfig.8
14 usr/share/man/man8/bccmd.8
15 debian/source_bluez.py usr/share/apport/package-hooks
16+debian/bluetooth-dbus.conf etc/dbus-1/system.d
17+usr/share/dbus-1/system-services/org.bluez.service
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2015-09-11 09:01:46 +0000
21+++ debian/changelog 2015-09-14 10:06:47 +0000
22@@ -1,3 +1,11 @@
23+bluez (4.101-0ubuntu25.1~overlay5) UNRELEASED; urgency=medium
24+
25+ * debian/rules:
26+ - Migrate from cdbs to debhelper to make it possible to build our
27+ packages with the Ubuntu citrain infrastructure.
28+
29+ -- Simon Fels <simon.fels@canonical.com> Mon, 14 Sep 2015 11:18:54 +0200
30+
31 bluez (4.101-0ubuntu25.1~overlay4) vivid; urgency=medium
32
33 * debian/patches/force-adapter-class.patch:
34
35=== modified file 'debian/rules'
36--- debian/rules 2015-09-11 09:01:46 +0000
37+++ debian/rules 2015-09-14 10:06:47 +0000
38@@ -1,59 +1,54 @@
39 #!/usr/bin/make -f
40-# build rules for bluez
41-
42-include /usr/share/cdbs/1/rules/debhelper.mk
43-include /usr/share/cdbs/1/rules/autoreconf.mk
44-include /usr/share/cdbs/1/class/autotools.mk
45-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
46-
47-LDFLAGS += -Wl,--as-needed
48-
49-DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
50-
51-# Workaround a bug in cdbs, which doesn't run dh_install and dh_systemd
52-# in the correct order, by pointing dh_systemd_enable and dh_systemd_start
53-# at the uninstalled service file.
54-# Once the bug #715504 in cdbs has been fixed, this workaround should be
55-# removed again.
56-DEB_DH_SYSTEMD_ENABLE_ARGS_bluez = src/bluetooth.service
57-DEB_DH_SYSTEMD_START_ARGS_bluez = src/bluetooth.service
58-
59-DEB_CONFIGURE_EXTRA_FLAGS := LDFLAGS=-Wl,--as-needed \
60- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
61- --enable-static \
62- --disable-hal \
63- --enable-sap \
64- --enable-health \
65- --enable-gstreamer \
66- --enable-alsa \
67- --enable-usb \
68- --enable-tools \
69- --enable-bccmd \
70- --enable-pcmcia \
71- --enable-hid2hci \
72- --enable-dfutool \
73- --enable-hidd \
74- --enable-pand \
75- --enable-dund \
76- --enable-cups \
77- --enable-test \
78- --enable-datafiles \
79- --enable-debug \
80- --enable-dbusoob \
81- --enable-wiimote \
82- --enable-gatt \
83- --with-telephony=ofono \
84- --with-systemdunitdir=/lib/systemd/system
85-
86-DEB_DESTDIR := $(CURDIR)/debian/tmp
87-# for debug pakcages
88-DEB_DBG_PACKAGES = bluez-dbg libbluetooth3-dbg
89+# Uncomment this to turn on verbose mode.
90+#export DH_VERBOSE=1
91+
92+CONFIGURE_FLAGS := \
93+ --disable-silent-rules \
94+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
95+ --libexec=\$${prefix}/lib/ \
96+ --enable-static \
97+ --disable-hal \
98+ --enable-sap \
99+ --enable-health \
100+ --enable-gstreamer \
101+ --enable-alsa \
102+ --enable-usb \
103+ --enable-tools \
104+ --enable-bccmd \
105+ --enable-pcmcia \
106+ --enable-hid2hci \
107+ --enable-dfutool \
108+ --enable-hidd \
109+ --enable-pand \
110+ --enable-dund \
111+ --enable-cups \
112+ --enable-test \
113+ --enable-datafiles \
114+ --enable-debug \
115+ --enable-dbusoob \
116+ --enable-wiimote \
117+ --enable-gatt \
118+ --with-telephony=ofono \
119+ --with-systemdunitdir=/lib/systemd/system
120+
121+%:
122+ dh $@ --with autoreconf,systemd
123+
124+override_dh_auto_configure:
125+ dh_auto_configure -- $(CONFIGURE_FLAGS)
126+
127+override_dh_installinit:
128+ dh_installinit -pbluez --name=bluetooth --restart-after-upgrade
129
130 TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \
131 test-discovery test-input test-manager test-network test-serial \
132 test-service test-telephony list-devices
133
134-install/bluez::
135+override_dh_install:
136+ dh_install --list-missing
137+ LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
138+ dh_gstscancodecs -pbluez-gstreamer
139+
140 install -D -m 0755 $(CURDIR)/test/agent \
141 $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
142 for d in $(TEST_PROGRAM_LIST) ; do \
143@@ -64,16 +59,12 @@
144 install -D -m 0644 $(CURDIR)/debian/README.examples \
145 $(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
146
147-binary-install/bluez-gstreamer::
148- LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
149- dh_gstscancodecs -pbluez-gstreamer
150-
151-binary-install/bluez::
152- install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \
153- $(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
154-
155-common-install-arch::
156- dh_python3
157-
158-clean::
159- -rm -f $(CURDIR)/debian/bluez-pcmcia-support.udev
160+
161+override_dh_strip:
162+ dh_strip -a --dbg-package=bluez-dbg libbluetooth3-dbg
163+
164+override_dh_systemd_enable:
165+ dh_systemd_enable -pbluez bluetooth.service
166+
167+override_dh_systemd_start:
168+ dh_systemd_start -pbluez --restart-after-upgrade bluetooth.service

Subscribers

People subscribed via source and target branches

to all changes: