Merging from maria-10.0-connect (DEB packaging related fixes)

added:
  debian/mariadb-connect-engine-10.0.files
modified:
  cmake/build_configurations/mysql_release.cmake
  debian/dist/Debian/control
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Ubuntu/control
  debian/dist/Ubuntu/mariadb-server-10.0.files
pending merges:
  Alexander Barkov 2013-04-20 Adding mariadb-connect-engine-10.0 deb packa...
    Alexander Barkov 2013-04-19 Removing the connect engine from mariadb...

5 files changed, 53 insertions, 2 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 56ba509cfd7..c1e085bcc5c 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -235,3 +235,12 @@ Description: MariaDB database regression test suite (metapackage depending on th
  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.
+
+Package: mariadb-connect-engine-10.0
+Section: database
+Architecture: all
+Depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Description: Connect storage engine for MariaDB
+ Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
+ connections to ODBC tables and remote MySQL tables, as well as a number of
+ other interesting features.
diff --git a/debian/dist/Debian/mariadb-server-10.0.files b/debian/dist/Debian/mariadb-server-10.0.files
index 6cb4d764660..86522ac09ca 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files
+++ b/debian/dist/Debian/mariadb-server-10.0.files
@@ -1,4 +1,20 @@
-usr/lib/mysql/plugin/
+usr/lib/mysql/plugin/adt_null.so
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/auth_test_plugin.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/dialog_examples.so
+usr/lib/mysql/plugin/dialog.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/libdaemon_example.so
+usr/lib/mysql/plugin/mypluglib.so
+usr/lib/mysql/plugin/mysql_clear_password.so
+usr/lib/mysql/plugin/qa_auth_client.so
+usr/lib/mysql/plugin/qa_auth_interface.so
+usr/lib/mysql/plugin/qa_auth_server.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/libhsclient.so.*
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index d9d5d6fbe1b..093e2577299 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -229,3 +229,12 @@ Description: MariaDB database regression test suite (metapackage depending on th
  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.
+
+Package: mariadb-connect-engine-10.0
+Section: database
+Architecture: all
+Depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Description: Connect storage engine for MariaDB
+ Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
+ connections to ODBC tables and remote MySQL tables, as well as a number of
+ other interesting features.
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files b/debian/dist/Ubuntu/mariadb-server-10.0.files
index 6054ad2d1c5..161e89da8ac 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files
+++ b/debian/dist/Ubuntu/mariadb-server-10.0.files
@@ -1,4 +1,20 @@
-usr/lib/mysql/plugin/
+usr/lib/mysql/plugin/adt_null.so
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/auth_test_plugin.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/dialog_examples.so
+usr/lib/mysql/plugin/dialog.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/libdaemon_example.so
+usr/lib/mysql/plugin/mypluglib.so
+usr/lib/mysql/plugin/mysql_clear_password.so
+usr/lib/mysql/plugin/qa_auth_client.so
+usr/lib/mysql/plugin/qa_auth_interface.so
+usr/lib/mysql/plugin/qa_auth_server.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
 usr/share/apport/package-hooks/source_mariadb-10.0.py
diff --git a/debian/mariadb-connect-engine-10.0.files b/debian/mariadb-connect-engine-10.0.files
new file mode 100644
index 00000000000..f28377aea38
--- /dev/null
+++ b/debian/mariadb-connect-engine-10.0.files
@@ -0,0 +1 @@
+usr/lib/mysql/plugin/ha_connect.so