Skip to content

M
MariaDB
Commit 055b62f4 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

make sure that our .deb packages provide mysql-*-5.5 where appropriate

parent 1ef07d08
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
debian/dist/Debian/control
View file @ 055b62f4
...@@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) ...@@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
Package: mariadb-client-core-10.0 Package: mariadb-client-core-10.0
Architecture: any Architecture: any
Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-10.0 Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
mysql-client-core-5.1, mysql-client-core-5.5, mysql-client-core-5.1, mysql-client-core-5.5,
...@@ -121,7 +121,7 @@ Package: mariadb-client-10.0 ...@@ -121,7 +121,7 @@ Package: mariadb-client-10.0
Architecture: any Architecture: any
Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: virtual-mysql-client, mysql-client, Provides: virtual-mysql-client, mysql-client,
mysql-client-4.1, mysql-client-5.1, mysql-client-10.0 mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
mariadb-client (<< ${source:Version}), mariadb-client (<< ${source:Version}),
mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5 mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
...@@ -141,7 +141,7 @@ Description: MariaDB database client binaries ...@@ -141,7 +141,7 @@ Description: MariaDB database client binaries
Package: mariadb-server-core-10.0 Package: mariadb-server-core-10.0
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-10.0 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
Conflicts: mariadb-server-5.1 (<< 5.1.60), Conflicts: mariadb-server-5.1 (<< 5.1.60),
mariadb-server-5.2 (<< 5.2.10), mariadb-server-5.2 (<< 5.2.10),
mariadb-server-5.3 (<< 5.3.3), mariadb-server-5.3 (<< 5.3.3),
......
debian/dist/Ubuntu/control
View file @ 055b62f4
...@@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) ...@@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
Package: mariadb-client-core-10.0 Package: mariadb-client-core-10.0
Architecture: any Architecture: any
Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-10.0 Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
mysql-client-core-5.1, mysql-client-core-5.5, mysql-client-core-5.1, mysql-client-core-5.5,
...@@ -121,7 +121,7 @@ Package: mariadb-client-10.0 ...@@ -121,7 +121,7 @@ Package: mariadb-client-10.0
Architecture: any Architecture: any
Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: virtual-mysql-client, mysql-client, Provides: virtual-mysql-client, mysql-client,
mysql-client-4.1, mysql-client-5.1, mysql-client-10.0 mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
mariadb-client (<< ${source:Version}), mariadb-client (<< ${source:Version}),
mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5 mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
...@@ -141,7 +141,7 @@ Description: MariaDB database client binaries ...@@ -141,7 +141,7 @@ Description: MariaDB database client binaries
Package: mariadb-server-core-10.0 Package: mariadb-server-core-10.0
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-10.0 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
Conflicts: mysql-server-5.0, Conflicts: mysql-server-5.0,
mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5 mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
......
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