Changeset: 7164b73a304d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7164b73a304d Modified Files: buildtools/ChangeLog.Aug2018 clients/Tests/MAL-signatures.stable.out debian/compat debian/control debian/fix-deb.sh debian/libmonetdb-client-dev.install debian/libmonetdb-client-odbc.install debian/libmonetdb-client10.install debian/libmonetdb-dev.install debian/libmonetdb-stream-dev.install debian/libmonetdb-stream11.install debian/libmonetdb17.install debian/libmonetdb5-server-bam.install debian/libmonetdb5-server-cfitsio.install debian/libmonetdb5-server-geom.install debian/libmonetdb5-server-lidar.install debian/monetdb-python2.install debian/monetdb-python3.install debian/monetdb-r.install debian/monetdb5-server-dev.install debian/monetdb5-server-hugeint.install debian/monetdb5-server.install debian/monetdb5-sql-hugeint.install debian/monetdb5-sql.install monetdb5/mal/mal_linker.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/vaults/shp/shp.c Branch: client-filetrans Log Message:
Merge with default branch. diffs (truncated from 581 to 300 lines): diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018 --- a/buildtools/ChangeLog.Aug2018 +++ b/buildtools/ChangeLog.Aug2018 @@ -1,3 +1,8 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Wed Oct 3 2018 Sjoerd Mullender <sjo...@acm.org> +- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package + cannot be built because of an incompatibility in the libbam library + (it cannot be used in a shared object. + diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -5,10 +5,10 @@ stdout of test 'MAL-signatures` in direc # 21:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33053" "--set" "mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" "mal_listing=2" "--set" "embedded_r=yes" # 21:44:50 > -# MonetDB 5 server v11.20.0 +# MonetDB 5 server v11.32.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Compiled for x86_64-unknown-linux-gnu/64bit # Found 15.386 GiB available main-memory. # Copyright (c) 1993 - July 2008 CWI. # Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved @@ -5511,26 +5511,50 @@ Ready. [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt], s:bat[:oid]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt], s:bat[:oid], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:flt], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int], s:bat[:oid]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int], s:bat[:oid], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:int], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng], s:bat[:oid]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng], s:bat[:oid], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:lng], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], s:bat[:oid]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], s:bat[:oid], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:any_1):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive" ] [ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:any_1, s:bat[:oid]):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive with candidates list" ] [ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:bat[:any_1]):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive" ] diff --git a/debian/compat b/debian/compat --- a/debian/compat +++ b/debian/compat @@ -1,1 +1,1 @@ -5 +9 diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: MonetDB BV <i...@monetdb.org Homepage: https://www.monetdb.org/ Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/ Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev, +Build-Depends: debhelper (>= 9), autotools-dev, bison, libatomic-ops-dev, libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), libpcre3-dev, libreadline-dev, liblzma-dev, libssl-dev, libxml2-dev, pkg-config, diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh --- a/debian/fix-deb.sh +++ b/debian/fix-deb.sh @@ -27,13 +27,23 @@ 0) echo "don't know what distro this is" exit 1 fi + ARCH=$(arch) ;; 1) # we're passed the name of the distribution SUITE=$1 + ARCH=$(arch) + ;; +2) + SUITE=$1 + ARCH=$2 ;; esac +if [[ $ARCH == i?86 ]]; then + ARCH=i386 # normalize +fi + case $SUITE in trusty) # fix control file because this system doesn't have liblas and a @@ -74,3 +84,27 @@ jessie | trusty) -e 's/python3=yes/python3=no/' debian/rules ;; esac + +case $SUITE in +cosmic) + # libbam is not available as a shared object (also true for older + # version) and this means that on 18.10 the libmonetdb5-server-bam + # package cannot be compiled on amd64 + sed -i -e 's/libbam-dev, //' \ + -e '/^Package: libmonetdb5-server-bam/,/^$/d' debian/control + sed -i '/samtools=yes/s/yes/no/' debian/rules + rm debian/libmonetdb5-server-bam.install + ;; +esac + +# debhelper compatibility 9 and support multiarch by using +# architecture-specific subdirectories in /usr/lib (and /lib); our +# code base is set up for amd64 (x86_64), so change to whatever +# architecture we're compiling for +case $ARCH in +x86_64 | amd64) + ;; +*) + sed -i "s/x86_64/$ARCH/g" debian/*.install + ;; +esac diff --git a/debian/libmonetdb-client-dev.install b/debian/libmonetdb-client-dev.install --- a/debian/libmonetdb-client-dev.install +++ b/debian/libmonetdb-client-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libmapi.so usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libmapi.so usr/lib/x86_64-linux-gnu debian/tmp/usr/include/monetdb/mapi.h usr/include/monetdb -debian/tmp/usr/lib/pkgconfig/monetdb-mapi.pc usr/lib/pkgconfig +debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-mapi.pc usr/lib/x86_64-linux-gnu/pkgconfig diff --git a/debian/libmonetdb-client-odbc.install b/debian/libmonetdb-client-odbc.install --- a/debian/libmonetdb-client-odbc.install +++ b/debian/libmonetdb-client-odbc.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libMonetODBC.so usr/lib -debian/tmp/usr/lib/libMonetODBCs.so usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libMonetODBC.so usr/lib/x86_64-linux-gnu +debian/tmp/usr/lib/x86_64-linux-gnu/libMonetODBCs.so usr/lib/x86_64-linux-gnu diff --git a/debian/libmonetdb-client10.install b/debian/libmonetdb-client10.install --- a/debian/libmonetdb-client10.install +++ b/debian/libmonetdb-client10.install @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/libmapi.so.* /usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libmapi.so.* /usr/lib/x86_64-linux-gnu diff --git a/debian/libmonetdb-dev.install b/debian/libmonetdb-dev.install --- a/debian/libmonetdb-dev.install +++ b/debian/libmonetdb-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/libbat.so usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libbat.so usr/lib/x86_64-linux-gnu debian/tmp/usr/include/monetdb/gdk*.h usr/include/monetdb debian/tmp/usr/include/monetdb/monet*.h usr/include/monetdb -debian/tmp/usr/lib/pkgconfig/monetdb-gdk.pc usr/lib/pkgconfig +debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-gdk.pc usr/lib/x86_64-linux-gnu/pkgconfig diff --git a/debian/libmonetdb-stream-dev.install b/debian/libmonetdb-stream-dev.install --- a/debian/libmonetdb-stream-dev.install +++ b/debian/libmonetdb-stream-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/libstream.so usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libstream.so usr/lib/x86_64-linux-gnu debian/tmp/usr/include/monetdb/stream.h usr/include/monetdb debian/tmp/usr/include/monetdb/stream_socket.h usr/include/monetdb -debian/tmp/usr/lib/pkgconfig/monetdb-stream.pc usr/lib/pkgconfig +debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-stream.pc usr/lib/x86_64-linux-gnu/pkgconfig diff --git a/debian/libmonetdb-stream11.install b/debian/libmonetdb-stream11.install --- a/debian/libmonetdb-stream11.install +++ b/debian/libmonetdb-stream11.install @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/libstream.so.* usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libstream.so.* usr/lib/x86_64-linux-gnu diff --git a/debian/libmonetdb17.install b/debian/libmonetdb17.install --- a/debian/libmonetdb17.install +++ b/debian/libmonetdb17.install @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/libbat.so.* usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libbat.so.* usr/lib/x86_64-linux-gnu diff --git a/debian/libmonetdb5-server-bam.install b/debian/libmonetdb5-server-bam.install --- a/debian/libmonetdb5-server-bam.install +++ b/debian/libmonetdb5-server-bam.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/monetdb5/autoload/*_bam.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/createdb/*_bam.sql usr/lib/monetdb5/createdb -debian/tmp/usr/lib/monetdb5/bam.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_bam.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_bam.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_bam.sql usr/lib/x86_64-linux-gnu/monetdb5/createdb +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/bam.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_bam.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/libmonetdb5-server-cfitsio.install b/debian/libmonetdb5-server-cfitsio.install --- a/debian/libmonetdb5-server-cfitsio.install +++ b/debian/libmonetdb5-server-cfitsio.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/monetdb5/autoload/*_fits.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/createdb/*_fits.sql usr/lib/monetdb5/createdb -debian/tmp/usr/lib/monetdb5/fits.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_fits.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_fits.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_fits.sql usr/lib/x86_64-linux-gnu/monetdb5/createdb +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/fits.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_fits.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/libmonetdb5-server-geom.install b/debian/libmonetdb5-server-geom.install --- a/debian/libmonetdb5-server-geom.install +++ b/debian/libmonetdb5-server-geom.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/monetdb5/autoload/*_geom.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/createdb/*_geom.sql usr/lib/monetdb5/createdb -debian/tmp/usr/lib/monetdb5/geom.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_geom.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_geom.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_geom.sql usr/lib/x86_64-linux-gnu/monetdb5/createdb +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/geom.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_geom.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/libmonetdb5-server-lidar.install b/debian/libmonetdb5-server-lidar.install --- a/debian/libmonetdb5-server-lidar.install +++ b/debian/libmonetdb5-server-lidar.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/monetdb5/autoload/*_lidar.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/createdb/*_lidar.sql usr/lib/monetdb5/createdb -debian/tmp/usr/lib/monetdb5/lidar.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_lidar.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_lidar.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_lidar.sql usr/lib/x86_64-linux-gnu/monetdb5/createdb +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lidar.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_lidar.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/monetdb-python2.install b/debian/monetdb-python2.install --- a/debian/monetdb-python2.install +++ b/debian/monetdb-python2.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/monetdb5/pyapi.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/autoload/??_pyapi.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/lib_pyapi.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/pyapi.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_pyapi.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_pyapi.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/monetdb-python3.install b/debian/monetdb-python3.install --- a/debian/monetdb-python3.install +++ b/debian/monetdb-python3.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/monetdb5/pyapi3.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/autoload/??_pyapi3.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/lib_pyapi3.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/pyapi3.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_pyapi3.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_pyapi3.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/monetdb-r.install b/debian/monetdb-r.install --- a/debian/monetdb-r.install +++ b/debian/monetdb-r.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/monetdb5/rapi.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/rapi.R usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/autoload/??_rapi.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/lib_rapi.so usr/lib/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/rapi.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/rapi.R usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_rapi.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_rapi.so usr/lib/x86_64-linux-gnu/monetdb5 diff --git a/debian/monetdb5-server-dev.install b/debian/monetdb5-server-dev.install --- a/debian/monetdb5-server-dev.install +++ b/debian/monetdb5-server-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libmonetdb5.so usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so usr/lib/x86_64-linux-gnu debian/tmp/usr/include/monetdb/mal*.h usr/include/monetdb -debian/tmp/usr/lib/pkgconfig/monetdb5.pc usr/lib/pkgconfig +debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb5.pc usr/lib/x86_64-linux-gnu/pkgconfig diff --git a/debian/monetdb5-server-hugeint.install b/debian/monetdb5-server-hugeint.install --- a/debian/monetdb5-server-hugeint.install +++ b/debian/monetdb5-server-hugeint.install @@ -1,5 +1,5 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
