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 ebc0f18499a1c1dc97f92689acf5b8edd99c2ebf Author: Emmanuel Bourg <[email protected]> Date: Wed Mar 23 13:45:01 2016 +0100 Renamed the native library to avoid conflicts with other JNA jars used on the system (LP: #1065253) --- debian/changelog | 2 ++ debian/patches/14-rename-native-library.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dac53d8..03dd153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libjna-java (4.2.2-1) UNRELEASED; urgency=medium * Team upload. * New upstream release + * Renamed the native library to avoid conflicts with other JNA jars used + on the system (LP: #1065253) * Improved the reproducibility: - Use the year of the source date in the copyright notice of the javadoc * Standards-Version updated to 3.9.7 (no changes) diff --git a/debian/patches/14-rename-native-library.patch b/debian/patches/14-rename-native-library.patch new file mode 100644 index 0000000..18f2f8c --- /dev/null +++ b/debian/patches/14-rename-native-library.patch @@ -0,0 +1,26 @@ +Description: Rename the native library to avoid conflicts with other JNA jars used on the system +Author: Emmanuel Bourg <[email protected]> +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 @@ + } + } + +- 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"); + if (bootPath == null) { + bootPath = "/usr/lib/jni" + File.pathSeparator + "/usr/lib/" + getMultiArchPath() + "/jni"; +--- a/native/Makefile ++++ b/native/Makefile +@@ -69,7 +69,7 @@ + FFI_ENV=CC="$(CC)" CFLAGS="$(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" + FFI_CONFIG=--enable-static --disable-shared --with-pic=yes + endif +-LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch$(JNISFX) ++LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch.system$(JNISFX) + TESTLIB=$(BUILD)/$(LIBPFX)testlib$(LIBSFX) + TESTLIB_JAR=$(BUILD)/$(LIBPFX)testlib-jar$(LIBSFX) + TESTLIB_PATH=$(BUILD)/$(LIBPFX)testlib-path$(LIBSFX) diff --git a/debian/patches/series b/debian/patches/series index 0a5b6f3..53812bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 10-disable-full-jar.patch 12-structure-backward-compatibility.patch 13-reproducible-javadoc.patch +14-rename-native-library.patch diff --git a/debian/rules b/debian/rules index ebe1149..8d53f20 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ override_dh_auto_install: mh_installpom -plibjna-platform-java -e$(VERSION) pom-jna-platform.xml mh_installjar -plibjna-platform-java -e$(VERSION) --java-lib --usj-name=jna-platform pom-jna-platform.xml contrib/platform/dist/jna-platform.jar - dh_install -plibjna-jni build/native*/libjnidispatch.so usr/lib/$(DEB_HOST_MULTIARCH)/jni + dh_install -plibjna-jni build/native*/libjnidispatch.system.so usr/lib/$(DEB_HOST_MULTIARCH)/jni override_dh_installchangelogs: dh_installchangelogs -- CHANGES.md -- 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
