1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

More small 5.5 .deb packaging fixes found in Buildbot tests.

This commit is contained in:
unknown
2012-01-24 12:27:44 +01:00
parent 45b512b5b5
commit 92bd8a5c60
5 changed files with 6 additions and 5 deletions

View File

@ -54,7 +54,8 @@ port = 3306
basedir = /usr
datadir = /var/lib/mysql
tmpdir = /tmp
language = /usr/share/mysql/english
lc_messages_dir = /usr/share/mysql
lc_messages = en_US
skip-external-locking
#
# * Character sets

View File

@ -178,8 +178,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
libmariadbclient16 (<< 5.3.4)
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,

View File

@ -15,6 +15,7 @@ usr/bin/aria_chk
usr/bin/aria_dump_log
usr/bin/mysql_convert_table_format
usr/bin/mysql_install_db
usr/bin/mysql_plugin
usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission
usr/bin/mysql_tzinfo_to_sql

View File

@ -172,8 +172,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
libmariadbclient16 (<< 5.3.4)
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,

View File

@ -17,6 +17,7 @@ usr/bin/aria_chk
usr/bin/aria_dump_log
usr/bin/mysql_convert_table_format
usr/bin/mysql_install_db
usr/bin/mysql_plugin
usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission
usr/bin/mysql_tzinfo_to_sql