debian/changelog

+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@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

@@ -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)
 +        return 0;
-+
-+    if (z == NULL)
++    if (0==z)
          return 0;
  
      for (i = 0;  i < n;  i++)