diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2021-04-11 22:05:52 -0700 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-04-12 17:19:54 +1000 |
| commit | 058d93d47af79e650dc6a7abc107a400d8598e45 (patch) | |
| tree | 78cee88c6bb43385b1c1058b3a909b029d4ef9b9 | |
| parent | 966c5a35af0a84ea147f754f6eb0cc1fd0a5826f (diff) | |
| download | mariadb-git-058d93d47af79e650dc6a7abc107a400d8598e45.tar.gz | |
Deb: Stop depending on empty transitional package dh-systemd
MariaDB Server still supports Ubuntu 16.04 "Xenial" until it goes EOL
in April 30, 2021. Thus we need to include a customization for backwards
compatibility.
This change is intended to be applied for all MariaDB versions still
supported, i.e. 10.2 to 10.6.
| -rwxr-xr-x | debian/autobake-deb.sh | 9 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 5cf2398575a..21ab4d8fe22 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -106,6 +106,15 @@ then sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control fi +# From Debian Stretch/Ubuntu Bionic onwards dh-systemd is just an empty +# transitional metapackage and the functionality was merged into debhelper. +# In Ubuntu Hirsute is was completely removed, so it can't be referenced anymore. +# Keep using it only on Debian Jessie and Ubuntu Xenial. +if apt-cache madison dh-systemd | grep 'dh-systemd' >/dev/null 2>&1 +then + sed 's/debhelper (>= 9.20160709~),/debhelper (>= 9), dh-systemd,/' -i debian/control +fi + # Adjust changelog, add new version echo "Incrementing changelog and starting build scripts" diff --git a/debian/control b/debian/control index ba6243c38dd..c906c1bd505 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> Build-Depends: bison, chrpath, cmake (>= 2.7), - debhelper (>= 9), + debhelper (>= 9.20160709~), dh-apparmor, dh-systemd, dpatch, |