r47212 - in /packages/jhdf/trunk/debian: ./ patches/
pini at users.alioth.debian.org
pini at users.alioth.debian.org
Thu Mar 24 23:17:54 UTC 2016
Author: pini
Date: Thu Mar 24 23:17:53 2016
New Revision: 47212
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47212
Log:
Start working on upstream release 2.11.0 and refresh patches
Modified:
packages/jhdf/trunk/debian/changelog
packages/jhdf/trunk/debian/patches/installIcons.diff
packages/jhdf/trunk/debian/patches/installPath.diff
packages/jhdf/trunk/debian/patches/jhdfobj.diff
packages/jhdf/trunk/debian/patches/manifest.diff
packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
packages/jhdf/trunk/debian/patches/settings_path.diff
packages/jhdf/trunk/debian/patches/source1.5.diff
packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff
packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff
Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Thu Mar 24 23:17:53 2016
@@ -1,3 +1,10 @@
+jhdf (2.11.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Refresh patches
+
+ -- Gilles Filippini <pini at debian.org> Tue, 22 Mar 2016 23:35:39 +0100
+
jhdf (2.9-5) unstable; urgency=medium
* CPPFLAGS+=-I$(JAVA_HOME)/include/linux to workaround #760301.
Modified: packages/jhdf/trunk/debian/patches/installIcons.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installIcons.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installIcons.diff (original)
+++ packages/jhdf/trunk/debian/patches/installIcons.diff Thu Mar 24 23:17:53 2016
@@ -1,9 +1,9 @@
-Index: jhdf-2.9/Makefile.in
+Index: jhdf-2.11.0+dfsg/Makefile.in
===================================================================
---- jhdf-2.9.orig/Makefile.in 2012-12-05 11:46:15.000000000 +0100
-+++ jhdf-2.9/Makefile.in 2012-12-05 11:46:21.000000000 +0100
-@@ -369,6 +369,14 @@
- cp lib/junit.jar $(LIBDIR)
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -364,6 +364,14 @@ install-jhdfview: ncsa.hdf.view
+ 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 \
Modified: packages/jhdf/trunk/debian/patches/installPath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installPath.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installPath.diff (original)
+++ packages/jhdf/trunk/debian/patches/installPath.diff Thu Mar 24 23:17:53 2016
@@ -1,23 +1,21 @@
-Index: jhdf-2.9/Makefile.in
+Index: jhdf-2.11.0+dfsg/Makefile.in
===================================================================
---- jhdf-2.9.orig/Makefile.in 2012-12-05 11:46:21.000000000 +0100
-+++ jhdf-2.9/Makefile.in 2012-12-05 11:46:35.000000000 +0100
-@@ -30,10 +30,10 @@
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -32,9 +32,9 @@ H4INC=@HDF4INC@
H5INC=@HDF5INC@
#make this relative to the source root...
-LIBDIR=$(JH45INSTALLDIR)/lib
-BINDIR=$(JH45INSTALLDIR)/bin
-DOCDIR= $(JH45INSTALLDIR)/docs
--UGDIR= $(JH45INSTALLDIR)/UsersGuide
+LIBDIR=$(JH45INSTALLDIR)/usr/share/java
+BINDIR=$(JH45INSTALLDIR)/usr/bin
+DOCDIR= $(JH45INSTALLDIR)/usr/share/doc/libjhdf-doc/docs
-+UGDIR= $(JH45INSTALLDIR)//usr/share/doc/libjhdf-doc/UsersGuide
CLASS_DIR=$(TOP)/lib
CP="$(CLASSPATH):$(CLASS_DIR):. "
-@@ -324,7 +324,7 @@
+@@ -322,7 +322,7 @@ install-jhdf:
do-install-jhdf: jhdf-packages
-mkdir -p $(LIBDIR);
@@ -26,7 +24,7 @@
@echo "Install JHI complete"
install-jhdf5:
-@@ -332,7 +332,7 @@
+@@ -330,7 +330,7 @@ install-jhdf5:
do-install-jhdf5: jhdf5-packages
-mkdir -p $(LIBDIR);
@@ -35,7 +33,7 @@
@echo "Install JHI5 complete"
install-jhdfobj: ncsa.hdf.object
-@@ -344,20 +344,20 @@
+@@ -342,20 +342,20 @@ install-jhdfobj: ncsa.hdf.object
do-install-jhdf4obj: ncsa.hdf.object.h4
-mkdir -p $(LIBDIR);
@@ -59,31 +57,31 @@
- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
+ $(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+ $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
- $(RM) -rf $(UGDIR);
- -mkdir -p $(UGDIR);
- cp -R docs/hdfview/UsersGuide/* $(UGDIR);
-@@ -380,18 +380,18 @@
+ -mkdir -p $(BINDIR);
+ cp lib/netcdf.jar $(LIBDIR)
+ cp lib/fits.jar $(LIBDIR)
+@@ -375,18 +375,18 @@ install-jhdfview: ncsa.hdf.view
@echo "Install HDFVIEW complete"
uninstall-jhi5:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf5.jar
-+ $(RM) -f $(LIBDIR)/lib/jhdf5.jar
++ $(RM) -f $(LIBDIR)/jhdf5.jar
uninstall-jhi:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf.jar
-+ $(RM) -f $(LIBDIR)/lib/jhdf.jar
++ $(RM) -f $(LIBDIR)/jhdf.jar
uninstall-jhdfobj:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdfobj.jar
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf4obj.jar
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf5obj.jar
-+ $(RM) -f $(LIBDIR)/lib/jhdfobj.jar
-+ $(RM) -f $(LIBDIR)/lib/jhdf4obj.jar
-+ $(RM) -f $(LIBDIR)/lib/jhdf5obj.jar
++ $(RM) -f $(LIBDIR)/jhdfobj.jar
++ $(RM) -f $(LIBDIR)/jhdf4obj.jar
++ $(RM) -f $(LIBDIR)/jhdf5obj.jar
uninstall-jhdfview:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdfview.jar;
-+ $(RM) -f $(LIBDIR)/lib/jhdfview.jar;
- $(RM) -rf $(UGDIR)
++ $(RM) -f $(LIBDIR)/jhdfview.jar;
- install-docs: install-javadocs install-ug
+ install-docs: install-javadocs
+
Modified: packages/jhdf/trunk/debian/patches/jhdfobj.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/jhdfobj.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/jhdfobj.diff (original)
+++ packages/jhdf/trunk/debian/patches/jhdfobj.diff Thu Mar 24 23:17:53 2016
@@ -1,8 +1,8 @@
-Index: jhdf-2.9/Makefile.in
+Index: jhdf-2.11.0+dfsg/Makefile.in
===================================================================
---- jhdf-2.9.orig/Makefile.in 2012-12-05 11:46:35.000000000 +0100
-+++ jhdf-2.9/Makefile.in 2012-12-05 11:48:41.000000000 +0100
-@@ -337,7 +337,7 @@
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -335,7 +335,7 @@ do-install-jhdf5: jhdf5-packages
install-jhdfobj: ncsa.hdf.object
-mkdir -p $(LIBDIR);
Modified: packages/jhdf/trunk/debian/patches/manifest.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/manifest.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/manifest.diff (original)
+++ packages/jhdf/trunk/debian/patches/manifest.diff Thu Mar 24 23:17:53 2016
@@ -1,8 +1,8 @@
-Index: jhdf-2.9/Makefile.in
+Index: jhdf-2.11.0+dfsg/Makefile.in
===================================================================
---- jhdf-2.9.orig/Makefile.in 2012-12-05 11:48:41.000000000 +0100
-+++ jhdf-2.9/Makefile.in 2012-12-05 11:48:49.000000000 +0100
-@@ -183,7 +183,7 @@
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -181,7 +181,7 @@ do-jh5obj-packages: $(H5OBJPACKAGES)
$(JAR) cf $(CLASS_DIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
jhdfview-packages: $(HDFVIEWPACKAGES)
@@ -11,7 +11,7 @@
classes: packages
-@@ -354,7 +354,7 @@
+@@ -352,7 +352,7 @@ do-install-jhdf5obj: ncsa.hdf.object.h5
install-jhdfview: ncsa.hdf.view
-mkdir -p $(LIBDIR);
Modified: packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/removeDebugMessage.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/removeDebugMessage.diff (original)
+++ packages/jhdf/trunk/debian/patches/removeDebugMessage.diff Thu Mar 24 23:17:53 2016
@@ -1,47 +1,49 @@
-Index: jhdf-2.9/ncsa/hdf/hdf5lib/H5.java
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/H5.java
===================================================================
---- jhdf-2.9.orig/ncsa/hdf/hdf5lib/H5.java 2012-11-13 00:11:48.000000000 +0100
-+++ jhdf-2.9/ncsa/hdf/hdf5lib/H5.java 2012-12-05 11:49:38.000000000 +0100
-@@ -302,10 +302,10 @@
+--- jhdf-2.11.0+dfsg.orig/ncsa/hdf/hdf5lib/H5.java
++++ jhdf-2.11.0+dfsg/ncsa/hdf/hdf5lib/H5.java
+@@ -273,10 +273,10 @@ public class H5 implements java.io.Seria
isLibraryLoaded = false;
}
finally {
-- s_logger.log(Level.INFO, "HDF5 library: " + s_libraryName
-- + " resolved to: " + mappedName + "; "
-- + (isLibraryLoaded ? "" : " NOT")
-- + " successfully loaded from java.library.path");
-+ // s_logger.log(Level.INFO, "HDF5 library: " + s_libraryName
-+ // + " resolved to: " + mappedName + "; "
-+ // + (isLibraryLoaded ? "" : " NOT")
-+ // + " successfully loaded from java.library.path");
-
+- log.info("HDF5 library: " + s_libraryName);
+- log.debug(" resolved to: " + mappedName + "; ");
+- log.info((isLibraryLoaded ? "" : " NOT")
+- + " successfully loaded from system property");
++ // log.info("HDF5 library: " + s_libraryName);
++ // log.debug(" resolved to: " + mappedName + "; ");
++ // log.info((isLibraryLoaded ? "" : " NOT")
++ // + " successfully loaded from system property");
}
}
-@@ -325,9 +325,9 @@
+
+@@ -295,10 +295,10 @@ public class H5 implements java.io.Seria
isLibraryLoaded = false;
}
finally {
-- s_logger.log(Level.INFO, "HDF5 library: " + filename
-- + (isLibraryLoaded ? "" : " NOT")
+- log.info("HDF5 library: ");
+- log.debug(filename);
+- log.info((isLibraryLoaded ? "" : " NOT")
- + " successfully loaded.");
-+ // s_logger.log(Level.INFO, "HDF5 library: " + filename
-+ // + (isLibraryLoaded ? "" : " NOT")
++ // log.info("HDF5 library: ");
++ // log.debug(filename);
++ // log.info((isLibraryLoaded ? "" : " NOT")
+ // + " successfully loaded.");
-
}
}
-@@ -352,10 +352,10 @@
+ else {
+@@ -321,10 +321,10 @@ public class H5 implements java.io.Seria
isLibraryLoaded = false;
}
finally {
-- s_logger.log(Level.INFO, "HDF5 library: " + s_libraryName
-- + " resolved to: " + mappedName + "; "
-- + (isLibraryLoaded ? "" : " NOT")
+- log.info("HDF5 library: " + s_libraryName);
+- log.debug(" resolved to: " + mappedName + "; ");
+- log.info((isLibraryLoaded ? "" : " NOT")
- + " successfully loaded from java.library.path");
-+ // s_logger.log(Level.INFO, "HDF5 library: " + s_libraryName
-+ // + " resolved to: " + mappedName + "; "
-+ // + (isLibraryLoaded ? "" : " NOT")
-+ // + " successfully loaded from java.library.path");
-
++ // log.info("HDF5 library: " + s_libraryName);
++ // log.debug(" resolved to: " + mappedName + "; ");
++ // log.info((isLibraryLoaded ? "" : " NOT")
++ // + " successfully loaded from java.library.path");
}
}
+
Modified: packages/jhdf/trunk/debian/patches/settings_path.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/settings_path.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/settings_path.diff (original)
+++ packages/jhdf/trunk/debian/patches/settings_path.diff Thu Mar 24 23:17:53 2016
@@ -1,8 +1,8 @@
-Index: jhdf-2.9/Makefile.in
+Index: jhdf-2.11.0+dfsg/Makefile.in
===================================================================
---- jhdf-2.9.orig/Makefile.in 2013-08-06 12:05:44.000000000 +0200
-+++ jhdf-2.9/Makefile.in 2013-08-06 12:15:38.000000000 +0200
-@@ -286,11 +286,11 @@
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -284,11 +284,11 @@ install-lib: natives
-mkdir -p $(LIBDIR);
-mkdir -p $(LIBDIR)/@JAVATARG@
@if test x'$(H5INC)' != x'' ; then \
Modified: packages/jhdf/trunk/debian/patches/source1.5.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/source1.5.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/source1.5.diff (original)
+++ packages/jhdf/trunk/debian/patches/source1.5.diff Thu Mar 24 23:17:53 2016
@@ -1,8 +1,8 @@
-Index: jhdf-2.8.0/config/Rules.mk
+Index: jhdf-2.11.0+dfsg/config/Rules.mk
===================================================================
---- jhdf-2.8.0.orig/config/Rules.mk 2011-09-29 22:08:18.000000000 +0200
-+++ jhdf-2.8.0/config/Rules.mk 2012-02-28 21:27:52.181413614 +0100
-@@ -25,7 +25,7 @@
+--- jhdf-2.11.0+dfsg.orig/config/Rules.mk
++++ jhdf-2.11.0+dfsg/config/Rules.mk
+@@ -36,7 +36,7 @@ CURRENTDIR = .
JAR_DIR=$(CLASS_DIR)
OUT_DIR=$(CLASS_DIR)/$(DIR)
Modified: packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff Thu Mar 24 23:17:53 2016
@@ -1,8 +1,8 @@
-Index: jhdf-2.9/configure.in
+Index: jhdf-2.11.0+dfsg/configure.in
===================================================================
---- jhdf-2.9.orig/configure.in 2012-12-05 11:50:56.000000000 +0100
-+++ jhdf-2.9/configure.in 2012-12-05 11:50:57.000000000 +0100
-@@ -95,16 +95,16 @@
+--- jhdf-2.11.0+dfsg.orig/configure.in
++++ jhdf-2.11.0+dfsg/configure.in
+@@ -95,16 +95,16 @@ JSLEXT="so";
COPT="-pthread -shared"; COPTNOSHARED=;
;;
*aix*) TARGETLIB="aix"
@@ -23,7 +23,7 @@
;;
mips*-sgi-irix6*)
TARGETLIB="irix"
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ JSLEXT="jnilib";
LLEXT="a";
SLEXT="dylib";
;;
@@ -32,7 +32,7 @@
LLEXT="a";
TARGETLIB="$target"
esac
-@@ -582,17 +582,17 @@
+@@ -605,17 +605,17 @@ COPT="-pthread -shared"; COPTNOSHARED=;
JAVAINC2=$JAVAINC/alpha ; JAVATARG=alpha;
;;
*aix*)
@@ -54,7 +54,7 @@
JAVAINC2=$JAVAINC/solaris ; JAVATARG=solaris;
;;
mips*-sgi-irix6*)
-@@ -665,7 +665,7 @@
+@@ -688,7 +688,7 @@ SLEXT="dylib";
JAVAINC2=$JAVAINC/macosx;
JAVATARG=macosx;
;;
Modified: packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff?rev=47212&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff Thu Mar 24 23:17:53 2016
@@ -1,8 +1,8 @@
-Index: jhdf-2.9/Makefile.in
+Index: jhdf-2.11.0+dfsg/Makefile.in
===================================================================
---- jhdf-2.9.orig/Makefile.in
-+++ jhdf-2.9/Makefile.in
-@@ -50,9 +50,9 @@ H4OBJDISTFILES= ./ncsa/hdf/object/h4/*.j
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -51,9 +51,9 @@ H4OBJDISTFILES= ./ncsa/hdf/object/h4/*.j
H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java ./ncsa/hdf/object/h5/Makefile.in ./ncsa/hdf/object/h5/CMakeLists.txt
@@ -12,10 +12,10 @@
+#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
NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./ncsa/hdf/object/nc2/Makefile.in ./ncsa/hdf/object/nc2/CMakeLists.txt $(CLASS_DIR)/netcdf.jar
-
-@@ -152,7 +152,7 @@ install-just-hdf4: install-hdflib instal
+@@ -150,7 +150,7 @@ install-just-hdf4: install-hdflib instal
install-just-hdf5: install-hdf5lib install-jhdf5
@@ -24,7 +24,7 @@
jhdf-packages:
@if test x'$(H4INC)' != x'' ; then $(MAKE) do-jhdf-packages; fi
-@@ -356,17 +356,17 @@ install-jhdfview: ncsa.hdf.view
+@@ -354,12 +354,12 @@ install-jhdfview: ncsa.hdf.view
-mkdir -p $(LIBDIR);
$(JAR) cfm $(LIBDIR)/jhdfview.jar debian/hdfview.manifest -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-mkdir -p $(LIBDIR)/ext
@@ -32,11 +32,6 @@
- $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
+# $(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+# $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
- $(RM) -rf $(UGDIR);
- -mkdir -p $(UGDIR);
- cp -R docs/hdfview/UsersGuide/* $(UGDIR);
- $(RM) -rf $(UGDIR)/.svn
- $(RM) -rf $(UGDIR)/images/.svn
-mkdir -p $(BINDIR);
- cp lib/netcdf.jar $(LIBDIR)
- cp lib/fits.jar $(LIBDIR)
@@ -44,13 +39,13 @@
+# 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 bin/hdfview.sh $(BINDIR)
- chmod a+x $(BINDIR)/hdfview.sh
- for size in 16 22 24 32 48 64 96; do \
-Index: jhdf-2.9/ncsa/hdf/object/Makefile.in
+Index: jhdf-2.11.0+dfsg/ncsa/hdf/object/Makefile.in
===================================================================
---- jhdf-2.9.orig/ncsa/hdf/object/Makefile.in
-+++ jhdf-2.9/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
@@ -13,7 +13,7 @@
TOP = ../../..
More information about the debian-science-commits
mailing list