[med-svn] r19969 - in trunk/packages/libsis-base-java/trunk/debian: . patches
Timothy Booth
tbooth-guest at moszumanska.debian.org
Mon Aug 17 12:13:55 UTC 2015
Author: tbooth-guest
Date: 2015-08-17 12:13:53 +0000 (Mon, 17 Aug 2015)
New Revision: 19969
Removed:
trunk/packages/libsis-base-java/trunk/debian/libsis-base.install
Modified:
trunk/packages/libsis-base-java/trunk/debian/control
trunk/packages/libsis-base-java/trunk/debian/patches/load_native_debian.patch
trunk/packages/libsis-base-java/trunk/debian/rules
trunk/packages/libsis-base-java/trunk/debian/watch
Log:
Modified the package to comply with
https://www.debian.org/doc/packaging-manuals/java-policy/x104.html
Modified: trunk/packages/libsis-base-java/trunk/debian/control
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/control 2015-08-16 20:08:35 UTC (rev 19968)
+++ trunk/packages/libsis-base-java/trunk/debian/control 2015-08-17 12:13:53 UTC (rev 19969)
@@ -13,16 +13,14 @@
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libsis-base-java/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/libsis-base-java/trunk/
-
Package: libsis-base-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}, libsis-base
+Depends: ${misc:Depends}, ${java:Depends}, libsis-base-jni (= ${binary:Version})
Description: Base libraries used by software from the SIS division at ETH Zurich
- This library supplies some utility classes needed for libraries like sis-jhdf5
+ This library supplies some utility classes needed for libraries like sis-jhdf5.
-Package: libsis-base
+Package: libsis-base-jni
Architecture: any
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Native libraries used by libsis-base-java
- Those library are called via JNI by linsis-base-java jar files.
+Depends: ${misc:Depends}, ${java:Depends}
+Description: Base libraries used by ETH-SIS (JNI components)
+ This library contains the two small native libraries used by libsis-base-java.
Deleted: trunk/packages/libsis-base-java/trunk/debian/libsis-base.install
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/libsis-base.install 2015-08-16 20:08:35 UTC (rev 19968)
+++ trunk/packages/libsis-base-java/trunk/debian/libsis-base.install 2015-08-17 12:13:53 UTC (rev 19969)
@@ -1 +0,0 @@
-source/c/.libs/lib*.so.* usr/lib/sis-base/
Modified: trunk/packages/libsis-base-java/trunk/debian/patches/load_native_debian.patch
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/patches/load_native_debian.patch 2015-08-16 20:08:35 UTC (rev 19968)
+++ trunk/packages/libsis-base-java/trunk/debian/patches/load_native_debian.patch 2015-08-17 12:13:53 UTC (rev 19969)
@@ -1,17 +1,29 @@
Subject: fix way to load native libraries
-Description: upstream loads .so file (not using .so.0 and search in a
- directory containing specific arch name. Modify it to use .so.0 and
- search in native.libpath directly.
---- a/source/java/ch/systemsx/cisd/base/utilities/NativeLibraryUtilities.java
-+++ b/source/java/ch/systemsx/cisd/base/utilities/NativeLibraryUtilities.java
-@@ -147,8 +147,8 @@
+Description: upstream applies various methods to look for the
+ native library and falls back to pure java if linking fails.
+ Here we just load the library from /usr/lib/jni and quit
+ immediately if linking fails.
+--- a/source/java/ch/systemsx/cisd/base/convert/NativeData.java
++++ b/source/java/ch/systemsx/cisd/base/convert/NativeData.java
+@@ -45,7 +45,8 @@
+ useNativeLib = false;
+ } else
+ {
+- useNativeLib = NativeLibraryUtilities.loadNativeLibrary("nativedata");
++ System.loadLibrary("cisd_nativedata");
++ useNativeLib = true;
+ }
+ }
- private static String getLibPath(final String prefix, final String libraryName)
+--- a/source/java/ch/systemsx/cisd/base/unix/Unix.java
++++ b/source/java/ch/systemsx/cisd/base/unix/Unix.java
+@@ -46,7 +46,8 @@
+
+ static
{
-- return String.format("%s/%s/%s/%s%s.%s", prefix, libraryName, OSUtilities
-- .getCompatibleComputerPlatform(), JNI_LIB_PREFIX, libraryName, JNI_LIB_EXTENSION);
-+ return String.format("%s/%cisd_%s.%s.0", prefix,
-+ JNI_LIB_PREFIX, libraryName, JNI_LIB_EXTENSION);
- }
-
- }
+- operational = NativeLibraryUtilities.loadNativeLibrary("unix");
++ System.loadLibrary("cisd_unix");
++ operational = true;
+ if (operational)
+ {
+ init();
Modified: trunk/packages/libsis-base-java/trunk/debian/rules
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/rules 2015-08-16 20:08:35 UTC (rev 19968)
+++ trunk/packages/libsis-base-java/trunk/debian/rules 2015-08-17 12:13:53 UTC (rev 19969)
@@ -16,18 +16,21 @@
override_dh_auto_configure:
cp debian/build_native/* source/c
+ #Needed on Ubuntu 14.04
+ touch source/c/NEWS source/c/README source/c/AUTHORS source/c/ChangeLog
cd source/c && autoreconf -i
dh_auto_configure
-#override_dh_auto_install:
-# cd source/c && make install
-# dh_auto_install
+override_dh_auto_install:
+ dh_auto_install
+ dh_installdirs -plibsis-base-jni /usr/lib/jni
+ cp -L source/c/.libs/*.so debian/*/usr/lib/jni/
override_dh_auto_clean:
if test -e source/c/Makefile; then cd source/c; make clean; fi
rm -f source/c/AUTHORS source/c/NEWS source/c/README source/c/ChangeLog
rm -rf source/c/configure* source/c/Makefile* source/c/autom4te.cache
- rm -rf src lib build *.jar test
+ rm -rf src lib build *.jar test .classpath libs
#find test -name '*.class' -delete
override_dh_auto_build:
@@ -41,4 +44,4 @@
dh_auto_test
mkdir test ; cp -r source/java/ch test ; cp -r sourceTest/java/ch test
jh_build sis-base-test.jar test
- LC_ALL=C java -Dnative.libpath=source/c/.libs -classpath sis-base-test.jar ch.systemsx.cisd.base.AllTests
+ LC_ALL=C java -Djava.library.path=source/c/.libs -classpath sis-base-test.jar ch.systemsx.cisd.base.AllTests
Modified: trunk/packages/libsis-base-java/trunk/debian/watch
===================================================================
--- trunk/packages/libsis-base-java/trunk/debian/watch 2015-08-16 20:08:35 UTC (rev 19968)
+++ trunk/packages/libsis-base-java/trunk/debian/watch 2015-08-17 12:13:53 UTC (rev 19969)
@@ -1,3 +1,3 @@
-# The latest vesrsion can be found at http://bs-svn01.ethz.ch/repos/cisd/libraries/trunk/sis-base/
-# and I've inferred the version from the BUILD-base.INFO file in the zip file.
-# As the version is not part of the file name we can't "watch" it.
+# The latest vesrsion can be found at:
+#
+# http://svncisd.ethz.ch/repos/cisd/base/tags/release/14.12.x/14.12.0/base
More information about the debian-med-commit
mailing list