Changeset: 591c3e46a126 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=591c3e46a126 Modified Files: 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 Branch: default Log Message:
Upgrade debhelper compatibility to level 9. This means that we now use architecture-specific subdirectories in /usr/lib. diffs (truncated from 335 to 300 lines): 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 @@ -86,3 +96,15 @@ cosmic) 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 @@ -# usr/lib/monetdb5/*_hge.mal EXCEPT: sql*_hge.mal -debian/tmp/usr/lib/monetdb5/[!s]*_hge.mal usr/lib/monetdb5 +# usr/lib/x86_64-linux-gnu/monetdb5/*_hge.mal EXCEPT: sql*_hge.mal +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/[!s]*_hge.mal usr/lib/x86_64-linux-gnu/monetdb5 -# usr/lib/monetdb5/autoload/*_hge.mal EXCEPT: ??_sql_hge.mal -debian/tmp/usr/lib/monetdb5/autoload/[0-9][0-9]_[!s]*_hge.mal +# usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_hge.mal EXCEPT: ??_sql_hge.mal +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/[0-9][0-9]_[!s]*_hge.mal diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install --- a/debian/monetdb5-server.install +++ b/debian/monetdb5-server.install @@ -1,30 +1,30 @@ debian/tmp/usr/bin/mserver5 usr/bin -debian/tmp/usr/lib/libmonetdb5.so.* usr/lib +debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so.* usr/lib/x86_64-linux-gnu -# usr/lib/monetdb5/lib_*.so EXCEPT: lib_{bam,geom,gsl,lidar,pyapi,rapi,sql}.so -debian/tmp/usr/lib/monetdb5/lib_capi.so usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_generator.so usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5 +# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT: lib_{bam,geom,gsl,lidar,pyapi,rapi,sql}.so +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_generator.so usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_opt_sql_append.so usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_udf.so usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_vault.so usr/lib/x86_64-linux-gnu/monetdb5 -# usr/lib/monetdb5/*.mal EXCEPT: {bam,geom,gsl,lidar,pyapi,rapi,sql*,*_hge}.mal -debian/tmp/usr/lib/monetdb5/[!bglprsu]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/ba[!m]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/b[!a]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/generator.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/g[!es]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/l[!i]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/p[!y]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/r[!a]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/s[!q]*.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/udf.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/u[!d]*.mal usr/lib/monetdb5 +# usr/lib/x86_64-linux-gnu/monetdb5/*.mal EXCEPT: {bam,geom,gsl,lidar,pyapi,rapi,sql*,*_hge}.mal +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/[!bglprsu]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/ba[!m]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/b[!a]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/generator.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/g[!es]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/l[!i]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/p[!y]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/r[!a]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/s[!q]*.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/udf.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/u[!d]*.mal usr/lib/x86_64-linux-gnu/monetdb5 -# usr/lib/monetdb5/autoload/*.mal EXCEPT: *_{bam,geom,gsl,hge,lidar,pyapi,rapi,sql}.mal -debian/tmp/usr/lib/monetdb5/autoload/??_batcalc.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/autoload/??_calc.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/autoload/??_generator.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/autoload/??_opt_sql_append.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/autoload/??_udf.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/autoload/??_vault.mal usr/lib/monetdb5/autoload +# usr/lib/x86_64-linux-gnu/monetdb5/autoload/*.mal EXCEPT: *_{bam,geom,gsl,hge,lidar,pyapi,rapi,sql}.mal +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_batcalc.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_calc.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_generator.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_opt_sql_append.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_udf.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_vault.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload diff --git a/debian/monetdb5-sql-hugeint.install b/debian/monetdb5-sql-hugeint.install --- a/debian/monetdb5-sql-hugeint.install +++ b/debian/monetdb5-sql-hugeint.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/monetdb5/sql*_hge.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/autoload/??_sql_hge.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/createdb/*_hge.sql usr/lib/monetdb5/createdb +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql*_hge.mal usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_sql_hge.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_hge.sql usr/lib/x86_64-linux-gnu/monetdb5/createdb diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install --- a/debian/monetdb5-sql.install +++ b/debian/monetdb5-sql.install @@ -1,25 +1,25 @@ debian/tmp/usr/bin/monetdbd usr/bin debian/tmp/usr/bin/monetdb usr/bin -debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/autoload/??_sql.mal usr/lib/monetdb5/autoload +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/*.sql usr/lib/x86_64-linux-gnu/monetdb5 +debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_sql.mal usr/lib/x86_64-linux-gnu/monetdb5/autoload debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system debian/tmp/etc/logrotate.d/monetdbd etc/logrotate.d _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
