Commit a2a6880c authored by unknown's avatar unknown

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

parent 4631d50f
...@@ -54,7 +54,8 @@ port = 3306 ...@@ -54,7 +54,8 @@ port = 3306
basedir = /usr basedir = /usr
datadir = /var/lib/mysql datadir = /var/lib/mysql
tmpdir = /tmp tmpdir = /tmp
language = /usr/share/mysql/english lc_messages_dir = /usr/share/mysql
lc_messages = en_US
skip-external-locking skip-external-locking
# #
# * Character sets # * Character sets
......
...@@ -178,8 +178,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ...@@ -178,8 +178,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
Provides: mariadb-server, mysql-server, virtual-mysql-server Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
libmariadbclient16 (<< 5.3.4)
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
......
...@@ -15,6 +15,7 @@ usr/bin/aria_chk ...@@ -15,6 +15,7 @@ usr/bin/aria_chk
usr/bin/aria_dump_log usr/bin/aria_dump_log
usr/bin/mysql_convert_table_format usr/bin/mysql_convert_table_format
usr/bin/mysql_install_db usr/bin/mysql_install_db
usr/bin/mysql_plugin
usr/bin/mysql_secure_installation usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission usr/bin/mysql_setpermission
usr/bin/mysql_tzinfo_to_sql usr/bin/mysql_tzinfo_to_sql
......
...@@ -172,8 +172,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ...@@ -172,8 +172,7 @@ Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
Provides: mariadb-server, mysql-server, virtual-mysql-server Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
libmariadbclient16 (<< 5.3.4)
Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-4.1, mysql-server-5.0, mysql-server-5.1,
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
......
...@@ -17,6 +17,7 @@ usr/bin/aria_chk ...@@ -17,6 +17,7 @@ usr/bin/aria_chk
usr/bin/aria_dump_log usr/bin/aria_dump_log
usr/bin/mysql_convert_table_format usr/bin/mysql_convert_table_format
usr/bin/mysql_install_db usr/bin/mysql_install_db
usr/bin/mysql_plugin
usr/bin/mysql_secure_installation usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission usr/bin/mysql_setpermission
usr/bin/mysql_tzinfo_to_sql usr/bin/mysql_tzinfo_to_sql
......
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