Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-settings-daemon
Commits:
-
213def8b
by Mike Gabriel at 2019-08-04T10:44:20Z
-
7899a58e
by Mike Gabriel at 2019-08-04T10:44:53Z
-
7a3204af
by Mike Gabriel at 2019-08-04T10:45:58Z
-
a088c96e
by Mike Gabriel at 2019-08-04T11:20:47Z
4 changed files:
Changes:
1 |
+mate-settings-daemon (1.22.0-2) unstable; urgency=medium
|
|
2 |
+ |
|
3 |
+ * debian/control:
|
|
4 |
+ + Add B-D: dh-exec.
|
|
5 |
+ * debian/rules:
|
|
6 |
+ + Add --disable-rfkill configure option on non-Linux host archs.
|
|
7 |
+ * debian/mate-settings-daemon-common.install:
|
|
8 |
+ + Use dh-exec; omit installation of udev rules as they don't get created
|
|
9 |
+ when --disable-rfkill configure option is used on non-Linux host archs.
|
|
10 |
+ |
|
11 |
+ -- Mike Gabriel <sunweaver@debian.org> Sun, 04 Aug 2019 12:46:49 +0200
|
|
12 |
+ |
|
1 | 13 |
mate-settings-daemon (1.22.0-1) unstable; urgency=medium
|
2 | 14 |
|
3 | 15 |
[ Martin Wimpress ]
|
... | ... | @@ -7,6 +7,7 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>, |
7 | 7 |
Stefano Karapetsas <stefano@karapetsas.com>,
|
8 | 8 |
Vangelis Mouhtsis <vangelis@gnugr.org>,
|
9 | 9 |
Build-Depends: debhelper (>= 10.3~),
|
10 |
+ dh-exec,
|
|
10 | 11 |
dpkg-dev (>= 1.16.1.1),
|
11 | 12 |
intltool,
|
12 | 13 |
libcanberra-gtk3-dev,
|
1 |
-usr/lib/udev/rules.d/ lib/udev
|
|
1 |
+#! /usr/bin/dh-exec
|
|
2 |
+ |
|
3 |
+[linux-any] usr/lib/udev/rules.d/ lib/udev
|
|
2 | 4 |
usr/share/glib-2.0/
|
3 | 5 |
usr/share/icons/
|
4 | 6 |
usr/share/locale/
|
... | ... | @@ -6,6 +6,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all |
6 | 6 |
DPKG_EXPORT_BUILDFLAGS = 1
|
7 | 7 |
include /usr/share/dpkg/buildflags.mk
|
8 | 8 |
|
9 |
+DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
|
|
10 |
+ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS)))
|
|
11 |
+WITHOUT_RFKILL = "--disable-rfkill"
|
|
12 |
+else
|
|
13 |
+WITHOUT_RFKILL = ""
|
|
14 |
+endif
|
|
15 |
+ |
|
16 |
+ |
|
9 | 17 |
%:
|
10 | 18 |
dh $@ $(DHFLAGS) --without autoreconf
|
11 | 19 |
|
... | ... | @@ -23,6 +31,7 @@ override_dh_auto_configure: |
23 | 31 |
--disable-silent-rules \
|
24 | 32 |
--libexecdir=/usr/bin \
|
25 | 33 |
--disable-static \
|
34 |
+ $(WITHOUT_RFKILL) \
|
|
26 | 35 |
--enable-pulse
|
27 | 36 |
|
28 | 37 |
override_dh_makeshlibs:
|