diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-09 11:05:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-09 11:05:51 +0100 |
| commit | ab2bf1ad0bd268e305233d0464fdf8ae408861f5 (patch) | |
| tree | 1fa3a0beb2002b10b3f304f1df1cf6f2e02244d2 /debian | |
| parent | af22c45ec72afc39ff993ee0474f08093bced7b9 (diff) | |
| parent | f0e06e31ff7b95e3d5658a807251d62203f92160 (diff) | |
| download | mariadb-git-ab2bf1ad0bd268e305233d0464fdf8ae408861f5.tar.gz | |
merge with 10.0.5
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 218efa3faca..e4c5352b40d 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-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), + 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 diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 857eb530d9e..032bcc183df 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-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), + 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 |