diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-11 16:33:51 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-11 16:33:51 +0100 |
commit | 055b62f404ee0a0463ee8ff98a0e24c083b95f1d (patch) | |
tree | 4a22817fcfc11bc874e6eedae774aff4344e2aa8 /debian | |
parent | 1ef07d0845300ad200671f9809dcd9ee8b2ff837 (diff) | |
download | mariadb-git-055b62f404ee0a0463ee8ff98a0e24c083b95f1d.tar.gz |
make sure that our .deb packages provide mysql-*-5.5 where appropriate
Diffstat (limited to 'debian')
-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 f729f81f55d..56ba509cfd7 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) Package: mariadb-client-core-10.0 Architecture: any 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, mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, @@ -121,7 +121,7 @@ Package: mariadb-client-10.0 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} 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, mariadb-client (<< ${source:Version}), 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 Package: mariadb-server-core-10.0 Architecture: any 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), mariadb-server-5.2 (<< 5.2.10), mariadb-server-5.3 (<< 5.3.3), diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 76a6e1b6e86..d9d5d6fbe1b 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -96,7 +96,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) Package: mariadb-client-core-10.0 Architecture: any 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, mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, @@ -121,7 +121,7 @@ Package: mariadb-client-10.0 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} 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, mariadb-client (<< ${source:Version}), 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 Package: mariadb-server-core-10.0 Architecture: any 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, 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 |