bzr merge -rtag:mariadb-5.5.40 maria/5.5

2 files changed, 12 insertions, 10 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index e82da9ed4ca..3e1e9f6bef8 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -9,7 +9,7 @@ Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28),
     zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-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
+    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/5.5/files
@@ -39,10 +39,11 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
-    ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10),
-    libmariadbclient18 (>= ${binary:Version}), galera (>=25.2),
-    rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl,
+         perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc,
+         passwd, lsb-base (>= 3.0-10), bsdutils,
+         libmariadbclient18 (>= ${binary:Version}), galera (>=25.2),
+         rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server, virtual-mysql-server, mariadb-galera-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index e461ea4d8e5..c93b3c39fb9 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -9,7 +9,7 @@ Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28),
     zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-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
+    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/5.5/files
@@ -39,10 +39,11 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6),
-    ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10),
-    libmariadbclient18 (>= ${binary:Version}), galera (>=25.2),
-    rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl,
+         perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc,
+         passwd, lsb-base (>= 3.0-10), bsdutils,
+         libmariadbclient18 (>= ${binary:Version}), galera (>=25.2),
+         rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server, virtual-mysql-server, mariadb-galera-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,