Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jffi
Commits:
2fdf85c9 by Emmanuel Bourg at 2018-05-09T00:58:07+02:00
Standards-Version updated to 4.1.4
- - - - -
2a482a8b by Emmanuel Bourg at 2018-05-09T00:58:50+02:00
Switch to debhelper level 11
- - - - -
3d86ba76 by Emmanuel Bourg at 2018-05-09T00:59:02+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
ee576dff by Emmanuel Bourg at 2018-05-09T09:55:05+02:00
Fixed the build failure with Java 10 (Closes: #898230)
- - - - -
de0a1711 by Emmanuel Bourg at 2018-05-09T09:55:20+02:00
Use https URLs
- - - - -
477449de by Emmanuel Bourg at 2018-05-09T09:55:37+02:00
Improved the cleaning phase
- - - - -
fed3c436 by Emmanuel Bourg at 2018-05-09T09:56:58+02:00
Upload to unstable
- - - - -
10 changed files:
- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/copyright
- − debian/maven.cleanIgnoreRules
- − debian/maven.publishedRules
- + debian/patches/java10-compatibility.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+jffi (1.2.7-11) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 10 (Closes: #898230)
+ * Standards-Version updated to 4.1.4
+ * Switch to debhelper level 11
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebo...@apache.org> Wed, 09 May 2018 09:56:51 +0200
+
jffi (1.2.7-10) unstable; urgency=medium
* Team upload.
@@ -144,7 +154,7 @@ jffi (1.0.2-9) unstable; urgency=low
* Team upload.
* Patch d/control build-dep on default-jdk. (Closes: #675180)
- Thanks to James Page.
- * Bump Standards-Version to 3.9.3 (no changes).
+ * Bump Standards-Version to 3.9.3 (no changes).
* d/copyright: update for DEP5 and to address lintian warnings.
* d/control: update Vcs-Git URL.
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+ccache/
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
ant,
ant-optional,
bnd (>= 2.1.0),
- debhelper (>= 10),
+ debhelper (>= 11),
default-jdk,
javahelper,
junit4,
@@ -18,10 +18,10 @@ Build-Depends:
maven-debian-helper,
maven-repo-helper,
pkg-config
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jffi.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jffi.git
-Homepage: http://github.com/jnr/jffi
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/jffi.git
+Vcs-Browser: https://salsa.debian.org/java-team/jffi
+Homepage: https://github.com/jnr/jffi
Package: libjffi-java
Architecture: all
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: jffi
Upstream-Contact: Wayne Meissner
Source: http://github.com/jnr/jffi
=====================================
debian/maven.cleanIgnoreRules deleted
=====================================
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1 +0,0 @@
-
=====================================
debian/maven.publishedRules deleted
=====================================
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1 +0,0 @@
-
=====================================
debian/patches/java10-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10-compatibility.patch
@@ -0,0 +1,75 @@
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -153,8 +153,9 @@
+
+ <target name="-do-compile" depends="-init">
+ <mkdir dir="${build.classes.dir}"/>
++ <mkdir dir="${build.native.dir}"/>
+ <!-- Compile the java code from ${src} into ${build} -->
+- <javac srcdir="${src.dir}" destdir="${build.classes.dir}"
includeantruntime="false"/>
++ <javac srcdir="${src.dir}" destdir="${build.classes.dir}"
includeantruntime="false" nativeHeaderDir="${build.native.dir}"/>
+ </target>
+
+ <target name="-compile-java" depends="-do-compile"/>
+@@ -280,25 +281,10 @@
+
+
+ <target name="-generate-version"
depends="-init,-init-vars,-generate-version-source">
+- <javac target="1.6" destdir="${build.classes.dir}"
srcdir="${build.dir}/java" includeantruntime="false"/>
++ <javac target="1.6" destdir="${build.classes.dir}"
srcdir="${build.dir}/java" includeantruntime="false"
nativeHeaderDir="${build.native.dir}"/>
+ </target>
+
+ <target name="-generate-native-headers"
depends="-init-vars,-generate-version,-compile-java">
+- <mkdir dir="${build.native.dir}"/>
+- <mkdir dir="${build.classes.dir}"/>
+- <javah classpath="${build.classes.dir}" destdir="${build.native.dir}"
force="yes">
+- <class name="com.kenai.jffi.Foreign"/>
+- <class name="com.kenai.jffi.ObjectBuffer"/>
+- <class name="com.kenai.jffi.Version"/>
+- </javah>
+- <!--
+- <exec executable="javah" failonerror="true">
+- <arg line="-d ${build.native.dir}"/>
+- <arg line="-classpath ${build.classes.dir}"/>
+- <arg line="com.kenai.jffi.Foreign"/>
+- <arg line="com.kenai.jffi.ObjectBuffer"/>
+- </exec>
+- -->
+ </target>
+
+ <target name="-build-native-library" depends="-init-vars,
-generate-native-headers, -generate-version">
+--- a/version.xml
++++ b/version.xml
+@@ -10,8 +10,11 @@
+ package com.kenai.jffi;
+ public final class Version {
+ private Version() {}
++ @java.lang.annotation.Native
+ public static final int MAJOR = ${jffi.version.major};
++ @java.lang.annotation.Native
+ public static final int MINOR = ${jffi.version.minor};
++ @java.lang.annotation.Native
+ public static final int MICRO = ${jffi.version.micro};
+ }
+ </echo>
+--- a/src/main/java/com/kenai/jffi/ObjectBuffer.java
++++ b/src/main/java/com/kenai/jffi/ObjectBuffer.java
+@@ -46,6 +46,7 @@
+ public static final int ZERO_TERMINATE = 0x4;
+
+ /** Pin the array memory and pass the JVM memory pointer directly to the
function */
++ @java.lang.annotation.Native
+ public static final int PINNED = 0x8;
+
+ /** For OUT arrays, clear the temporary native memory area */
+@@ -62,6 +63,7 @@
+ static final int FLAGS_SHIFT = 0;
+ static final int FLAGS_MASK = 0xff;
+
++ @java.lang.annotation.Native
+ static final int ARRAY = 0x10 << TYPE_SHIFT;
+ static final int BUFFER = 0x20 << TYPE_SHIFT;
+ static final int JNI = 0x40 << TYPE_SHIFT;
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ disable-warnings-as-errors-for-libtest.patch
test_fork_true.patch
remove-unnecessary-target-for-native-build.patch
nonlinux-platforms.patch
+java10-compatibility.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -42,9 +42,6 @@ override_dh_clean:
ant clean
dh_clean
-get-orig-source:
- uscan --force-download --verbose --no-symlink
-
#
# original jffi package
#
View it on GitLab:
https://salsa.debian.org/java-team/jffi/compare/57abc6c53be8a640a4fa43f8c1c2e8de3ddba981...fed3c436d1af25baf57e494a0cebd9bb5e3762e6
---
View it on GitLab:
https://salsa.debian.org/java-team/jffi/compare/57abc6c53be8a640a4fa43f8c1c2e8de3ddba981...fed3c436d1af25baf57e494a0cebd9bb5e3762e6
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
