diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
| commit | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch) | |
| tree | 5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /debian | |
| parent | 0bb30f3603b519780eaf3fe0527b1c6af285229a (diff) | |
| parent | 33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff) | |
| download | mariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/mariadb-test-10.2.dirs | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 35d6c298071..8fa4b6e5a33 100644 --- a/debian/control +++ b/debian/control @@ -316,7 +316,7 @@ Description: MariaDB database regression test suite Package: mariadb-server-10.2 Architecture: any -Suggests: mailx, mariadb-test, netcat-openbsd, socat, tinyca +Suggests: mailx, mariadb-test, netcat-openbsd, tinyca Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: bsdutils, @@ -335,6 +335,7 @@ Depends: bsdutils, perl (>= 5.6), psmisc, rsync, + socat, tar, ${misc:Depends}, ${shlibs:Depends} @@ -415,10 +416,10 @@ Description: MariaDB database regression test suite (metapackage for the latest Package: mariadb-connect-engine-10.2 Architecture: any -Depends: libxml2, mariadb-server-10.2, unixODBC +Depends: libxml2, mariadb-server-10.2, unixodbc Build-Depends: libxml2-dev, mariadb-server-10.2, - unixODBC-dev, + unixodbc-dev, ${misc:Depends}, ${shlibs:Depends} Description: Connect storage engine for MariaDB diff --git a/debian/mariadb-test-10.2.dirs b/debian/mariadb-test-10.2.dirs index 1a488d98195..b21c5b780f7 100644 --- a/debian/mariadb-test-10.2.dirs +++ b/debian/mariadb-test-10.2.dirs @@ -44,8 +44,6 @@ usr/share/mysql/mysql-test/suite/jp/r usr/share/mysql/mysql-test/suite/jp/include usr/share/mysql/mysql-test/suite/jp/std_data usr/share/mysql/mysql-test/suite/maria -usr/share/mysql/mysql-test/suite/maria/t -usr/share/mysql/mysql-test/suite/maria/r usr/share/mysql/mysql-test/suite/funcs_2 usr/share/mysql/mysql-test/suite/funcs_2/lib usr/share/mysql/mysql-test/suite/funcs_2/t |