[libjna-java] 01/01: Ignore the jna.boot.library.* properties and always load the system jnidispatch library (Closes: #858876)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 12 09:07:35 UTC 2017
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 5c9159e6344bc933eee34ce5ba9b7076499a02c2
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 12 11:05:30 2017 +0200
Ignore the jna.boot.library.* properties and always load the system jnidispatch library (Closes: #858876)
---
debian/changelog | 8 ++++++++
debian/patches/14-rename-native-library.patch | 8 +++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b231303..04a7e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libjna-java (4.2.2-3) unstable; urgency=medium
+
+ * Team upload.
+ * Ignore the jna.boot.library.path and jna.boot.library.name properties
+ and always load the system jnidispatch library (Closes: #858876)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 12 Apr 2017 10:52:44 +0200
+
libjna-java (4.2.2-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/14-rename-native-library.patch b/debian/patches/14-rename-native-library.patch
index 18f2f8c..70c68e2 100644
--- a/debian/patches/14-rename-native-library.patch
+++ b/debian/patches/14-rename-native-library.patch
@@ -4,15 +4,17 @@ 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,7 +770,7 @@
+@@ -770,8 +770,8 @@
}
}
- String libName = System.getProperty("jna.boot.library.name", "jnidispatch");
-+ String libName = System.getProperty("jna.boot.library.name", "jnidispatch.system");
- String bootPath = System.getProperty("jna.boot.library.path");
+- String bootPath = System.getProperty("jna.boot.library.path");
++ String libName = "jnidispatch.system";
++ String bootPath = null;
if (bootPath == null) {
bootPath = "/usr/lib/jni" + File.pathSeparator + "/usr/lib/" + getMultiArchPath() + "/jni";
+ }
--- a/native/Makefile
+++ b/native/Makefile
@@ -69,7 +69,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjna-java.git
More information about the pkg-java-commits
mailing list