Skip to content

M
MariaDB
Commit 68df7a01 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

merge with 5.5-release

parents 8e9cead3 69324831
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
debian/dist/Debian/control
View file @ 68df7a01
...@@ -14,7 +14,7 @@ Package: libmariadbclient18 ...@@ -14,7 +14,7 @@ Package: libmariadbclient18
Section: libs Section: libs
Architecture: any Architecture: any
Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} 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 Description: MariaDB database client library
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -169,7 +169,7 @@ Architecture: any ...@@ -169,7 +169,7 @@ Architecture: any
Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
Conflicts: mariadb-test (<< ${source:Version}), Conflicts: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, 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}), Replaces: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
Description: MariaDB database regression test suite Description: MariaDB database regression test suite
...@@ -240,7 +240,7 @@ Description: MariaDB database regression test suite (metapackage depending on th ...@@ -240,7 +240,7 @@ Description: MariaDB database regression test suite (metapackage depending on th
Package: mariadb-tokudb-engine-5.5 Package: mariadb-tokudb-engine-5.5
Section: database Section: database
Architecture: all Architecture: any
Depends: mariadb-server-5.5 Depends: mariadb-server-5.5
Description: TokuDB storage engine for MariaDB Description: TokuDB storage engine for MariaDB
TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC
......
debian/dist/Ubuntu/control
View file @ 68df7a01
...@@ -14,7 +14,7 @@ Package: libmariadbclient18 ...@@ -14,7 +14,7 @@ Package: libmariadbclient18
Section: libs Section: libs
Architecture: any Architecture: any
Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} 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 Description: MariaDB database client library
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -163,7 +163,7 @@ Architecture: any ...@@ -163,7 +163,7 @@ Architecture: any
Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
Conflicts: mariadb-test (<< ${source:Version}), Conflicts: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, 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}), Replaces: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
Description: MariaDB database regression test suite Description: MariaDB database regression test suite
...@@ -234,7 +234,7 @@ Description: MariaDB database regression test suite (metapackage depending on th ...@@ -234,7 +234,7 @@ Description: MariaDB database regression test suite (metapackage depending on th
Package: mariadb-tokudb-engine-5.5 Package: mariadb-tokudb-engine-5.5
Section: database Section: database
Architecture: all Architecture: any
Depends: mariadb-server-5.5 Depends: mariadb-server-5.5
Description: TokuDB storage engine for MariaDB Description: TokuDB storage engine for MariaDB
TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7