diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-06 17:43:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-06 17:43:02 +0200 |
| commit | 734510a44d690dfb94264e1d2775ee1cb6f3ebb9 (patch) | |
| tree | 0ccc317bf9462ca95cd1277b4ce65a7fda5fe315 /debian | |
| parent | 2465d3e00b2f18c7d4967f9bb10438883682787d (diff) | |
| parent | faf206a848684bc0f87c93a2b47a55063bbccc6c (diff) | |
| download | mariadb-git-734510a44d690dfb94264e1d2775ee1cb6f3ebb9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.4.install | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 1c72ad28a3d..7b518742d54 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -102,7 +102,7 @@ fi # AWS SDK also requires the build machine to have network access and git, so # it cannot be part of the base version included in Linux distros, but a pure # custom built plugin. -if [[ $GCCVERSION -gt 40800 ]] && [[ ! $TRAVIS ]] && wget --timeout 15 --tries 1 --quiet --output-document /dev/null https://github.com/ +if [[ $GCCVERSION -gt 40800 ]] && [[ ! $TRAVIS ]] && [[ -x "$(command -v git)" ]] && timeout 3s bash -c 'sed -n q </dev/tcp/github.com/22' then cat <<EOF >> debian/control diff --git a/debian/control b/debian/control index c990f4cfe5a..1588ade9153 100644 --- a/debian/control +++ b/debian/control @@ -594,7 +594,7 @@ Description: OQGraph storage engine for MariaDB Package: mariadb-plugin-tokudb Architecture: amd64 -Depends: libjemalloc1 (>= 3.0.0~), +Depends: libjemalloc1 (>= 3.0.0~) | libjemalloc2, mariadb-server-10.4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/mariadb-server-10.4.install b/debian/mariadb-server-10.4.install index f115b212c98..e0f83fbe95b 100644 --- a/debian/mariadb-server-10.4.install +++ b/debian/mariadb-server-10.4.install @@ -36,8 +36,6 @@ usr/bin/wsrep_sst_common usr/bin/wsrep_sst_mariabackup usr/bin/wsrep_sst_mysqldump usr/bin/wsrep_sst_rsync -usr/bin/wsrep_sst_xtrabackup -usr/bin/wsrep_sst_xtrabackup-v2 usr/lib/mysql/plugin/auth_ed25519.so usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool |