diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index ec725d419c2..d1aefdb53d6 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -15,7 +15,7 @@ set -e # Buildbot, running the test suite from installed .debs on a clean VM. export DEB_BUILD_OPTIONS="nocheck" -export MARIADB_OPTIONAL_DEBS="tokudb-engine" +export MARIADB_OPTIONAL_DEBS="tokudb-engine-10.0" # Find major.minor version. # diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 0fcdb843458..bccb85383d9 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -205,7 +205,7 @@ install: build rm -f $$autorm; \ ignore=''; \ for p in $$MARIADB_OPTIONAL_DEBS; do \ - p=mariadb-$$p-5.5; \ + p=mariadb-$$p; \ dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \ ignore="$$ignore --no-package=$$p"; \ done; \ diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index 5d81e39c5ec..202afb90583 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -210,7 +210,7 @@ install: build rm -f $$autorm; \ ignore=''; \ for p in $$MARIADB_OPTIONAL_DEBS; do \ - p=mariadb-$$p-5.5; \ + p=mariadb-$$p; \ dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \ ignore="$$ignore --no-package=$$p"; \ done; \ diff --git a/debian/mariadb-tokudb-engine-10.0.files b/debian/mariadb-tokudb-engine-10.0.files new file mode 100644 index 00000000000..a0690e6d1c2 --- /dev/null +++ b/debian/mariadb-tokudb-engine-10.0.files @@ -0,0 +1,5 @@ +etc/mysql/conf.d/tokudb.cnf +usr/bin/tokuftdump +usr/lib/mysql/plugin/ha_tokudb.so +usr/share/doc/mariadb-tokudb-engine-10.0/README-TOKUDB +usr/share/doc/mariadb-tokudb-engine-10.0/README.md diff --git a/debian/mariadb-tokudb-engine-5.5.files b/debian/mariadb-tokudb-engine-5.5.files deleted file mode 100644 index 2dc9f22d77a..00000000000 --- a/debian/mariadb-tokudb-engine-5.5.files +++ /dev/null @@ -1,5 +0,0 @@ -etc/mysql/conf.d/tokudb.cnf -usr/bin/tokuftdump -usr/lib/mysql/plugin/ha_tokudb.so -usr/share/doc/mariadb-tokudb-engine-5.5/README-TOKUDB -usr/share/doc/mariadb-tokudb-engine-5.5/README.md