summaryrefslogtreecommitdiff
path: root/debian/dist/Ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'debian/dist/Ubuntu')
-rw-r--r--debian/dist/Ubuntu/control3
-rw-r--r--debian/dist/Ubuntu/mariadb-server-5.5.files1
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 7dd27754c97..fd72e8d4fb2 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -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,
diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files b/debian/dist/Ubuntu/mariadb-server-5.5.files
index 58da345b737..d08e6253fe8 100644
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files
@@ -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