debian/changelog

-proj (5.0.1-2) UNRELEASED; urgency=medium
+proj (5.0.1-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.4, no changes.
+  * Add upstream patch to reset error state before each call to pj_inv/pj_fwd.
+    Fixes fixes some gdalwarp scenarios.
+  * Add upstream patch to update jniwrap for Java 10 compatibility.
 
- -- Bas Couwenberg <sebastic@debian.org>  Wed, 18 Apr 2018 20:44:23 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 04 May 2018 10:01:35 +0200
 
 proj (5.0.1-1) unstable; urgency=medium
 

debian/libproj-java.doc-base

 Document: libproj-java
-Title: JPROJ4 API Reference
+Title: Java PROJ API Reference
 Abstract: This manual describes the Java API for PROJ.
 Section: Programming/Java
 
 Format: HTML
-Index: /usr/share/doc/libproj-java/html/index.html
-Files: /usr/share/doc/libproj-java/html/*.html
+Index: /usr/share/doc/libproj-java/apidocs/index.html
+Files: /usr/share/doc/libproj-java/apidocs/*.html

debian/libproj-java.docs

-jniwrap/docs/html/
+jniwrap/out/apidocs/

debian/libproj-java.install

-jniwrap/libs/jproj.jar usr/share/java
+jniwrap/out/proj.jar usr/share/java

debian/libproj-java.lintian-overrides

+# jQuery from libjs-jquery is not compatible
+embedded-javascript-library * please use libjs-jquery
+

debian/patches/0001-pj_transform-reset-error-state-before-each-call-to-p.patch

+Description: pj_transform: reset error state before each call to pj_inv/pj_fwd
+ Fixes issues raised in https://lists.osgeo.org/pipermail/gdal-dev/2018-April/048446.html
+ .
+ The use case is that pj_transform() is called from geos projection to something else,
+ with multiple coordinates. If one of the coordinate tuple fails the inverse
+ transform of geos, it fails with PJD_ERR_TOLERANCE_CONDITION. Causing all following
+ coordinates to fail since the error state is not reset.
+Author: Even Rouault <even.rouault@spatialys.com>
+Origin: https://github.com/OSGeo/proj.4/commit/0dc275a312c1b2ddefc066c66787eb8274d60f08
+
+--- a/src/pj_transform.c
++++ b/src/pj_transform.c
+@@ -42,6 +42,8 @@ enum PJ_DIRECTION {
+ };
+ typedef enum PJ_DIRECTION PJ_DIRECTION;
+ 
++/* Copied from proj.h FIXME */
++int  proj_errno_reset (const PJ *P);
+ 
+ 
+ static int adjust_axis( projCtx ctx, const char *axis, int denormalize_flag,
+@@ -199,6 +201,7 @@ static int geographic_to_projected (PJ *
+             if (geodetic_loc.u == HUGE_VAL)
+                 continue;
+ 
++            proj_errno_reset( P );
+             projected_loc = pj_fwd3d( geodetic_loc, P);
+             if( P->ctx->last_errno != 0 )
+             {
+@@ -234,6 +237,7 @@ static int geographic_to_projected (PJ *
+         if( geodetic_loc.u == HUGE_VAL )
+             continue;
+ 
++        proj_errno_reset( P );
+         projected_loc = pj_fwd( geodetic_loc, P );
+         if( P->ctx->last_errno != 0 )
+         {
+@@ -301,6 +305,7 @@ static int projected_to_geographic (PJ *
+             if (projected_loc.u == HUGE_VAL)
+                 continue;
+ 
++            proj_errno_reset( P );
+             geodetic_loc = pj_inv3d(projected_loc, P);
+             if( P->ctx->last_errno != 0 )
+             {
+@@ -337,6 +342,7 @@ static int projected_to_geographic (PJ *
+         if( projected_loc.u == HUGE_VAL )
+             continue;
+ 
++        proj_errno_reset( P );
+         geodetic_loc = pj_inv( projected_loc, P );
+         if( P->ctx->last_errno != 0 )
+         {

debian/patches/series

+0001-pj_transform-reset-error-state-before-each-call-to-p.patch
+jniwrap.patch

debian/rules

@@ -53,7 +53,7 @@ override_dh_auto_configure: datumgrids
 	dh_auto_configure -- --with-jni=$(JAVA_HOME)/include
 
 override_dh_auto_build:
-	dh_auto_build -Sant -Djniwrap -- do_javah jar_it do_make_help
+	dh_auto_build -Sant -Djniwrap -- javadoc
 	dh_auto_build
 
 override_dh_auto_test:
@@ -69,7 +69,6 @@ override_dh_auto_install:
 	
 	cp $(CURDIR)/src/projects.h $(CURDIR)/debian/tmp/usr/include/.
 	cp $(CURDIR)/src/org_proj4_PJ.h $(CURDIR)/debian/tmp/usr/include/.
-	cp $(CURDIR)/src/org_proj4_PJ_Type.h $(CURDIR)/debian/tmp/usr/include/.
 	
 	# Empty dependency_libs in .la files
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`