Merged with lp:maria revision #3766

4 files changed, 8 insertions, 6 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index c1e085bcc5c..998c9d710eb 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -204,7 +204,7 @@ Description: MariaDB database server binaries
 Package: mariadb-server
 Section: database
 Architecture: all
-Depends: mariadb-server-10.0, ${misc:Depends}
+Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-server (currently mariadb-server-10.0), as determined by the MariaDB
@@ -220,7 +220,7 @@ Description: MariaDB database server (metapackage depending on the latest versio
 Package: mariadb-client
 Section: database
 Architecture: all
-Depends: mariadb-client-10.0, ${misc:Depends}
+Depends: mariadb-client-10.0 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-client (currently mariadb-client-10.0), as determined by the MariaDB
@@ -230,7 +230,7 @@ Description: MariaDB database client (metapackage depending on the latest versio
 Package: mariadb-test
 Section: database
 Architecture: all
-Depends: mariadb-test-10.0
+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
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in
index 1f1132ea4fa..e56a5894b3f 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files.in
+++ b/debian/dist/Debian/mariadb-server-10.0.files.in
@@ -81,3 +81,4 @@ usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
 @OQGRAPH_DEB_FILES@
+@SPIDER_DEB_FILES@
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 093e2577299..228498c1015 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -198,7 +198,7 @@ Description: MariaDB database server binaries
 Package: mariadb-server
 Section: database
 Architecture: all
-Depends: mariadb-server-10.0, ${misc:Depends}
+Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-server (currently mariadb-server-10.0), as determined by the MariaDB
@@ -214,7 +214,7 @@ Description: MariaDB database server (metapackage depending on the latest versio
 Package: mariadb-client
 Section: database
 Architecture: all
-Depends: mariadb-client-10.0, ${misc:Depends}
+Depends: mariadb-client-10.0 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-client (currently mariadb-client-10.0), as determined by the MariaDB
@@ -224,7 +224,7 @@ Description: MariaDB database client (metapackage depending on the latest versio
 Package: mariadb-test
 Section: database
 Architecture: all
-Depends: mariadb-test-10.0
+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
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in
index 565405adb6f..c0e67d617d9 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in
+++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in
@@ -83,3 +83,4 @@ usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
 @OQGRAPH_DEB_FILES@
+@SPIDER_DEB_FILES@