[libjna-java] 03/03: Moved libjnidispatch.so into its own libjna-jni package and install it in a multiarch path

[Emmanuel Bourg]

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 64435ac6acd5d39bbf1fc8f79fbaea18bd551d8c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 14 14:53:42 2014 +0200

    Moved libjnidispatch.so into its own libjna-jni package and install it in a multiarch path
---
 debian/changelog           |  2 ++
 debian/control             | 15 +++++++++++++--
 debian/libjna-java.dirs    |  2 --
 debian/libjna-java.install |  1 -
 debian/rules               |  4 ++++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f65318..1f3a810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ libjna-java (3.4.1-1) UNRELEASED; urgency=low
   * Update d/watch for new upstream location
 
   [ Emmanuel Bourg ]
+  * Moved libjnidispatch.so into its own new arch any libjna-jni package
+  * Install libjnidispatch.so in a multiarch path
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/control b/debian/control
index 0c99bf7..d66ce62 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libjna-java.git
 Homepage: https://github.com/twall/jna
 
 Package: libjna-java
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}, libjna-jni
 Suggests: libjna-java-doc
 Description: Dynamic access of native libraries from Java without JNI
  JNA provides Java programs easy access to native shared libraries without
@@ -32,6 +32,17 @@ Description: Dynamic access of native libraries from Java without JNI
  native platform features without incurring the high overhead of configuring and
  building JNI code for multiple platforms.
 
+Package: libjna-jni
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Dynamic access of native libraries from Java without JNI
+ JNA provides Java programs easy access to native shared libraries without
+ writing anything but Java code - no JNI or native code is required. This
+ functionality is comparable to Windows' Platform/Invoke and Python's ctypes.
+ Access is dynamic at runtime without code generation.
+ .
+ This package contains the native libraries for libjna-java
+
 Package: libjna-java-doc
 Section: doc
 Architecture: all
diff --git a/debian/libjna-java.dirs b/debian/libjna-java.dirs
deleted file mode 100644
index 80d62e4..0000000
--- a/debian/libjna-java.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java
-usr/lib/jni
diff --git a/debian/libjna-java.install b/debian/libjna-java.install
deleted file mode 100644
index 5953c24..0000000
--- a/debian/libjna-java.install
+++ /dev/null
@@ -1 +0,0 @@
-build/native/libjnidispatch.so	/usr/lib/jni
diff --git a/debian/rules b/debian/rules
index c19f080..3e24d16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 export DEB_BUILD_HARDENING=1
 
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
 override_dh_auto_clean:
@@ -23,6 +25,8 @@ override_dh_auto_install:
 	mh_installjar -plibjna-java -l --usj-name=jna pom-jna.xml build/jna.jar
 	jh_installlibs -plibjna-java build/jna-platform.jar
 
+	dh_install -plibjna-jni build/native/libjnidispatch.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
+
 override_dh_makeshlibs:
 	# don't call dh_makeshlibs
 

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