[Git][debian-gis-team/proj][master] 2 commits: Update pj_transform-height_unit.patch which changes as applied upstream.

[Bas Couwenberg]

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


Commits:
8b7ce868 by Bas Couwenberg at 2018-03-09T14:37:45+01:00
Update pj_transform-height_unit.patch which changes as applied upstream.

- - - - -
0b9b6d64 by Bas Couwenberg at 2018-03-09T22:17:54+01:00
Set distribution to unstable.

- - - - -


2 changed files:

- debian/changelog
- debian/patches/pj_transform-height_unit.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proj (5.0.0-3) unstable; urgency=medium
+
+  * Update pj_transform-height_unit.patch which changes as applied upstream.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 09 Mar 2018 22:12:17 +0100
+
 proj (5.0.0-3~exp2) experimental; urgency=medium
 
   * Add patch to fix height_unit() in proj_transform.c.


=====================================
debian/patches/pj_transform-height_unit.patch
=====================================
--- a/debian/patches/pj_transform-height_unit.patch
+++ b/debian/patches/pj_transform-height_unit.patch
@@ -5,15 +5,14 @@ Applied-Upstream: https://github.com/OSGeo/proj.4/commit/b0277377e353e81718c6850
 
 --- a/src/pj_transform.c
 +++ b/src/pj_transform.c
-@@ -397,7 +397,10 @@ static int height_unit (PJ *P, PJ_DIRECT
+@@ -397,7 +397,9 @@ static int height_unit (PJ *P, PJ_DIRECT
          fac = P->vfr_meter;
  
      /* Nothing to do? */
 -    if (P->vto_meter==0.0)
-+    if (fac == 1.0)
++    if (fac==1.0)
 +        return 0;
-+
-+    if (z == NULL)
++    if (0==z)
          return 0;
  
      for (i = 0;  i < n;  i++)



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/11ac4d283322d71b5a3bda7691f2906d17cbd684...0b9b6d64ea67f0dab4e0159308d9893c3e90f733

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/11ac4d283322d71b5a3bda7691f2906d17cbd684...0b9b6d64ea67f0dab4e0159308d9893c3e90f733
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180309/bc0cbf56/attachment-0001.html>