Changeset: d4d124f10c3a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/d4d124f10c3a Branch: default Log Message:
Merge with Jan2022 branch. diffs (37 lines): diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -109,8 +109,7 @@ The following packages are optional: ``unixODBC-devel``, ``valgrind-devel``. On Ubuntu and Debian the following packages are required: -``bison``, ``cmake``, ``gcc``, ``libssl-dev``, ``pkg-config``, -``python3``. +``bison``, ``cmake``, ``gcc``, ``pkg-config``, ``python3``. The following packages are optional but recommended: ``libbz2-dev``, ``uuid-dev``, ``libpcre3-dev``, ``libreadline-dev``, diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Vcs-Hg: https://dev.monetdb.org/hg/Monet Build-Depends: debhelper (>= 9), cmake (>= 3.12), bison, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), libpcre3-dev, libreadline-dev, liblzma-dev, liblz4-dev (>= 1.8.0), - libssl-dev, libxml2-dev, pkg-config, + libxml2-dev, pkg-config, python3, python3-dev, python3-numpy, unixodbc-dev, uuid-dev, zlib1g-dev, r-base-dev, libcfitsio-dev diff --git a/geom/sql/conformance/Tests/All b/geom/sql/conformance/Tests/All --- a/geom/sql/conformance/Tests/All +++ b/geom/sql/conformance/Tests/All @@ -46,7 +46,7 @@ HAVE_GEOM?T44 HAVE_GEOM?T45 HAVE_GEOM?T46 HAVE_GEOM?T47 -HAVE_GEOM&GEOS_VERSION>=3.9?T48 +HAVE_GEOM&GEOS_VERSION>=3.9.1?T48 HAVE_GEOM&GEOS_VERSION>=3.9?T49 HAVE_GEOM?T50 HAVE_GEOM?T51 _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
