summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-04-16 09:42:09 +0200
committerunknown <knielsen@knielsen-hq.org>2013-04-16 09:42:09 +0200
commit58a77aafab52bfc3d25bfd7680f8c27ca031e403 (patch)
tree13010dd9b769158f817e32727d647b13fc90dc8a /debian
parentfc17efc29714b73a7b0bf806a354fa6fb294b35b (diff)
downloadmariadb-git-58a77aafab52bfc3d25bfd7680f8c27ca031e403.tar.gz
MDEV-3882: .deb versions lower than upstream repo, causing install failure
The official Debian Wheezy MySQL packages have versions like 5.5.30+dfsg-xxx. Such version is larger than 5.5.30-yyy, so apt prefers it. So use instead 5.5.30+maria-yyy, which is larger and can be pulled in automatically by apt. Also included are a couple of fixes for test failures in buildbot.
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/autobake-deb.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 339d27bff00..5376ed58974 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -21,8 +21,8 @@ source ./VERSION
UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
RELEASE_EXTRA=""
-RELEASE_NAME=mariadb
-PATCHLEVEL=""
+RELEASE_NAME=""
+PATCHLEVEL="+maria"
LOGSTRING="MariaDB build"
# Look up distro-version specific stuff.