This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjna-java.
commit 1b40c6f2bcaf001b821cd8f324fa5791bd1c9cc5 Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 5 15:03:40 2017 +0200 Refreshed the patches --- debian/changelog | 4 +++- debian/patches/03-dynlink-and-cflags.patch | 4 ++-- debian/patches/04-load-native-code-from-fs.patch | 4 ++-- debian/patches/06-remove-gjdoc-inexistent-options.patch | 2 +- debian/patches/09-javadoc.patch | 2 +- debian/patches/10-disable-full-jar.patch | 6 +++--- debian/patches/12-structure-backward-compatibility.patch | 8 ++++---- debian/patches/13-reproducible-javadoc.patch | 2 +- debian/patches/14-rename-native-library.patch | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ab4eeb..2920ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -libjna-java (4.2.2-4) UNRELEASED; urgency=medium +libjna-java (4.3.0-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch index 2392ec8..46a0d24 100644 --- a/debian/patches/03-dynlink-and-cflags.patch +++ b/debian/patches/03-dynlink-and-cflags.patch @@ -3,7 +3,7 @@ Description: dynlink and cflags --- a/build.xml +++ b/build.xml -@@ -827,6 +827,19 @@ +@@ -832,6 +832,19 @@ <arg value="JNA_JNI_VERSION=${jni.version}"/> <arg value="CHECKSUM=${jni.md5}"/> </exec> @@ -23,7 +23,7 @@ Description: dynlink and cflags <mkdir dir="${classes}/${native.path}"/> <copy todir="${classes}/${native.path}"> <fileset dir="${build.native}" -@@ -838,15 +851,6 @@ +@@ -843,15 +856,6 @@ <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/> </copy> diff --git a/debian/patches/04-load-native-code-from-fs.patch b/debian/patches/04-load-native-code-from-fs.patch index 16fbfbe..c6e3c85 100644 --- a/debian/patches/04-load-native-code-from-fs.patch +++ b/debian/patches/04-load-native-code-from-fs.patch @@ -3,7 +3,7 @@ Subject: try to load native library from /usr/lib/jni if system Author: Jan Dittberner <[email protected]> --- a/src/com/sun/jna/Native.java +++ b/src/com/sun/jna/Native.java -@@ -731,6 +731,30 @@ +@@ -787,6 +787,30 @@ } /** @@ -34,7 +34,7 @@ Author: Jan Dittberner <[email protected]> * Loads the JNA stub library. * First tries jna.boot.library.path, then the system path, then from the * jar file. -@@ -748,6 +772,9 @@ +@@ -803,6 +827,9 @@ String libName = System.getProperty("jna.boot.library.name", "jnidispatch"); String bootPath = System.getProperty("jna.boot.library.path"); diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch index 35c05ae..224855f 100644 --- a/debian/patches/06-remove-gjdoc-inexistent-options.patch +++ b/debian/patches/06-remove-gjdoc-inexistent-options.patch @@ -3,7 +3,7 @@ Subject: disable javadoc options that are not supported by gjdoc --- a/build.xml +++ b/build.xml -@@ -1105,7 +1105,7 @@ +@@ -1115,7 +1115,7 @@ <group title="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/> <group title="Platform Specific" packages="com.sun.jna.platform.*"/> diff --git a/debian/patches/09-javadoc.patch b/debian/patches/09-javadoc.patch index ba9ba4a..d56007a 100644 --- a/debian/patches/09-javadoc.patch +++ b/debian/patches/09-javadoc.patch @@ -2,7 +2,7 @@ Link javadoc to the default-jdk javadoc. --- a/build.xml +++ b/build.xml -@@ -1088,7 +1088,7 @@ +@@ -1098,7 +1098,7 @@ <doctitle>JNA API Documentation</doctitle> <header>${header}</header> <bottom>${footer}</bottom> diff --git a/debian/patches/10-disable-full-jar.patch b/debian/patches/10-disable-full-jar.patch index ae8d637..94bcb39 100644 --- a/debian/patches/10-disable-full-jar.patch +++ b/debian/patches/10-disable-full-jar.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -379,6 +379,7 @@ +@@ -378,6 +378,7 @@ <!-- Note that no terminal "*" is included in this list, which will force failure on unsupported platforms. --> @@ -11,7 +11,7 @@ Forwarded: not-needed <attribute name="Bundle-NativeCode" value=" com/sun/jna/win32-x86/jnidispatch.dll; -@@ -437,10 +438,12 @@ +@@ -436,10 +437,12 @@ com/sun/jna/darwin/libjnidispatch.jnilib; osname=macosx;processor=x86;processor=x86-64;processor=ppc "/> @@ -24,7 +24,7 @@ Forwarded: not-needed <zipfileset src="${lib.native}/win32-x86.jar" includes="*jnidispatch*" prefix="com/sun/jna/win32-x86"/> -@@ -510,6 +513,7 @@ +@@ -509,6 +512,7 @@ <zipfileset src="${lib.native}/w32ce-arm.jar" includes="*jnidispatch*" prefix="com/sun/jna/w32ce-arm"/> diff --git a/debian/patches/12-structure-backward-compatibility.patch b/debian/patches/12-structure-backward-compatibility.patch index c2dbb7a..35e85a5 100644 --- a/debian/patches/12-structure-backward-compatibility.patch +++ b/debian/patches/12-structure-backward-compatibility.patch @@ -5,7 +5,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/src/com/sun/jna/Structure.java +++ b/src/com/sun/jna/Structure.java -@@ -106,6 +106,34 @@ +@@ -116,6 +116,34 @@ */ public interface ByReference { } @@ -40,12 +40,12 @@ Forwarded: not-needed /** Use the platform default alignment. */ public static final int ALIGN_DEFAULT = 0; /** No alignment, place all fields on nearest 1-byte boundary */ -@@ -874,7 +902,32 @@ +@@ -888,7 +916,32 @@ * guaranteed to be predictable. * @return ordered list of field names */ -- protected abstract List getFieldOrder(); -+ protected List getFieldOrder() { +- protected abstract List<String> getFieldOrder(); ++ protected List<String> getFieldOrder() { + if (REQUIRES_FIELD_ORDER) { + throw new Error("This VM does not store fields in a predictable order; you must implement Structure.getFieldOrder on " + getClass() + " to explicitly indicate the field order: " + System.getProperty("java.vendor") + ", " + System.getProperty("java.version")); + } diff --git a/debian/patches/13-reproducible-javadoc.patch b/debian/patches/13-reproducible-javadoc.patch index eeffc8f..b80a7f8 100644 --- a/debian/patches/13-reproducible-javadoc.patch +++ b/debian/patches/13-reproducible-javadoc.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/build.xml +++ b/build.xml -@@ -1086,7 +1086,8 @@ +@@ -1096,7 +1096,8 @@ maxmemory="256m" packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.platform,com.sun.jna.platform.win32" overview="${src}/com/sun/jna/overview.html" diff --git a/debian/patches/14-rename-native-library.patch b/debian/patches/14-rename-native-library.patch index 70c68e2..c03e8a4 100644 --- a/debian/patches/14-rename-native-library.patch +++ b/debian/patches/14-rename-native-library.patch @@ -4,7 +4,7 @@ Forwarded: not-needed Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libjna-java/+bug/1065253 --- a/src/com/sun/jna/Native.java +++ b/src/com/sun/jna/Native.java -@@ -770,8 +770,8 @@ +@@ -825,8 +825,8 @@ } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjna-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
