* bzr merge -rtag:mariadb-10.0.9 maria/10.0

* Fix for post-merge build failures.

2 files changed, 2 insertions, 3 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 0f7155c6ee7..cb4164fabf3 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -73,4 +73,4 @@ Depends: mariadb-test-10.0 (= ${source:Version})
 Description: MariaDB database regression test suite (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB
- maintainers.
\ No newline at end of file
+ maintainers.
diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.files.in b/debian/dist/Debian/mariadb-galera-server-10.0.files.in
index 4c2d448adae..8080db1d29d 100644
--- a/debian/dist/Debian/mariadb-galera-server-10.0.files.in
+++ b/debian/dist/Debian/mariadb-galera-server-10.0.files.in
@@ -3,8 +3,7 @@ usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/ha_xtradb.so
-usr/lib/mysql/plugin/ha_oqgraph.so
+usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so