[Pkg-ceph-commits] [ceph] 06/43: Use jh_installlib to install Java libraries

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel-gaudenz
in repository ceph.

commit 4385b46d2fc7e430ec42c84fe41f9826be6c4612
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Sun Nov 1 18:26:03 2015 +0100

    Use jh_installlib to install Java libraries
---
 debian/ceph-test.install    | 1 -
 debian/ceph-test.jlibs      | 1 +
 debian/libcephfs-java.jlibs | 2 +-
 debian/not-installed        | 6 ++++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index ba55036..ad0996d 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -24,4 +24,3 @@ usr/bin/ceph_test_* /usr/lib/ceph/bin
 usr/bin/ceph_tpbench /usr/lib/ceph/bin
 usr/bin/ceph_xattr_bench /usr/lib/ceph/bin
 usr/lib/*/ceph/ceph-monstore-update-crush.sh /usr/lib/ceph
-usr/share/java/libcephfs-test.jar
diff --git a/debian/ceph-test.jlibs b/debian/ceph-test.jlibs
new file mode 100644
index 0000000..ca3da00
--- /dev/null
+++ b/debian/ceph-test.jlibs
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/libcephfs-test.jar
\ No newline at end of file
diff --git a/debian/libcephfs-java.jlibs b/debian/libcephfs-java.jlibs
index f59632a..1029fb5 100644
--- a/debian/libcephfs-java.jlibs
+++ b/debian/libcephfs-java.jlibs
@@ -1 +1 @@
-src/java/libcephfs.jar
+debian/tmp/usr/share/java/libcephfs.jar
diff --git a/debian/not-installed b/debian/not-installed
index ee2b266..da4e5ee 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,9 @@
+# files installed by jh_installlib
+debian/tmp/usr/share/java/libcephfs.jar
+debian/tmp/usr/share/java/libcephfs-test.jar
+# There is currently no -dev package for libcephfs-jni,
+# so the static library is not needed
+debian/tmp/usr/lib/x86_64-linux-gnu/libcephfs_jni.a
 # this is not needed by the newer udev rules
 # it's only relevant to udev/95-ceph-osd-alt.rules
 # which is not installed on Debian

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