[Git][debian-gis-team/proj-rdnap][master] 3 commits: Drop unused overrides for file-without-copyright-information.

[Bas Couwenberg]

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


Commits:
f5834c0e by Bas Couwenberg at 2019-12-29T06:04:37Z
Drop unused overrides for file-without-copyright-information.

- - - - -
8d2375f6 by Bas Couwenberg at 2019-12-29T06:08:40Z
Replace tabs with spaces in copyright file.

- - - - -
d26d76b9 by Bas Couwenberg at 2019-12-29T06:31:18Z
Update testrdtrans2018.pl to handle '*' heights.

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- debian/patches/add-test2018.patch
- debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,9 @@
 proj-rdnap (2008+2018-2) UNRELEASED; 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.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 31 Oct 2019 09:56:12 +0100
 


=====================================
debian/copyright
=====================================
@@ -136,7 +136,7 @@ License: CC-BY-ND-4.0
      material not subject to the license. This includes other CC-
      licensed material, or material used under an exception or
      limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
+        wiki.creativecommons.org/Considerations_for_licensors
  .
      Considerations for the public: By using one of our public
      licenses, a licensor grants the public permission to use the
@@ -153,7 +153,7 @@ License: CC-BY-ND-4.0
      Although not required by our licenses, you are encouraged to
      respect those requests where reasonable. More considerations
      for the public:
-	wiki.creativecommons.org/Considerations_for_licensees
+        wiki.creativecommons.org/Considerations_for_licensees
  .
  =======================================================================
  .


=====================================
debian/patches/add-test2018.patch
=====================================
@@ -48793,7 +48793,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +}
 --- /dev/null
 +++ b/testrdtrans2018.pl
-@@ -0,0 +1,869 @@
+@@ -0,0 +1,887 @@
 +#!/usr/bin/perl -w
 +#
 +# Script to test various transformations with the 2018 grids.
@@ -49111,12 +49111,12 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +
 +            if($direction->{src} eq 'etrs89') {
 +                $in  = $test->{etrs89}->{latitude}." ".$test->{etrs89}->{longitude};
-+                $in .= " ".$test->{etrs89}->{height} if($test->{etrs89}->{height});
++                $in .= " ".$test->{etrs89}->{height} if($test->{etrs89}->{height} && $test->{etrs89}->{height} ne '*');
 +                $in .= "\n";
 +            }
 +            elsif($direction->{src} eq 'rdnap') {
 +                $in  = $test->{rdnap}->{x}." ".$test->{rdnap}->{y};
-+                $in .= " ".$test->{rdnap}->{nap} if($test->{rdnap}->{nap});
++                $in .= " ".$test->{rdnap}->{nap} if($test->{rdnap}->{nap} && $test->{rdnap}->{nap} ne '*');
 +                $in .= "\n";
 +            }
 +            else {
@@ -49195,6 +49195,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +                else {
 +                    my $output_override = 0;
 +                    my $margin_override = 0;
++                    my $height_ignored  = 0;
 +
 +                    if($direction->{dst} eq 'etrs89') {
 +                        if($out_parts[0] =~ /^-?\d+\.\d+$/) {
@@ -49343,6 +49344,13 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +                                }
 +                            }
 +                        }
++                        elsif($out_parts[2]    && $out_parts[2]    =~ /^-?inf$/ &&
++                              $expect_parts[2] && $expect_parts[2] =~ /^\*$/
++                        ) {
++                            $ok = 1 if(!defined $ok);
++
++                            $height_ignored = 1;
++                        }
 +                        elsif(
 +                               $config->{override} &&
 +                               $config->{override}->{ $test->{id} } &&
@@ -49514,6 +49522,13 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +                                }
 +                            }
 +                        }
++                        elsif($out_parts[2]    && $out_parts[2]    =~ /^-?inf$/ &&
++                              $expect_parts[2] && $expect_parts[2] =~ /^\*$/
++                        ) {
++                            $ok = 1 if(!defined $ok);
++
++                            $height_ignored = 1;
++                        }
 +                        elsif(
 +                               $config->{override} &&
 +                               $config->{override}->{ $test->{id} } &&
@@ -49579,6 +49594,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
 +                            $msg .= ": ${x} ${y} ${nap}";
 +                        }
 +                    }
++                    elsif($output_override) {
++                        $msg = "Height ignored";
++                    }
 +                }
 +            }
 +


=====================================
debian/source/lintian-overrides
=====================================
@@ -1,12 +1,3 @@
 # No usable upstream URL for uscan, use get-orig-source script instead.
 debian-watch-file-is-missing
 
-# File added via patch
-file-without-copyright-information Z001_ETRS89andRDNAP.txt
-file-without-copyright-information epsg
-file-without-copyright-information rdnap
-file-without-copyright-information testrdtrans2008.json
-file-without-copyright-information testrdtrans2008.pl
-file-without-copyright-information testrdtrans2018.json
-file-without-copyright-information testrdtrans2018.pl
-



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-rdnap/compare/6a1564cf3bcb7bb617307dc1b66516dfd1cee328...d26d76b99cf66e6570810c171f60bb749e911d6b
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/20191229/b64f21e0/attachment-0001.html>