Skip to content

Commit 0ee703f

Browse files
committed
Problem: Debian build dependencies out of date
Solution: now that Ubuntu before 20.04 and Debian before 11 are EOL update to debhelper-compat 12 and change several build deps
1 parent ade0c4d commit 0ee703f

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

zproject_debian.gsl

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ $(project.name:lower) ($(->version.major).$(->version.minor).$(->version.patch)-
2626
* Initial packaging.
2727

2828
-- $(project.name) Developers <$(project.email)> Wed, 31 Dec 2014 00:00:00 +0000
29-
.output "packaging/debian/compat"
30-
10
3129
.output "packaging/debian/control"
3230
#
3331
# $(project.name) - $(project.description?'':)
@@ -41,8 +39,8 @@ Section: net
4139
Priority: optional
4240
Maintainer: $(project.name) Developers <$(project.email)>
4341
Standards-Version: 4.0.1.0
44-
Build-Depends: debhelper (>= 9),
45-
pkg-config,
42+
Build-Depends: debhelper-compat (= 12),
43+
pkgconf | pkg-config,
4644
.for project.use
4745
.if defined(use.debian_name)
4846
. if !(use.debian_name = '')
@@ -65,15 +63,13 @@ Build-Depends: debhelper (>= 9),
6563
.endif
6664
.if systemd ?= 1
6765
.# necessary for systemd.pc to get unit install path
68-
systemd,
66+
systemd-dev | systemd,
6967
.endif
7068
.if python_cffi ?= 1
7169
dh-python <!nopython>,
7270
python3-all-dev <!nopython>, python3-cffi <!nopython>, python3-setuptools <!nopython>,
7371
.endif
74-
.- NOTE: after support for Debian 7 and Ubuntu 12.04 is dropped, <!nodoc> can be added to each of the following
75-
asciidoc-base | asciidoc, xmlto,
76-
dh-autoreconf
72+
asciidoc-base <!nodoc>, xmlto <!nodoc>,
7773
.if project.exports_classes | ( project.has_classes & project.has_main )
7874
.# NOTE: Now for at least some compilers the symbol visibility seems to
7975
.# be managed in the shared library files, not the "exportedness" - so
@@ -314,9 +310,6 @@ override_dh_auto_configure:
314310

315311
%:
316312
dh $@ \\
317-
.if systemd ?= 1
318-
--with systemd \\
319-
.endif
320313
.if python_cffi ?= 1
321314
\$(WITH_PYTHON) \\
322315
.endif
@@ -407,8 +400,8 @@ Source: $(project.name)
407400
Version: $(->version.major).$(->version.minor).$(->version.patch)-0.1
408401
Maintainer: $(project.name) Developers <$(project.email)>
409402
Architecture: any
410-
Build-Depends: debhelper (>= 9),
411-
pkg-config,
403+
Build-Depends: debhelper-compat (= 12),
404+
pkgconf | pkg-config,
412405
.for project.use
413406
.if defined(use.debian_name)
414407
. if !(use.debian_name = '')
@@ -427,14 +420,13 @@ Build-Depends: debhelper (>= 9),
427420
,
428421
.endfor
429422
.if systemd ?= 1
430-
systemd,
423+
systemd-dev | systemd,
431424
.endif
432425
.if python_cffi ?= 1
433426
dh-python <!nopython>,
434427
python3-all-dev <!nopython>, python3-cffi <!nopython>, python3-setuptools <!nopython>,
435428
.endif
436-
asciidoc-base | asciidoc, xmlto,
437-
dh-autoreconf
429+
asciidoc-base <!nodoc>, xmlto <!nodoc>,
438430

439431
Files:
440432
7697688bf65a35bc33ae2db51ebb0e3b 818110 $(string.replace (project.name, "_|-"):lower).tar.gz

zproject_obs.gsl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ register_target ("obs", "service for Open Build Service")
4141
<param name="files">*/packaging/debian/changelog</param>
4242
<param name="outfilename">debian.changelog</param>
4343
</service>
44-
<service name="extract_file" mode="buildtime">
45-
<param name="archive">*.tar</param>
46-
<param name="files">*/packaging/debian/compat</param>
47-
<param name="outfilename">debian.compat</param>
48-
</service>
4944
<service name="extract_file" mode="buildtime">
5045
<param name="archive">*.tar</param>
5146
<param name="files">*/packaging/debian/control</param>

0 commit comments

Comments
 (0)