Skip to content

Commit 93ab0ef

Browse files
committed
MDEV-16187 Ubuntu Bionic MariaDB has epoch version that makes 10.1 and 10.2 installs fail
backport cb21e11 from 10.2
1 parent c69357d commit 93ab0ef

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

debian/autobake-deb.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,12 @@ sed -i -e "s/\\\${LIBSSL}/${LIBSSL}/g" debian/control
5757
#
5858
echo "Incrementing changelog and starting build scripts"
5959

60-
dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}."
60+
if [[ "$CODENAME" == bionic ]]; then
61+
EPOCH="1:"
62+
fi
63+
dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}."
6164

62-
echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... "
65+
echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... "
6366

6467
# Build the package.
6568
# Pass -I so that .git and other unnecessary temporary and source control files

0 commit comments

Comments
 (0)