r47213 - in /packages/jhdf/trunk/debian: bin/hdfview changelog control patches/series patches/slf4j.diff
pini at users.alioth.debian.org
pini at users.alioth.debian.org
Thu Mar 24 23:20:43 UTC 2016
Author: pini
Date: Thu Mar 24 23:20:42 2016
New Revision: 47213
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47213
Log:
Build against libslf4j-java
Added:
packages/jhdf/trunk/debian/patches/slf4j.diff
Modified:
packages/jhdf/trunk/debian/bin/hdfview
packages/jhdf/trunk/debian/changelog
packages/jhdf/trunk/debian/control
packages/jhdf/trunk/debian/patches/series
Modified: packages/jhdf/trunk/debian/bin/hdfview
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/bin/hdfview?rev=47213&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/bin/hdfview (original)
+++ packages/jhdf/trunk/debian/bin/hdfview Thu Mar 24 23:20:42 2016
@@ -9,7 +9,7 @@
# We prefer to use openjdk or Sun's java if available
find_java_runtime openjdk sun || find_java_runtime
-find_jars jhdf jhdf5 jhdfobj jhdf4obj jhdf5obj jhdfview jgraph
+find_jars jhdf jhdf5 jhdfobj jhdf4obj jhdf5obj jhdfview jgraph slf4j-api slf4j-nop
JAVA_ARGS="-Djava.library.path=/usr/lib/jni/ -Dswing.systemlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel "
run_java ncsa.hdf.view.HDFView -root /usr/share/doc/libjhdf-doc/ "$*"
Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=47213&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Thu Mar 24 23:20:42 2016
@@ -2,6 +2,8 @@
* New upstream release
* Refresh patches
+ * New patch:
+ - slf4j.diff: Debian classpath for slf4j jar files
-- Gilles Filippini <pini at debian.org> Tue, 22 Mar 2016 23:35:39 +0100
Modified: packages/jhdf/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/control?rev=47213&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/control (original)
+++ packages/jhdf/trunk/debian/control Thu Mar 24 23:20:42 2016
@@ -13,7 +13,8 @@
libhdf5-dev,
automake,
autoconf,
- imagemagick
+ imagemagick,
+ libslf4j-java
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/jhdf/
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/jhdf/
@@ -100,6 +101,7 @@
libjgraph-java,
libjhdf5-java,
libjhdf4-java,
+ libslf4j-java,
java-wrappers,
default-jre
Suggests: www-browser
Modified: packages/jhdf/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/series?rev=47213&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/series (original)
+++ packages/jhdf/trunk/debian/patches/series Thu Mar 24 23:20:42 2016
@@ -14,3 +14,4 @@
z_sharedOptMissing.diff
source1.5.diff
+slf4j.diff
Added: packages/jhdf/trunk/debian/patches/slf4j.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/slf4j.diff?rev=47213&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/slf4j.diff (added)
+++ packages/jhdf/trunk/debian/patches/slf4j.diff Thu Mar 24 23:20:42 2016
@@ -0,0 +1,193 @@
+Index: jhdf-2.11.0+dfsg/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -54,7 +54,7 @@ H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.j
+ #FITSDISTJARFILE = $(CLASS_DIR)/fits.jar
+ #NC2SDISTJARFILE = $(CLASS_DIR)/netcdf.jar
+ #JUNITSDISTJARFILE = $(CLASS_DIR)/junit.jar
+-LOGGINGDISTJARFILE = $(CLASS_DIR)/slf4j-api-1.7.5.jar $(CLASS_DIR)/slf4j-nop-1.7.5.jar
++LOGGINGDISTJARFILE = /usr/share/java/slf4j-api.jar /usr/share/java/slf4j-nop.jar
+
+ NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./ncsa/hdf/object/nc2/Makefile.in ./ncsa/hdf/object/nc2/CMakeLists.txt $(CLASS_DIR)/netcdf.jar
+
+@@ -360,8 +360,8 @@ install-jhdfview: ncsa.hdf.view
+ # cp lib/netcdf.jar $(LIBDIR)
+ # cp lib/fits.jar $(LIBDIR)
+ # cp lib/junit.jar $(LIBDIR)
+- cp lib/slf4j-api-1.7.5.jar $(LIBDIR)
+- cp lib/ext/slf4j-nop-1.7.5.jar $(LIBDIR)
++# cp lib/slf4j-api-1.7.5.jar $(LIBDIR)
++# cp lib/ext/slf4j-nop-1.7.5.jar $(LIBDIR)
+ cp bin/hdfview.sh $(BINDIR)
+ chmod a+x $(BINDIR)/hdfview.sh
+ for size in 16 22 24 32 48 64 96; do \
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/object/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/object/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/object/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/fits.jar:$(TOP)/lib/netcdf.jar:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:$(TOP)/lib/fits.jar:$(TOP)/lib/netcdf.jar:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/hdf5lib/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/callbacks/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/hdf5lib/callbacks/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/callbacks/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/exceptions/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/hdf5lib/exceptions/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/exceptions/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/structs/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/hdf5lib/structs/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/structs/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/hdflib/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/hdflib/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/hdflib/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/object/fits/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/object/fits/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/object/fits/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/fits.jar:$(TOP)/lib/netcdf.jar:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:$(TOP)/lib/fits.jar:$(TOP)/lib/netcdf.jar:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/object/h4/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/object/h4/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/object/h4/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/object/h5/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/object/h5/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/object/h5/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/view/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/view/Makefile.in
++++ jhdf-2.11.0+dfsg/ncsa/hdf/view/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib/slf4j-api-1.7.5.jar:$(TOP)/lib/slf4j-nop-1.7.5.jar
++CLASSPATH=@CLASSPATH@:/usr/share/java/slf4j-api.jar:/usr/share/java/slf4j-nop.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/test/object/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/test/object/Makefile.in
++++ jhdf-2.11.0+dfsg/test/object/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:../../lib/junit.jar:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:../../lib/junit.jar:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/test/object/misc/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/test/object/misc/Makefile.in
++++ jhdf-2.11.0+dfsg/test/object/misc/Makefile.in
+@@ -23,7 +23,7 @@ JAVADOC_FLAGS = -version -author
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:$(TOP)/lib:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:$(TOP)/lib:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
+Index: jhdf-2.11.0+dfsg/test/uitest/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/test/uitest/Makefile.in
++++ jhdf-2.11.0+dfsg/test/uitest/Makefile.in
+@@ -23,7 +23,7 @@ RM = @RM@
+ SLEXT=@SLEXT@
+ JSLEXT=@JSLEXT@
+
+-CLASSPATH=@CLASSPATH@:../../lib/junit.jar:../../lib/fest-swing-1.2.jar:../../lib/jcip-annotations-1.0.jar:$(TOP)/lib/slf4j-api-1.7.5.jar
++CLASSPATH=@CLASSPATH@:../../lib/junit.jar:../../lib/fest-swing-1.2.jar:../../lib/jcip-annotations-1.0.jar:/usr/share/java/slf4j-api.jar
+ JH45INSTALLDIR=@JH45INST@
+ H45INC=@H45INC@
+ H4INC=@HDF4INC@
More information about the debian-science-commits
mailing list