[Git][debian-gis-team/proj-rdnap][master] 3 commits: Allow exceeded margins for edge cases with 2008 grids.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / proj-rdnap


Commits:
c04a0eb9 by Bas Couwenberg at 2020-01-02T20:00:43+01:00
Allow exceeded margins for edge cases with 2008 grids.

- - - - -
ba96db1b by Bas Couwenberg at 2020-01-02T20:05:41+01:00
Don't ignore testrdtrans2008.pl errors in dh_auto_test override.

- - - - -
1c18c158 by Bas Couwenberg at 2020-01-02T20:05:41+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/add-test.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,13 @@
-proj-rdnap (2008+2018-2) UNRELEASED; urgency=medium
+proj-rdnap (2008+2018-2) unstable; urgency=medium
 
   * Add testrdtrans2018.pl to autopkgtest.
   * Drop unused overrides for file-without-copyright-information.
   * Replace tabs with spaces in copyright file.
   * Update testrdtrans2018.pl to handle '*' heights.
+  * Allow exceeded margins for edge cases with 2008 grids.
+  * Don't ignore testrdtrans2008.pl errors in dh_auto_test override.
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 31 Oct 2019 09:56:12 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 02 Jan 2020 20:00:44 +0100
 
 proj-rdnap (2008+2018-1) unstable; urgency=medium
 


=====================================
debian/patches/add-test.patch
=====================================
@@ -62,7 +62,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +<rd> +proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +nadgrids=rdtrans2008.gsb +units=m +no_defs <>
 --- /dev/null
 +++ b/testrdtrans2008.json
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,182 @@
 +[
 +  {
 +    "number"  : "01",
@@ -192,7 +192,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +                  "height"    : "^-?(\\d+\\.\\d+|inf)$",
 +                  "x"         : "*",
 +                  "y"         : "*",
-+                  "nap"       : "^-?(\\d+\\.\\d+|inf)$"
++                  "nap"       : "^-?(\\d+\\.\\d+|inf)$",
++                  "margin"    : "ignore"
 +                }
 +  },
 +  {
@@ -215,7 +216,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +                  "height"    : "^-?(\\d+\\.\\d+|inf)$",
 +                  "x"         : "*",
 +                  "y"         : "*",
-+                  "nap"       : "^-?(\\d+\\.\\d+|inf)$"
++                  "nap"       : "^-?(\\d+\\.\\d+|inf)$",
++                  "margin"    : "ignore"
 +                }
 +  },
 +  {


=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	if [ 6 -le "$(shell cs2cs 2>&1 | head -1 | cut -d' ' -f2 | cut -d'.' -f1)" ]; then \
-	    PROJ_LIB=.:/usr/share/proj perl ./testrdtrans2008.pl -v; \
+	    PROJ_LIB=.:/usr/share/proj perl ./testrdtrans2008.pl -v && \
 	    PROJ_LIB=.:/usr/share/proj perl ./testrdtrans2018.pl -v; \
 	else \
 	    PROJ_LIB=. perl ./testrdtrans2008.pl -v; \



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-rdnap/compare/d26d76b99cf66e6570810c171f60bb749e911d6b...1c18c1589f699a9aa3777a00c123ee36d5f2cbf5

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-rdnap/compare/d26d76b99cf66e6570810c171f60bb749e911d6b...1c18c1589f699a9aa3777a00c123ee36d5f2cbf5
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/20200102/dde9e56b/attachment-0001.html>