[proj] 04/05: Drop patches, included upstream.
Bas Couwenberg
sebastic at debian.org
Sun Feb 25 19:50:56 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository proj.
commit 8b1362fda8a24f01c2b39ac36eef4bab7b1b4fef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Feb 25 20:39:11 2018 +0100
Drop patches, included upstream.
---
debian/changelog | 1 +
.../Dont-reset-errno-when-skipping-tests.patch | 19 -----
.../patches/Relax-some-the-tests-in-geodtest.patch | 97 ----------------------
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 118 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 90bd0fb..53e010a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ proj (5.0.0~rc6-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Don't ignore test failures for arm64, ppc64el, s390x & ppc64.
+ * Drop patches, included upstream.
-- Bas Couwenberg <sebastic at debian.org> Sun, 25 Feb 2018 20:38:29 +0100
diff --git a/debian/patches/Dont-reset-errno-when-skipping-tests.patch b/debian/patches/Dont-reset-errno-when-skipping-tests.patch
deleted file mode 100644
index 824888d..0000000
--- a/debian/patches/Dont-reset-errno-when-skipping-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Don't reset errno when skipping tests.
- The error number should not be reset until a new instance of "operation
- ..." is reached. The ignore-feature initially worked by accident since
- pj_errno was not being reset when calling proj_errno_reset. This was
- fixed in #808, which subsequently caused ignored tests to fail.
-Author: Kristian Evers <kristianevers at gmail.com>
-Origin: https://github.com/OSGeo/proj.4/pull/820/commits/ad4b6e12f137817217058f60c36ad51a4d29e417
-Bug: https://github.com/OSGeo/proj.4/issues/819
-
---- a/src/gie.c
-+++ b/src/gie.c
-@@ -332,7 +332,6 @@ static int another_failure (void) {
- static int another_skip (void) {
- T.op_skip++;
- T.total_skip++;
-- proj_errno_reset (T.P);
- return 0;
- }
-
diff --git a/debian/patches/Relax-some-the-tests-in-geodtest.patch b/debian/patches/Relax-some-the-tests-in-geodtest.patch
deleted file mode 100644
index 01726e6..0000000
--- a/debian/patches/Relax-some-the-tests-in-geodtest.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Relax some the tests in geodtest.
- This attempts to address the geodtest failures noted in #819.
-Author: Charles Karney <charles at karney.com>
-Origin: https://github.com/cffk/proj.4/commit/7ff60ee494b225f3988648c64bd70f6ae4176257
-
---- a/src/geodtest.c
-+++ b/src/geodtest.c
-@@ -698,35 +698,35 @@ static int GeodSolve80() {
- int result = 0;
- geod_init(&g, wgs84_a, wgs84_f);
- geod_geninverse(&g, 0, 0, 0, 90, 0, 0, 0, 0, &M12, &M21, 0);
-- result += assertEquals(M12, -0.0052842753, 0.5e-10);
-- result += assertEquals(M21, -0.0052842753, 0.5e-10);
-+ result += assertEquals(M12, -0.00528427534, 0.5e-10);
-+ result += assertEquals(M21, -0.00528427534, 0.5e-10);
- geod_geninverse(&g, 0, 0, 1e-6, 1e-6, 0, 0, 0, 0, &M12, &M21, 0);
- result += assertEquals(M12, 1, 0.5e-10);
- result += assertEquals(M21, 1, 0.5e-10);
- a12 = geod_geninverse(&g, 20.001, 0, 20.001, 0,
- &s12, &azi1, &azi2, &m12, &M12, &M21, &S12);
-- result += a12 == 0 ? 0 : 1;
-- result += s12 == 0 ? 0 : 1;
-- result += azi1 == 180 ? 0 : 1;
-- result += azi2 == 180 ? 0 : 1;
-- result += m12 == 0 ? 0 : 1;
-+ result += assertEquals(a12, 0, 1e-13);
-+ result += assertEquals(s12, 0, 1e-8);
-+ result += assertEquals(azi1, 180, 1e-13);
-+ result += assertEquals(azi2, 180, 1e-13);
-+ result += assertEquals(m12, 0, 1e-8);
- result += assertEquals(M12, 1, 1e-15);
- result += assertEquals(M21, 1, 1e-15);
-- result += S12 == 0 ? 0 : 1;
-+ result += assertEquals(S12, 0, 1e-10);
- a12 = geod_geninverse(&g, 90, 0, 90, 180,
- &s12, &azi1, &azi2, &m12, &M12, &M21, &S12);
-- result += a12 == 0 ? 0 : 1;
-- result += s12 == 0 ? 0 : 1;
-- result += azi1 == 0 ? 0 : 1;
-- result += azi2 == 180 ? 0 : 1;
-- result += m12 == 0 ? 0 : 1;
-+ result += assertEquals(a12, 0, 1e-13);
-+ result += assertEquals(s12, 0, 1e-8);
-+ result += assertEquals(azi1, 0, 1e-13);
-+ result += assertEquals(azi2, 180, 1e-13);
-+ result += assertEquals(m12, 0, 1e-8);
- result += assertEquals(M12, 1, 1e-15);
- result += assertEquals(M21, 1, 1e-15);
- result += assertEquals(S12, 127516405431022, 0.5);
- /* An incapable line which can't take distance as input */
- geod_lineinit(&l, &g, 1, 2, 90, GEOD_LATITUDE);
- a12 = geod_genposition(&l, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0);
-- result += a12 != a12 ? 0 : 1;
-+ result += a12 == a12 ? 1 : 0;
- return result;
- }
-
-@@ -890,8 +890,8 @@ static int Planimeter19() {
- result += area == 0 ? 0 : 1;
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, &area, &perim);
-- result += area != area ? 0 : 1;
-- result += perim != perim ? 0 : 1;
-+ result += area == area ? 1 : 0;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_addpoint(&g, &p, 1, 1);
- geod_polygon_compute(&g, &p, 0, 1, &area, &perim);
- result += area == 0 ? 0 : 1;
-@@ -902,7 +902,7 @@ static int Planimeter19() {
- geod_polygon_testpoint(&g, &p, 1, 1, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, 0, &perim);
-- result += perim != perim ? 0 : 1;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_addpoint(&g, &p, 1, 1);
- geod_polygon_compute(&g, &p, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
-@@ -991,8 +991,8 @@ static int EmptyPoly() {
- result += area == 0 ? 0 : 1;
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, &area, &perim);
-- result += area != area ? 0 : 1;
-- result += perim != perim ? 0 : 1;
-+ result += area == area ? 1 : 0;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_compute(&g, &p, 0, 1, &area, &perim);
- result += area == 0 ? 0 : 1;
- result += perim == 0 ? 0 : 1;
-@@ -1000,7 +1000,7 @@ static int EmptyPoly() {
- geod_polygon_testpoint(&g, &p, 1, 1, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, 0, &perim);
-- result += perim != perim ? 0 : 1;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_compute(&g, &p, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
- geod_polygon_addpoint(&g, &p, 1, 1);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2a86fb5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Dont-reset-errno-when-skipping-tests.patch
-Relax-some-the-tests-in-geodtest.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git
More information about the Pkg-grass-devel
mailing list