Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libjna-java
Commits: 94dfed77 by Emmanuel Bourg at 2018-05-10T01:20:12+02:00 Standards-Version updated to 4.1.4 - - - - - 2402f72d by Emmanuel Bourg at 2018-05-10T01:20:26+02:00 Switch to debhelper level 11 - - - - - 6fc903d1 by Emmanuel Bourg at 2018-05-10T01:20:32+02:00 Use salsa.debian.org Vcs-* URLs - - - - - a5fab73b by Emmanuel Bourg at 2018-05-11T23:40:06+02:00 Fixed the build failure with Java 10 (Closes: #898459) - - - - - bab86b07 by Emmanuel Bourg at 2018-05-11T23:40:41+02:00 Upload to unstable - - - - - 5 changed files: - debian/changelog - debian/compat - debian/control - + debian/patches/16-java10-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 <ebo...@apache.org> Fri, 11 May 2018 23:40:33 +0200 + libjna-java (4.5.1-1) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Jan Dittberner <ja...@debian.org>, Andrew Ross <ubu...@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 ===================================== --- /dev/null +++ b/debian/patches/16-java10-compatibility.patch @@ -0,0 +1,42 @@ +Description: Fixes the build failure with Java 10 +Author: Emmanuel Bourg <ebo...@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 ===================================== --- a/debian/patches/series +++ b/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 View it on GitLab: https://salsa.debian.org/java-team/libjna-java/compare/b616cf59f1780093ea0dc65e5b5ee407d7e7142d...bab86b07eb7a5bbac467465e71dcfe7ef8857b34 --- View it on GitLab: https://salsa.debian.org/java-team/libjna-java/compare/b616cf59f1780093ea0dc65e5b5ee407d7e7142d...bab86b07eb7a5bbac467465e71dcfe7ef8857b34 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits