diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-17 20:44:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-17 20:44:34 +0200 |
| commit | 68df7a0137f15ffe57e4dec0adeeb3989930acf2 (patch) | |
| tree | 587599eba4c049a779c815fb1160ead37e68dbf8 | |
| parent | 8e9cead3653409972c1d9e0e3406f718ff67a439 (diff) | |
| parent | 69324831a47c93006c82b7bd4d48ec7b33c716b3 (diff) | |
| download | mariadb-git-68df7a0137f15ffe57e4dec0adeeb3989930acf2.tar.gz | |
merge with 5.5-release
| -rw-r--r-- | debian/dist/Debian/control | 6 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 2bea86dad37..77021cad411 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -14,7 +14,7 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.32) +Conflicts: mariadb-server-5.5 (<< 5.5.33) 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 @@ -169,7 +169,7 @@ Architecture: any Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) Conflicts: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.32) + mariadb-server-5.5 (<< 5.5.33) Replaces: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 Description: MariaDB database regression test suite @@ -240,7 +240,7 @@ Description: MariaDB database regression test suite (metapackage depending on th Package: mariadb-tokudb-engine-5.5 Section: database -Architecture: all +Architecture: any Depends: mariadb-server-5.5 Description: TokuDB storage engine for MariaDB TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 4b731f41722..97dec4b3774 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -14,7 +14,7 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.32) +Conflicts: mariadb-server-5.5 (<< 5.5.33) 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 @@ -163,7 +163,7 @@ Architecture: any Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) Conflicts: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.32) + mariadb-server-5.5 (<< 5.5.33) Replaces: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 Description: MariaDB database regression test suite @@ -234,7 +234,7 @@ Description: MariaDB database regression test suite (metapackage depending on th Package: mariadb-tokudb-engine-5.5 Section: database -Architecture: all +Architecture: any Depends: mariadb-server-5.5 Description: TokuDB storage engine for MariaDB TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC |