diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-20 11:29:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-20 11:29:01 +0200 |
| commit | 2fe0836eed16ce5809c34064893681f12c77da9f (patch) | |
| tree | 441c1eb870dadd4659e6b63e9fd48aecbafbdb7f /debian | |
| parent | 4232874772c7fb041247614790f1b22740ddfb7f (diff) | |
| parent | 28ec372744e6dbeab9ecae7a3a9a7ef23b0866d5 (diff) | |
| download | mariadb-git-2fe0836eed16ce5809c34064893681f12c77da9f.tar.gz | |
5.5.33a merge
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/control | 3 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index c66ffedfd1a..38868478abd 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -14,7 +14,8 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +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 Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 8eb5f4537ac..de7b2405676 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -14,7 +14,8 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +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 Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query |