debian/changelog

+libjna-java (4.5.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898459)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 11 May 2018 23:40:33 +0200
+
 libjna-java (4.5.1-1) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -7,7 +7,7 @@ Uploaders: Jan Dittberner <jandd@debian.org>,
            Andrew Ross <ubuntu@rossfamily.co.uk>
 Build-Depends: ant,
                ant-optional,
-               debhelper (>= 10),
+               debhelper (>= 11),
                default-jdk,
                default-jdk-doc,
                javahelper (>=0.32~),
@@ -16,9 +16,9 @@ Build-Depends: ant,
                libxt-dev,
                maven-repo-helper (>= 1.5~),
                pkg-config
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjna-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjna-java.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/libjna-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libjna-java
 Homepage: https://github.com/twall/jna
 
 Package: libjna-java

debian/patches/16-java10-compatibility.patch

+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -374,6 +374,7 @@
+            source="${compatibility}"
+            target="${compatibility}"
+            destdir="${classes}"
++           nativeHeaderDir="${build.native}"
+            includeantruntime="false"
+            deprecation="on" 
+            debug="${debug}"
+@@ -669,11 +670,6 @@
+   </target>
+ 
+   <target name="javah" depends="compile" unless="-native">
+-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
+-      <class name="com.sun.jna.Function"/>
+-      <class name="com.sun.jna.Native"/>
+-      <class name="com.sun.jna.win32.DLLCallback"/>
+-    </javah>
+     <condition property="grep" value="/usr/sfw/bin/ggrep">
+       <os name="SunOS"/>
+     </condition>
+--- a/src/com/sun/jna/Function.java
++++ b/src/com/sun/jna/Function.java
+@@ -60,11 +60,14 @@
+     }
+ 
+     /** Maximum number of arguments supported by a JNA function call. */
++    @java.lang.annotation.Native
+     public static final int MAX_NARGS = 256;
+ 
+     /** Standard C calling convention. */
++    @java.lang.annotation.Native
+     public static final int C_CONVENTION = 0;
+     /** First alternate convention (currently used only for w32 stdcall). */
++    @java.lang.annotation.Native
+     public static final int ALT_CONVENTION = 0x3F;
+ 
+     private static final int MASK_CC = 0x3F;

debian/patches/series

@@ -6,3 +6,4 @@
 12-structure-backward-compatibility.patch
 14-rename-native-library.patch
 15-java9-compatibility.patch
+16-java10-compatibility.patch