diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-27 13:48:58 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-27 13:48:58 +0300 |
| commit | 6a6522319316204bbe46d52140151935ecde938f (patch) | |
| tree | 84e471aad74e90821ca5f4988ce9adfeebbd4b3d /debian | |
| parent | 8ad1b5b1086b6791b95a33c664184bfb56993d94 (diff) | |
| parent | 28ec372744e6dbeab9ecae7a3a9a7ef23b0866d5 (diff) | |
| download | mariadb-git-6a6522319316204bbe46d52140151935ecde938f.tar.gz | |
mariadb-5.5.33a merge
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/control | 2 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index d2962c0cd7a..9276d122105 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -11,6 +11,8 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria Package: mariadb-galera-server-5.5 +Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 Architecture: any Suggests: tinyca, mailx, mariadb-test Recommends: libhtml-template-perl diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 7234fdb8bfb..eeb55109766 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -11,6 +11,8 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria Package: mariadb-galera-server-5.5 +Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 Architecture: any Suggests: tinyca, mailx, mariadb-test Recommends: libhtml-template-perl |