Skip to content

Commit 8c957c6

Browse files
committed
Add debhelper >= 13.3 as alternative to dh-systemd in build-depends.
1 parent 4bdd617 commit 8c957c6

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/dpkg-build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,9 @@ jobs:
5454
apt-get update
5555
apt-get -y upgrade
5656
apt-get -y install devscripts dpkg-dev debhelper equivs
57-
- name: Remove dh-systemd from build dependencies
58-
run: |
59-
if dpkg --compare-versions "$(dpkg-query --showformat='${Version}' --show debhelper)" ge 13.3; then
60-
sed -i 's/Build-Depends: debhelper (>= 9), dh-systemd/Build-Depends: debhelper (>= 9)/' debian/control
61-
fi
57+
mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
6258
- name: Build package
6359
run: |
64-
mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
6560
dpkg-buildpackage -b -us -uc -rfakeroot
6661
dirname=$(echo ${{ matrix.target }} | tr ':' '_')
6762
package_path="${GITHUB_WORKSPACE}/packages/${dirname}"

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: systemd-named-netns
22
Section: admin
33
Priority: optional
44
Maintainer: Brad Cowie <brad@wand.net.nz>
5-
Build-Depends: debhelper (>= 9), dh-systemd
5+
Build-Depends: debhelper (>= 9), dh-systemd | debhelper (>= 13.3)
66
Standards-Version: 3.9.8
77
Homepage: https://github.com/gizmoguy/systemd-named-netns
88

0 commit comments

Comments
 (0)