[Git][debian-gis-team/spatialindex][experimental] 4 commits: Update Vcs-* URLs for renamed repository matching source package name.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon May 20 08:28:50 BST 2024
Bas Couwenberg pushed to branch experimental at Debian GIS Project / spatialindex
Commits:
c3002bdd by Bas Couwenberg at 2024-05-20T07:57:06+02:00
Update Vcs-* URLs for renamed repository matching source package name.
- - - - -
0a0c86f2 by Bas Couwenberg at 2024-05-20T07:57:43+02:00
Allow reprepro to fail.
- - - - -
2e6b6eb1 by Bas Couwenberg at 2024-05-20T09:18:24+02:00
Add patch to use non-zero exit status for failures in index-tests scripts.
- - - - -
e6457751 by Bas Couwenberg at 2024-05-20T09:25:32+02:00
Remove generated files in clean target.
- - - - -
7 changed files:
- debian/.gitlab-ci.yml
- debian/changelog
- + debian/clean
- debian/control
- + debian/patches/index-tests.patch
- + debian/patches/series
- debian/rules
Changes:
=====================================
debian/.gitlab-ci.yml
=====================================
@@ -4,3 +4,6 @@ include:
variables:
SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1
+
+reprepro:
+ allow_failure: true
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+spatialindex (2.0.0~a1-1~exp2) UNRELEASED; urgency=medium
+
+ * Update Vcs-* URLs for renamed repository matching source package name.
+ * Add patch to use non-zero exit status for failures in index-tests scripts.
+ * Remove generated files in clean target.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 20 May 2024 07:56:35 +0200
+
spatialindex (2.0.0~a1-1~exp1) experimental; urgency=medium
* New upstream alpha release.
=====================================
debian/clean
=====================================
@@ -0,0 +1,8 @@
+test/*/test*/a
+test/*/test*/b
+test/*/test*/core
+test/*/test*/data
+test/*/test*/queries
+test/*/test*/res
+test/*/test*/res2
+test/*/test*/tree.*
=====================================
debian/control
=====================================
@@ -9,8 +9,8 @@ Build-Depends: debhelper-compat (= 13),
cmake,
pkg-kde-tools
Standards-Version: 4.6.2
-Vcs-Browser: https://salsa.debian.org/debian-gis-team/libspatialindex
-Vcs-Git: https://salsa.debian.org/debian-gis-team/libspatialindex.git -b experimental
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/spatialindex
+Vcs-Git: https://salsa.debian.org/debian-gis-team/spatialindex.git -b experimental
Homepage: https://libspatialindex.org/
Rules-Requires-Root: no
=====================================
debian/patches/index-tests.patch
=====================================
@@ -0,0 +1,258 @@
+Description: Use non-zero exit status for failed tests.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/libspatialindex/libspatialindex/issues/244
+
+--- a/test/geometry/test1/run
++++ b/test/geometry/test1/run
+@@ -1,8 +1,11 @@
+ #! /bin/bash
+
++set -e
++
+ echo Testing Intersection
+ if test-geometry-Intersection ; then
+ echo "Intersection Test Passed"
+ else
+ echo "Intersection Test Failed"
++ exit 1
+ fi
+--- a/test/mvrtree/test1/run
++++ b/test/mvrtree/test1/run
+@@ -1,4 +1,7 @@
+ #! /bin/bash
++
++set -e
++
+ echo Generating dataset
+ test-mvrtree-Generator 1000 > d
+ awk '{if ($2 != 2) print $0}' < d > data
+@@ -18,11 +21,13 @@ test-mvrtree-Exhaustive .t intersection
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 .t tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 .t tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+--- a/test/mvrtree/test2/run
++++ b/test/mvrtree/test2/run
+@@ -1,5 +1,7 @@
+ #! /bin/bash
+
++set -e
++
+ echo Generating dataset
+ test-mvrtree-Generator 1000 > mix
+
+@@ -12,11 +14,13 @@ test-mvrtree-Exhaustive mix intersection
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+--- a/test/rtree/test1/run
++++ b/test/rtree/test1/run
+@@ -1,5 +1,7 @@
+ #! /bin/bash
+
++set -e
++
+ echo Generating dataset
+ test-rtree-Generator 10000 100 > d
+ awk '{if ($1 != 2) print $0}' < d > data
+@@ -19,11 +21,13 @@ test-rtree-Exhaustive .t 10NN > res2
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 .t tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 .t tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+--- a/test/rtree/test2/run
++++ b/test/rtree/test2/run
+@@ -1,5 +1,7 @@
+ #! /bin/bash
+
++set -e
++
+ echo Generating dataset
+ test-rtree-Generator 10000 100 > mix
+
+@@ -12,12 +14,14 @@ test-rtree-Exhaustive mix intersection >
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+
+--- a/test/rtree/test3/run
++++ b/test/rtree/test3/run
+@@ -1,5 +1,6 @@
+ #! /bin/bash
+
++set -e
+
+ #echo Generating 10 million entries. This might take a while
+ #echo Generating dataset
+@@ -21,9 +22,13 @@ test-rtree-Exhaustive .t intersection >
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then echo "Same results with exhaustive search. Everything seems fine."
+-else echo "PROBLEM! We got different results from exhaustive search!"
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 .t tree.*
++else
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+-echo Results: `wc -l a`
+-rm -rf a b res res2 .t tree.*
+--- a/test/rtree/test4/run
++++ b/test/rtree/test4/run
+@@ -1,5 +1,7 @@
+ #! /bin/bash
+
++set -e
++
+ echo Generating dataset
+ test-rtree-Generator 10000 0 > d
+ awk '{if ($1 == 1) print $0}' < d > data
+@@ -19,11 +21,13 @@ test-rtree-Exhaustive .t selfjoin > res2
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 .t tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 .t tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+--- a/test/tprtree/test1/run
++++ b/test/tprtree/test1/run
+@@ -1,5 +1,7 @@
+ #! /bin/bash
+
++set -e
++
+ echo Generating dataset
+ test-tprtree-Generator -ds 1000 -sl 100 > d
+ awk '{if ($2 != 2) print $0}' < d > data
+@@ -19,11 +21,13 @@ test-tprtree-Exhaustive .t > res2
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 .t tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 .t tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+--- a/test/tprtree/test2/run
++++ b/test/tprtree/test2/run
+@@ -1,5 +1,7 @@
+ #! /bin/bash
+
++set -e
++
+ echo Generating dataset
+ test-tprtree-Generator -ds 1000 -sl 100 > mix
+
+@@ -12,12 +14,13 @@ test-tpr-tree-Exhaustive mix > res2
+ echo Comparing results
+ sort -n res > a
+ sort -n res2 > b
+-if diff a b
+-then
+-echo "Same results with exhaustive search. Everything seems fine."
+-echo Results: `wc -l a`
+-rm -rf a b res res2 tree.*
++
++set +e
++if diff a b; then
++ echo "Same results with exhaustive search. Everything seems fine."
++ echo Results: `wc -l a`
++ rm -rf a b res res2 tree.*
+ else
+-echo "PROBLEM! We got different results from exhaustive search!"
++ echo "PROBLEM! We got different results from exhaustive search!"
++ exit 1
+ fi
+-
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+index-tests.patch
=====================================
debian/rules
=====================================
@@ -14,5 +14,8 @@ UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
%:
dh $@
+override_dh_auto_test:
+ dh_auto_test || echo "Ignoring test failures"
+
override_dh_makeshlibs:
dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialindex/-/compare/e1e5c914a94c520f3712a2e3fd821fdd014567c2...e64577518b9ddbb230b5ceb007ef3c1ee9f5d665
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialindex/-/compare/e1e5c914a94c520f3712a2e3fd821fdd014567c2...e64577518b9ddbb230b5ceb007ef3c1ee9f5d665
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240520/57b0ea05/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list