This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository proj.
commit 8b7ce868fe98612d7a233a349009738a7e480cb8
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Mar 9 14:37:45 2018 +0100
Update pj_transform-height_unit.patch which changes as applied upstream.
---
debian/changelog | 6 ++++++
debian/patches/pj_transform-height_unit.patch | 7 +++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1179065..328c938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proj (5.0.0-3~exp3) UNRELEASED; urgency=medium
+
+ * Update pj_transform-height_unit.patch which changes as applied upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 09 Mar 2018 14:37:24 +0100
+
proj (5.0.0-3~exp2) experimental; urgency=medium
* Add patch to fix height_unit() in proj_transform.c.
diff --git a/debian/patches/pj_transform-height_unit.patch
b/debian/patches/pj_transform-height_unit.patch
index 94594d3..c50fb65 100644
--- 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++)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/proj.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
