From cb21e117baba0e2007b9863d0916df6dd2863d38 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 16 May 2018 18:03:06 +0200 Subject: [PATCH] MDEV-16187 Ubuntu Bionic MariaDB has epoch version that makes 10.1 and 10.2 installs fail --- debian/autobake-deb.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 157f33eb298..c26fcaa4e85 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -99,10 +99,13 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${ PATCHLEVEL="+maria" LOGSTRING="MariaDB build" CODENAME="$(lsb_release -sc)" +if [[ "$CODENAME" == bionic ]]; then + EPOCH="1:" +fi -dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}." +dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}." -echo "Creating package version ${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... " +echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... " # Build the package # Pass -I so that .git and other unnecessary temporary and source control files