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:
3
debian/additions/my.cnf
vendored
3
debian/additions/my.cnf
vendored
@ -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
|
||||
|
3
debian/dist/Debian/control
vendored
3
debian/dist/Debian/control
vendored
@ -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,
|
||||
|
1
debian/dist/Debian/mariadb-server-5.5.files
vendored
1
debian/dist/Debian/mariadb-server-5.5.files
vendored
@ -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
|
||||
|
3
debian/dist/Ubuntu/control
vendored
3
debian/dist/Ubuntu/control
vendored
@ -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,
|
||||
|
1
debian/dist/Ubuntu/mariadb-server-5.5.files
vendored
1
debian/dist/Ubuntu/mariadb-server-5.5.files
vendored
@ -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
|
||||
|
Reference in New Issue
Block a user