[jffi] 01/05: ship JNI as .so instead of -native.jar

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository jffi.

commit 96ff69371782cee0464377323478c7e331458778
Author: tony mancill <tmancill at debian.org>
Date:   Sat Apr 4 07:58:29 2015 -0700

    ship JNI as .so instead of -native.jar
    
    instead of jffi-native.jar, place JNI .so in /usr/lib/ beneath the
    multi-arch triplet
---
 debian/changelog          |  9 +++++++++
 debian/libjffi-java.links |  3 ---
 debian/rules              | 10 +++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c38ec2..cf179a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jffi (1.2.7-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * libjffi-jni no longer installs files under /usr/share.
+    (Closes: #781889)
+  * Remove jffi-native.jar.
+
+ -- tony mancill <tmancill at debian.org>  Sat, 04 Apr 2015 07:10:01 -0700
+
 jffi (1.2.7-1) experimental; urgency=low
 
   * Team upload.
diff --git a/debian/libjffi-java.links b/debian/libjffi-java.links
index 018620c..e69de29 100644
--- a/debian/libjffi-java.links
+++ b/debian/libjffi-java.links
@@ -1,3 +0,0 @@
-/usr/share/java/jffi-native.jar usr/share/java/jffi-1.2.7-native.jar
-/usr/share/java/jffi-native.jar usr/share/maven-repo/com/github/jnr/jffi/debian/jffi-native-debian.jar
-/usr/share/java/jffi-native.jar usr/share/maven-repo/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar
diff --git a/debian/rules b/debian/rules
index 696b125..f35cd6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export JAVA_HOME=/usr/lib/jvm/default-java
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
@@ -9,9 +10,12 @@ export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 override_dh_install:
 	dh_install
 	mh_installjar -plibjffi-java pom.xml target/jffi-1.2.7.jar
-	mkdir -p debian/libjffi-jni/usr/share/java
-	cp dist/jffi-*-Linux.jar debian/libjffi-jni/usr/share/java/jffi-native.jar
-
+	
+	# install -jni library in multi-arch path
+	mkdir -p debian/libjffi-jni/usr/lib/$(DEB_HOST_MULTIARCH)/jni
+	jar xvf dist/jffi-*-Linux.jar
+	find jni/ -type f -name "*.so" -exec cp -v {} debian/libjffi-jni/usr/lib/$(DEB_HOST_MULTIARCH)/jni \;
+	
 override_dh_auto_build:
 	mkdir -p archive
 	ant -Duse.system.libffi=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi.git