Matteo F. Vescovi pushed to branch master at Debian GIS Project / postgis
Commits: e5059026 by Matteo F. Vescovi at 2021-03-19T23:59:15+01:00 debian/patches/: patchset refreshed and updated - fix-pj-get-release-error.patch added Closes: #983256 - - - - - ea73b576 by Matteo F. Vescovi at 2021-03-20T14:08:29+01:00 debian/changelog: new revision entry added Gbp-Dch: Ignore - - - - - 6 changed files: - debian/changelog - debian/patches/chaikin - + debian/patches/fix-pj-get-release-error.patch - debian/patches/incorrect-path-for-interpreter.patch - debian/patches/relax-test-timing-constraints.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +postgis (3.1.1+dfsg-2) UNRELEASED; urgency=medium + + * Team upload. + + [ Matteo F. Vescovi ] + * debian/patches/: patchset refreshed and updated + - fix-pj-get-release-error.patch added (Closes: #983256) + + -- Matteo F. Vescovi <[email protected]> Sat, 20 Mar 2021 14:07:36 +0100 + postgis (3.1.1+dfsg-1) unstable; urgency=medium [ Christoph Berg ] ===================================== debian/patches/chaikin ===================================== @@ -1,11 +1,20 @@ -Description: Revert chaikin tests failing on ppc64el. - Work around https://trac.osgeo.org/postgis/ticket/4533 -Author: Christoph Berg <[email protected]> +From: Christoph Berg <[email protected]> +Date: Fri, 19 Mar 2021 23:27:00 +0100 +Subject: Revert chaikin tests failing on ppc64el. + Bug: https://trac.osgeo.org/postgis/ticket/4533 +Work around https://trac.osgeo.org/postgis/ticket/4533 +--- + regress/core/chaikin.sql | 7 ------- + regress/core/chaikin_expected | 1 - + 2 files changed, 8 deletions(-) + +diff --git a/regress/core/chaikin.sql b/regress/core/chaikin.sql +index 8bcd067..f799c71 100644 --- a/regress/core/chaikin.sql +++ b/regress/core/chaikin.sql -@@ -4,10 +4,3 @@ SELECT '3', ST_astext(ST_ChaikinSmoothin +@@ -4,10 +4,3 @@ SELECT '3', ST_astext(ST_ChaikinSmoothing('LINESTRING(0 0, 8 8, 0 16)',0)); SELECT '4', ST_astext(ST_ChaikinSmoothing('LINESTRING(0 0, 8 8, 0 16)',2)); SELECT '5', ST_astext(ST_ChaikinSmoothing('POINT(0 0)')); SELECT '6', ST_astext(ST_ChaikinSmoothing('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING(1 1, 1 3, 1 5), POLYGON((5 5, 5 10, 10 10, 10 5, 5 5), (6 6, 6 7, 7 7, 7 6, 6 6 )))', 2, 't')); @@ -17,9 +26,11 @@ Bug: https://trac.osgeo.org/postgis/ticket/4533 -) -SELECT '7', ST_AsText(g) as geometry, postgis_getbbox(g) AS box from geom; \ No newline at end of file +diff --git a/regress/core/chaikin_expected b/regress/core/chaikin_expected +index b6f2d34..b4d19f2 100644 --- a/regress/core/chaikin_expected +++ b/regress/core/chaikin_expected -@@ -4,4 +4,3 @@ ERROR: Number of iterations must be bet +@@ -4,4 +4,3 @@ ERROR: Number of iterations must be between 1 and 5 : LWGEOM_ChaikinSmoothing 4|LINESTRING(0 0,4.5 4.5,6 7,6 9,4.5 11.5,0 16) 5|POINT(0 0) 6|GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(1 1,1 2.125,1 2.75,1 3.25,1 3.875,1 5),POLYGON((5 5,5 7.8125,5.3125 9.0625,5.9375 9.6875,6.875 10,8.125 10,9.0625 9.6875,9.6875 9.0625,10 8.125,10 6.875,9.6875 5.9375,9.0625 5.3125,7.8125 5,5 5),(6 6,6 6.5625,6.0625 6.8125,6.1875 6.9375,6.375 7,6.625 7,6.8125 6.9375,6.9375 6.8125,7 6.625,7 6.375,6.9375 6.1875,6.8125 6.0625,6.5625 6,6 6))) ===================================== debian/patches/fix-pj-get-release-error.patch ===================================== @@ -0,0 +1,32 @@ +From: Paul Ramsey <[email protected]> +Date: Fri, 19 Mar 2021 23:29:22 +0100 +Subject: fix_pj_get_release_error + +Closes: #983256 +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1bc6cca..0712658 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -902,12 +902,15 @@ AC_SUBST([PROJ_LDFLAGS]) + dnl Ensure we can link against libproj + LIBS_SAVE="$LIBS" + LIBS="$PROJ_LDFLAGS" +-AC_CHECK_LIB([proj], [pj_get_release], +- [], +- [AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ installation using --with-projdir])], ++AC_CHECK_LIB([proj], [pj_get_release], [], ++ [AC_CHECK_LIB([proj], [proj_info], [], ++ [AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ installation using --with-projdir])], ++ [] ++ )], + []) + LIBS="$LIBS_SAVE" + ++ + dnl =========================================================================== + dnl Detect if json-c installed + dnl =========================================================================== ===================================== debian/patches/incorrect-path-for-interpreter.patch ===================================== @@ -1,7 +1,14 @@ -Description: Fix incorrect-path-for-interpreter issue. -Author: Bas Couwenberg <[email protected]> +From: Bas Couwenberg <[email protected]> +Date: Fri, 19 Mar 2021 23:27:00 +0100 +Subject: Fix incorrect-path-for-interpreter issue. + Forwarded: not-needed +--- + utils/postgis_restore.pl.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in +index 8498c54..fdf437a 100644 --- a/utils/postgis_restore.pl.in +++ b/utils/postgis_restore.pl.in @@ -1,4 +1,4 @@ ===================================== debian/patches/relax-test-timing-constraints.patch ===================================== @@ -1,10 +1,20 @@ -Description: Relax timing constraints for some tests. - With a statement_timeout of 100ms, increase the allowed _timecheck interval - from 200ms or 250ms to 500ms. This should increase chances of tests passing - even on busy or slow systems. -Author: Markus Wanner <[email protected]> +From: Markus Wanner <[email protected]> +Date: Fri, 19 Mar 2021 23:27:00 +0100 +Subject: Relax timing constraints for some tests. + Forwarded: not-needed +With a statement_timeout of 100ms, increase the allowed _timecheck interval +from 200ms or 250ms to 500ms. This should increase chances of tests passing +even on busy or slow systems. +--- + regress/core/interrupt.sql | 2 +- + regress/core/interrupt_buffer.sql | 2 +- + regress/core/interrupt_relate.sql | 16 ++++++++-------- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/regress/core/interrupt.sql b/regress/core/interrupt.sql +index e44c760..b5d52b1 100644 --- a/regress/core/interrupt.sql +++ b/regress/core/interrupt.sql @@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE; @@ -16,9 +26,11 @@ Forwarded: not-needed SET statement_timeout TO 0; -- Not affected by old timeout SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2)); +diff --git a/regress/core/interrupt_buffer.sql b/regress/core/interrupt_buffer.sql +index e45db0c..2cbf1e3 100644 --- a/regress/core/interrupt_buffer.sql +++ b/regress/core/interrupt_buffer.sql -@@ -36,7 +36,7 @@ select ST_Buffer(g,100) from _inputs WHE +@@ -36,7 +36,7 @@ select ST_Buffer(g,100) from _inputs WHERE id = 1; --( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo; -- it may take some more to interrupt st_buffer, see -- https://travis-ci.org/postgis/postgis/builds/40211116#L2222-L2223 @@ -27,9 +39,11 @@ Forwarded: not-needed -- Not affected by old timeout SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1)); +diff --git a/regress/core/interrupt_relate.sql b/regress/core/interrupt_relate.sql +index 0fd2b47..2a13204 100644 --- a/regress/core/interrupt_relate.sql +++ b/regress/core/interrupt_relate.sql -@@ -34,29 +34,29 @@ UPDATE _time SET t = now(); -- reset tim +@@ -34,29 +34,29 @@ UPDATE _time SET t = now(); -- reset time as creating tables spends some SET statement_timeout TO 100; select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ relax-test-timing-constraints.patch chaikin incorrect-path-for-interpreter.patch +fix-pj-get-release-error.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/74b15bae8f134f9a6777f11da5fa1fe77cbb4ea5...ea73b57673bde282549ab1ac7e39d3c588c551ea -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/74b15bae8f134f9a6777f11da5fa1fe77cbb4ea5...ea73b57673bde282549ab1ac7e39d3c588c551ea You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
