diff options
Diffstat (limited to 'debian/autobake-deb.sh')
| -rwxr-xr-x | debian/autobake-deb.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 4dba4de26b7..7d2301c7369 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -16,11 +16,11 @@ export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS" if [[ $TRAVIS ]] then # On Travis-CI, the log must stay under 4MB so make the build less verbose - sed -i -e '/Add support for verbose builds/,+2d' debian/rules + sed -i -e '/Add support for verbose builds/,/^$/d' debian/rules # Don't include test suite package on Travis-CI to make the build time shorter sed '/Package: mariadb-test-data/,/^$/d' -i debian/control - sed '/Package: mariadb-test/,/^$/d' -i debian/control + sed '/Package: mariadb-test$/,/^$/d' -i debian/control # Don't build the test package at all to save time and disk space sed 's|DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test|DINSTALL_MYSQLTESTDIR=false|' -i debian/rules @@ -67,9 +67,9 @@ then sed 's/ --with systemd//' -i debian/rules sed '/systemd/d' -i debian/rules sed '/\.service/d' -i debian/rules - sed '/galera_new_cluster/d' -i debian/mariadb-server-10.3.install - sed '/galera_recovery/d' -i debian/mariadb-server-10.3.install - sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.3.install + sed '/galera_new_cluster/d' -i debian/mariadb-server-10.4.install + sed '/galera_recovery/d' -i debian/mariadb-server-10.4.install + sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.4.install fi # If libzstd-dev is not available (before Debian Stretch and Ubuntu Xenial) @@ -113,7 +113,7 @@ then sed -i -e "/Package: mariadb-plugin-mroonga/,/^$/d" debian/control sed -i -e "/Package: mariadb-plugin-spider/,/^$/d" debian/control sed -i -e "/Package: mariadb-plugin-oqgraph/,/^$/d" debian/control - sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.3.install + sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.4.install sed -i -e "/Package: libmariadbd-dev/,/^$/d" debian/control fi |