Merge tag 'mariadb-10.0.20' into 10.0-galera

2 files changed, 48 insertions, 28 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 47a53ed8801..39d8bcd7130 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28),
-    libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
-    zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev,
-    psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base,
-    ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper,
-    ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV},
+               libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
+               dpatch, gawk, bison, lsb-release, hardening-wrapper,
+               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.3
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -50,18 +50,28 @@ Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5,
           mysql-server-core-10.0, mariadb-server, mysql-server,
           virtual-mysql-server, mariadb-galera-server
 Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
+    mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.5, mysql-server-core-5.5,
     mariadb-server-core-10.0,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
+    mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.5, mysql-server-core-5.5,
     mariadb-server-core-10.0,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Description: MariaDB database server with Galera cluster binaries
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 8dc2551be2b..0c0a966ad85 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28),
-    libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
-    zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev,
-    psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base,
-    ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper,
-    ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV},
+               libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
+               dpatch, gawk, bison, lsb-release, hardening-wrapper,
+               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -50,18 +50,28 @@ Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5,
           mysql-server-core-10.0, mariadb-server, mysql-server,
           virtual-mysql-server, mariadb-galera-server
 Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
+    mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.5, mysql-server-core-5.5,
     mariadb-server-core-10.0,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
+    mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.5, mysql-server-core-5.5,
     mariadb-server-core-10.0,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Description: MariaDB database server with Galera cluster binaries