diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-01-24 10:47:57 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-01-24 10:47:57 +0100 |
| commit | 45b512b5b54a91c5d52398677e38cc4b075b84ab (patch) | |
| tree | 5e13f09383b2d9c6a2c5f85c198de47ad6f8696c /debian | |
| parent | 19d13a3b17d613c04acbcd8c7a0578a55e0c2938 (diff) | |
| download | mariadb-git-45b512b5b54a91c5d52398677e38cc4b075b84ab.tar.gz | |
Fix two .deb problems causing build/install failures in Buildbot.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 4 | ||||
| -rw-r--r-- | debian/dist/Debian/control | 6 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 51cda73ee89..d2288ee8b42 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -61,9 +61,9 @@ done; # echo "Incrementing changelog and starting build scripts" -dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}~${CODENAME}" "Automatic build with ${LOGSTRING}." +dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}." -echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}~${CODENAME} ... " +echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... " # Build the package. # diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index b36c0469ba5..861f0ca5b11 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -89,12 +89,14 @@ Package: mariadb-client-core-5.5 Architecture: any Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5, +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, mariadb-client-5.1, mariadb-client-core-5.1, mariadb-client-5.2, mariadb-client-core-5.2, mariadb-client-5.3, mariadb-client-core-5.3 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5, +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1, mysql-client-5.5, mysql-client-core-5.1, mysql-client-core-5.5, mariadb-client-5.1, mariadb-client-core-5.1, mariadb-client-5.2, mariadb-client-core-5.2, diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index c49d1581cb3..7dd27754c97 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -89,12 +89,14 @@ Package: mariadb-client-core-5.5 Architecture: any Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5, +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, mariadb-client-5.1, mariadb-client-core-5.1, mariadb-client-5.2, mariadb-client-core-5.2, mariadb-client-5.3, mariadb-client-core-5.3 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5, +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1, mysql-client-5.5, mysql-client-core-5.1, mysql-client-core-5.5, mariadb-client-5.1, mariadb-client-core-5.1, mariadb-client-5.2, mariadb-client-core-5.2, |