Bas Couwenberg pushed to branch master at Debian GIS Project / osmcoastline
Commits: 7ee85912 by Bas Couwenberg at 2021-08-24T20:15:25+02:00 Replace GEOS 3.9.1 patch with upstream changes. - - - - - 4 changed files: - debian/changelog - + debian/patches/0001-Make-test-slightly-more-forgiving.patch - − debian/patches/geos-3.9.1.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +osmcoastline (2.3.0-3) UNRELEASED; urgency=medium + + * Replace GEOS 3.9.1 patch with upstream changes. + + -- Bas Couwenberg <[email protected]> Tue, 24 Aug 2021 20:15:06 +0200 + osmcoastline (2.3.0-2) unstable; urgency=medium * Update watch file for GitHub URL changes. ===================================== debian/patches/0001-Make-test-slightly-more-forgiving.patch ===================================== @@ -0,0 +1,37 @@ +Description: Make test slightly more forgiving + Since GEOS 3.9.1 something changed in the internals which leads to the + test failing. But the test is still testing the thing it should test + correctly, so this is okay here. +Author: Jochen Topf <[email protected]> +Origin: https://github.com/osmcode/osmcoastline/commit/f45a41b2031ae0ff0e75d78135ba9d15b0e4d6e0 +Bug: https://github.com/osmcode/osmcoastline/issues/40 +Bug-Debian: https://bugs.debian.org/992531 + +--- a/test/init.sh ++++ b/test/init.sh +@@ -15,3 +15,7 @@ check_count() { + test `echo "SELECT count(*) FROM $1;" | $SQL` -eq $2 + } + ++check_count_with_op() { ++ test `echo "SELECT count(*) FROM $1;" | $SQL` $2 $3 ++} ++ +--- a/test/t/invalid-self-intersection-on-open-ring.sh ++++ b/test/t/invalid-self-intersection-on-open-ring.sh +@@ -34,12 +34,13 @@ test $RC -eq 2 + + grep 'Self-intersection at or near point' $LOG + +-grep '^There were 2 warnings.$' $LOG ++grep '^There were [12] warnings.$' $LOG + grep '^There were 1 errors.$' $LOG + + check_count land_polygons 1; + check_count error_points 3; +-check_count error_lines 2; ++check_count_with_op error_lines -ge 1; ++check_count_with_op error_lines -le 2; + + echo "SELECT AsText(geometry), osm_id, error FROM error_points;" | $SQL >$DUMP + ===================================== debian/patches/geos-3.9.1.patch deleted ===================================== @@ -1,17 +0,0 @@ -Description: Skip test which fails with GEOS 3.9.1. -Author: Bas Couwenberg <[email protected]> -Bug: https://github.com/osmcode/osmcoastline/issues/40 -Bug-Debian: https://bugs.debian.org/992531 - ---- a/test/t/invalid-self-intersection-on-open-ring.sh -+++ b/test/t/invalid-self-intersection-on-open-ring.sh -@@ -9,6 +9,9 @@ - - set -x - -+# Skip test, fails with GEOS 3.9.1. -+exit 0 -+ - #----------------------------------------------------------------------------- - - ${BIN_DIR}/src/nodegrid2opl << 'NODES' >$INPUT ===================================== debian/patches/series ===================================== @@ -1 +1 @@ -geos-3.9.1.patch +0001-Make-test-slightly-more-forgiving.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/osmcoastline/-/commit/7ee859129921b98ca7477c899b7dc127a45f78c7 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/osmcoastline/-/commit/7ee859129921b98ca7477c899b7dc127a45f78c7 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
