Use debhelper-compat 12

This commit is contained in:
Simon McVittie 2019-07-09 17:54:08 +01:00
parent c1cbb41bf7
commit 818cd1c649
4 changed files with 6 additions and 5 deletions

3
debian/changelog vendored
View File

@ -7,6 +7,9 @@ ostree (2019.2-2) UNRELEASED; urgency=medium
can't reproduce and debug the failure in a local Docker container. can't reproduce and debug the failure in a local Docker container.
- Similarly, disable the autopkgtest for now. - Similarly, disable the autopkgtest for now.
* Standards-Version: 4.4.0 (no changes required) * Standards-Version: 4.4.0 (no changes required)
* Use debhelper-compat 12
- Override dh_installsystemd instead of dh_systemd_start
- Stop overriding libexecdir
-- Simon McVittie <smcv@debian.org> Sun, 23 Jun 2019 20:07:33 +0100 -- Simon McVittie <smcv@debian.org> Sun, 23 Jun 2019 20:07:33 +0100

1
debian/compat vendored
View File

@ -1 +0,0 @@
10

2
debian/control vendored
View File

@ -13,7 +13,7 @@ Build-Depends:
bison, bison,
ca-certificates, ca-certificates,
cpio, cpio,
debhelper (>= 10~), debhelper-compat (= 12),
dh-exec (>= 0.23~), dh-exec (>= 0.23~),
docbook-xml <!nodoc>, docbook-xml <!nodoc>,
docbook-xsl <!nodoc>, docbook-xsl <!nodoc>,

5
debian/rules vendored
View File

@ -14,7 +14,6 @@ override_dh_autoreconf:
configure_options = \ configure_options = \
GJS=some-nonexistent-gjs-binary \ GJS=some-nonexistent-gjs-binary \
--enable-installed-tests \ --enable-installed-tests \
--libexecdir='$${prefix}/libexec' \
--with-avahi \ --with-avahi \
--with-dracut \ --with-dracut \
--with-grub2 \ --with-grub2 \
@ -99,5 +98,5 @@ override_dh_fixperms-arch:
find debian/tmp -type f -name '*.js' -print0 | \ find debian/tmp -type f -name '*.js' -print0 | \
xargs -0r chmod -v go=rX,u+rw,a-s xargs -0r chmod -v go=rX,u+rw,a-s
override_dh_systemd_start: override_dh_installsystemd:
dh_systemd_start --no-start dh_installsystemd --no-start