diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2020-03-17 21:31:37 +0200 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <vicentiu@mariadb.org> | 2020-03-18 22:49:55 +0200 |
| commit | 30b44aaec7120f41ee1383536730947cfa427308 (patch) | |
| tree | 5a06dcb6402e17a773a6a85a5fd14970377bd1ed /.travis.yml | |
| parent | 0f8d6e3bd8adb76de1be8f67bbf4a8585bbe3653 (diff) | |
| download | mariadb-git-30b44aaec7120f41ee1383536730947cfa427308.tar.gz | |
Deb: Fix executable bit so dh-exec works (regression in fd2dc9c3fdfb7)
Package contents before this fix:
libmariadb-dev-compat
drwxr-xr-x root/root ./
drwxr-xr-x root/root ./usr/
drwxr-xr-x root/root ./usr/bin/
lrwxrwxrwx root/root ./usr/bin/mysql_config
drwxr-xr-x root/root ./usr/include/
lrwxrwxrwx root/root ./usr/include/mysql
drwxr-xr-x root/root ./usr/lib/
drwxr-xr-x root/root ./usr/lib/${DEB_HOST_MULTIARCH}/
drwxr-xr-x root/root ./usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
lrwxrwxrwx root/root ./usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc
drwxr-xr-x root/root ./usr/lib/x86_64-linux-gnu/
lrwxrwxrwx root/root ./usr/lib/x86_64-linux-gnu/libmysqlclient.a
lrwxrwxrwx root/root ./usr/lib/x86_64-linux-gnu/libmysqlclient_r.a
lrwxrwxrwx root/root ./usr/lib/x86_64-linux-gnu/libmysqlclient_r.so
lrwxrwxrwx root/root ./usr/lib/x86_64-linux-gnu/libmysqlclient.so
drwxr-xr-x root/root ./usr/share/
drwxr-xr-x root/root ./usr/share/doc/
drwxr-xr-x root/root ./usr/share/doc/libmariadb-dev-compat/
-rw-r--r-- root/root ./usr/share/doc/libmariadb-dev-compat/changelog.gz
-rw-r--r-- root/root ./usr/share/doc/libmariadb-dev-compat/copyright
With this fix the '/usr/lib/${DEB_HOST_MULTIARCH}/' becomes correctly
populated with the actual architecture dependent path.
Also add dh-exec to Travis-CI testing so that CI passes.
As an extra small thing, clean away excess executable bit from Mroonga
plugin maintainer script that does not need it.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index b428950bdc5..4edcdcc748c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,7 @@ matrix: addons: apt: sources: *add-sources - packages: [ *common-packages, debhelper, dh-apparmor, dpatch, po-debconf, libzmq-dev, libdistro-info-perl, devscripts, fakeroot, dh-systemd, libsystemd-dev, libzstd-dev, unixodbc-dev] # make sure these match debian/control contents + packages: [ *common-packages, debhelper, dh-apparmor, dh-exec, dpatch, po-debconf, libzmq-dev, libdistro-info-perl, devscripts, fakeroot, dh-systemd, libsystemd-dev, libzstd-dev, unixodbc-dev] # make sure these match debian/control contents script: - ${CC} --version ; ${CXX} --version - env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh; @@ -99,7 +99,7 @@ matrix: addons: apt: sources: *add-sources - packages: [ *common-packages, debhelper, dh-apparmor, dpatch, po-debconf, libzmq3-dev, libdistro-info-perl, devscripts, fakeroot, dh-systemd, libsystemd-dev, libzstd-dev, unixodbc-dev] # make sure these match debian/control contents + packages: [ *common-packages, debhelper, dh-apparmor, dh-exec, dpatch, po-debconf, libzmq3-dev, libdistro-info-perl, devscripts, fakeroot, dh-systemd, libsystemd-dev, libzstd-dev, unixodbc-dev] # make sure these match debian/control contents script: - ${CC} --version ; ${CXX} --version - env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh; |