java: update deb bits from ceph-devel feedback

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/debian/.gitignore b/debian/.gitignore
index c5b73ce1a4fa13421d98a860df96293971f690be..21b52f4e9d569d7f071a69960e9766634dbfca2d 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -30,5 +30,6 @@
 /rest-bench-dbg
 /rest-bench
 /python-ceph
-/libceph1-java
+/libcephfs-java
+/libcephfs-jni
 /tmp

diff --git a/debian/control b/debian/control
index 2c44bd45c94d271e06cd696d43fdb8accae2f0f8..dbf95fa944fe9c683225d93e1cb165cd042cd38a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -319,8 +319,14 @@ Description: Python libraries for the Ceph distributed filesystem
  This package contains Python libraries for interacting with Ceph's
  RADOS object storage, and RBD (RADOS block device).
 
-Package: libceph1-java
+Package: libcephfs-java
 Section: java
+Architecture: all
+Depends: libcephfs-jni, ${java:Depends}, ${misc:Depends}
+Description: Java libraries for the Ceph File System.
+
+Package: libcephfs-jni
 Architecture: linux-any
+Section: libs
 Depends: libcephfs1, ${shlibs:Depends}, ${java:Depends}, ${misc:Depends}
-Description: Java libraries for the Ceph File System
+Description: Java Native Interface library for CephFS Java bindings.

diff --git a/debian/libceph1-java.install b/debian/libceph1-java.install
deleted file mode 100644 (file)
index 98133e4..0000000
--- a/debian/libceph1-java.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcephfs_jni.so* usr/lib/jni
-usr/lib/libcephfs.jar usr/share/java

diff --git a/debian/libcephfs-java.jlibs b/debian/libcephfs-java.jlibs
new file mode 100644 (file)
index 0000000..f59632a
--- /dev/null
+++ b/debian/libcephfs-java.jlibs
@@ -0,0 +1 @@
+src/java/libcephfs.jar

diff --git a/debian/libcephfs-jni.install b/debian/libcephfs-jni.install
new file mode 100644 (file)
index 0000000..072b990
--- /dev/null
+++ b/debian/libcephfs-jni.install
@@ -0,0 +1 @@
+usr/lib/libcephfs_jni.so* usr/lib/jni

diff --git a/debian/rules b/debian/rules
index b848ddc8bad61f8dfe25103e4e51ca3999e38203..6d6138559e9610e63262543cd040c8918b914759 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,7 @@ install: build
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.
 binary-indep: build install
+       jh_installlibs -v -i
 
 # We have nothing to do by default.
 # Build architecture-dependent files here.

diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 5c54f363f5d2cdfb2cb6f773672bb3f9755a5f10..5920407ad658d2d0db0c01875d3506e90c564ef1 100644 (file)
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -24,7 +24,7 @@ CEPH_PROXY=java/com/ceph/fs/CephMount.class
 
 $(CEPH_PROXY): $(JAVA_SRC)
        export CLASSPATH=java/ ;
-       $(JAVAC) java/com/ceph/fs/*.java
+       $(JAVAC) -source 1.5 -target 1.5 java/com/ceph/fs/*.java
 
 $(JAVA_H): $(CEPH_PROXY)
        export CLASSPATH=java/ ; \

diff --git a/src/java/build.xml b/src/java/build.xml
index f846ca433e4375812f20ff1c65ae51adbed336ca..119a187034fd889e32870d359bacb8c99b9c149d 100644 (file)
--- a/src/java/build.xml
+++ b/src/java/build.xml
@@ -31,7 +31,7 @@
 
        <target name="compile-tests" depends="makedir">
         <javac srcdir="${test.src.dir}" destdir="${test.build.dir}"
-            includeantruntime="false">
+            includeantruntime="false" source="1.5" target="1.5">
             <classpath>
                                <pathelement location="${env.CEPHFS_JAR}"/>
                                <pathelement location="libcephfs.jar"/>