Skip to content

Commit 6b9222d

Browse files
Fantumtwebster
authored andcommitted
use debhelper 11 for integrated meson support
- using debhelper 11 - removed hacks for the minimal meson+ninja build on older debhelper 10
1 parent 47eb3a7 commit 6b9222d

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

debian/clean

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/compat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
11

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section: x11
33
Priority: optional
44
Maintainer: Clement Lefebvre <[email protected]>
55
Build-Depends:
6-
debhelper (>= 10),
6+
debhelper (>= 11.1~),
77
dh-python,
88
dpkg-dev (>= 1.15.1),
99
gobject-introspection (>= 0.10.2-1~),

debian/rules

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
#!/usr/bin/make -f
22

3+
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
4+
export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
5+
36
%:
47
dh $@ --with=gir,python3
58

69
override_dh_auto_configure:
7-
mkdir -p debian/build
8-
meson debian/build \
9-
--prefix=/usr \
10-
--buildtype=plain \
10+
dh_auto_configure -- \
1111
-Dpnp_ids=/usr/share/hwdata/pnp.ids \
1212
-Ddeprecation_warnings=false
1313

14-
override_dh_auto_build:
15-
ninja -C debian/build
16-
17-
override_dh_auto_test:
18-
ninja -C debian/build test
19-
2014
override_dh_strip:
2115
dh_strip -Xdesktop -Xcinnamon --dbg-package=libcvc-dbg
2216
dh_strip -Xcvc --dbg-package=libcinnamon-desktop-dbg
23-
24-
override_dh_auto_install:
25-
DESTDIR=${CURDIR}/debian/tmp \
26-
ninja -C debian/build install

0 commit comments

Comments
 (0)