diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2016-11-26 13:22:10 +0100 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2016-11-26 22:25:40 +0100 |
| commit | b5b68b6bb809624b7cee6464eabb4b633443add0 (patch) | |
| tree | 07090c793d21a09f8aec60029c0de951844973b6 /debian | |
| parent | 3a6e781ea39b67fabf1a528e6a071215a65f50b0 (diff) | |
| download | mariadb-git-b5b68b6bb809624b7cee6464eabb4b633443add0.tar.gz | |
MDEV-10126: replace deprecated iproute dependency with iproute2
Fall back to old iproute on Debian Wheezy and Ubuntu Precise that
don't have iproute2 available.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 8 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 38c1d64a5e2..9345267b7a7 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -30,10 +30,18 @@ fi # Look up distro-version specific stuff +# # Always keep the actual packaging as up-to-date as possible following the latest # Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh # tests for backwards compatibility and strip away parts on older builders. +# If iproute2 is not available (before Debian Jessie and Ubuntu Trusty) +# fall back to the old iproute package. +if ! apt-cache madison iproute2 | grep 'iproute2 *|' >/dev/null 2>&1 +then + sed 's/iproute2/iproute/' -i debian/control +fi + # If libcrack2 (>= 2.9.0) is not available (before Debian Jessie and Ubuntu Trusty) # clean away the cracklib stanzas so the package can build without them. if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 diff --git a/debian/control b/debian/control index f2beb786aa2..f0654d0b486 100644 --- a/debian/control +++ b/debian/control @@ -349,7 +349,7 @@ Depends: bsdutils, findutils, galera-3 (>=25.3), gawk, - iproute, + iproute2, libdbi-perl, lsb-base (>= 3.0-10), lsof, |