bzr merge -rtag:mariadb-10.0.15 maria/10.0

1 files changed, 8 insertions, 5 deletions

diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 5799d107d7a..7a6aae756a2 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -41,11 +41,14 @@ 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-10.0 (>= ${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
-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
+Depends: mariadb-client-10.0 (>= ${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-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,