r36165 - in /packages/jhdf/trunk/debian: changelog control libjhdf5-java.install patches/installPath.diff patches/removeDebugMessage.diff patches/source15.diff patches/z_nc2-fits-disabled.diff
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sun Feb 14 16:54:46 UTC 2010
Author: sylvestre
Date: Sun Feb 14 16:54:45 2010
New Revision: 36165
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36165
Log:
new upstream release
Modified:
packages/jhdf/trunk/debian/changelog
packages/jhdf/trunk/debian/control
packages/jhdf/trunk/debian/libjhdf5-java.install
packages/jhdf/trunk/debian/patches/installPath.diff
packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
packages/jhdf/trunk/debian/patches/source15.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=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Sun Feb 14 16:54:45 2010
@@ -1,3 +1,16 @@
+jhdf (2.6-2) UNRELEASE; urgency=low
+
+ * Standards-Version updated to version 3.8.4
+ * Build dep libjpeg62-dev => libjpeg-dev
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 14 Feb 2010 11:57:59 +0100
+
+jhdf (2.6-1) unstable; urgency=low
+
+ * New upstream release (uses libhdf5 1.8.4) (Closes: #566534)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 23 Jan 2010 20:47:19 +0100
+
jhdf (2.5-11) unstable; urgency=low
* gcj does not accept -target 1.5 only (need also -source 1.5)
Modified: packages/jhdf/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/control?rev=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/control (original)
+++ packages/jhdf/trunk/debian/control Sun Feb 14 16:54:45 2010
@@ -4,9 +4,9 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: debhelper (>= 7), autotools-dev, cdbs, default-jdk,
- libjpeg62-dev, zlib1g-dev, libhdf4-dev, libhdf5-serial-dev, automake,
- autoconf
-Standards-Version: 3.8.3
+ libjpeg-dev, zlib1g-dev, libhdf4-dev, libhdf5-serial-dev (>= 1.8.4),
+ automake, autoconf
+Standards-Version: 3.8.4
Homepage: http://www.hdfgroup.org/hdf-java-html/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/jhdf/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/jhdf/
Modified: packages/jhdf/trunk/debian/libjhdf5-java.install
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/libjhdf5-java.install?rev=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/libjhdf5-java.install (original)
+++ packages/jhdf/trunk/debian/libjhdf5-java.install Sun Feb 14 16:54:45 2010
@@ -1,3 +1,2 @@
debian/tmp/usr/share/java/jhdf5.jar
-debian/tmp/usr/share/java/h5srb.jar
debian/tmp/usr/share/java/jhdf5obj.jar
Modified: packages/jhdf/trunk/debian/patches/installPath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installPath.diff?rev=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installPath.diff (original)
+++ packages/jhdf/trunk/debian/patches/installPath.diff Sun Feb 14 16:54:45 2010
@@ -64,36 +64,28 @@
$(RM) -rf $(UGDIR);
-mkdir -p $(UGDIR);
cp -R docs/hdfview/UsersGuide/* $(UGDIR);
-@@ -344,24 +344,24 @@
+@@ -346,18 +346,18 @@
@echo "Install HDFVIEW complete"
-
- install-h5srb: ncsa.hdf.srb
-- $(JAR) cf $(JH45INSTALLDIR)/lib/h5srb.jar $(H5SRBCLASSES)
-+ $(JAR) cf $(LIBDIR)/h5srb.jar $(H5SRBCLASSES)
-
- uninstall-h5srb:
-- $(RM) -f $(JH45INSTALLDIR)/lib/h5srb.jar
-+ $(RM) -f $(LIBDIR)/h5srb.jar
uninstall-jhi5:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf5.jar
-+ $(RM) -f $(LIBDIR)/jhdf5.jar
++ $(RM) -f $(LIBDIR)/lib/jhdf5.jar
uninstall-jhi:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf.jar
-+ $(RM) -f $(LIBDIR)/jhdf.jar
++ $(RM) -f $(LIBDIR)/lib/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)/jhdfobj.jar
-+ $(RM) -f $(LIBDIR)/jhdf4obj.jar
-+ $(RM) -f $(LIBDIR)/jhdf5obj.jar
++ $(RM) -f $(LIBDIR)/lib/jhdfobj.jar
++ $(RM) -f $(LIBDIR)/lib/jhdf4obj.jar
++ $(RM) -f $(LIBDIR)/lib/jhdf5obj.jar
uninstall-jhdfview:
- $(RM) -f $(JH45INSTALLDIR)/lib/jhdfview.jar;
-+ $(RM) -f $(LIBDIR)/jhdfview.jar;
++ $(RM) -f $(LIBDIR)/lib/jhdfview.jar;
$(RM) -rf $(UGDIR)
install-docs: install-javadocs install-ug
Modified: packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/removeDebugMessage.diff?rev=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/removeDebugMessage.diff (original)
+++ packages/jhdf/trunk/debian/patches/removeDebugMessage.diff Sun Feb 14 16:54:45 2010
@@ -1,29 +1,31 @@
---- jhdf-2.5.obsolete.0.958577492115186/ncsa/hdf/hdf5lib/H5.java 2009-01-13 20:59:12.000000000 +0100
-+++ jhdf-2.5.obsolete.0.0158166029295934/ncsa/hdf/hdf5lib/H5.java 2009-10-30 15:11:42.000000000 +0100
-@@ -238,7 +238,7 @@
+Index: jhdf-2.6/ncsa/hdf/hdf5lib/H5.java
+===================================================================
+--- jhdf-2.6.orig/ncsa/hdf/hdf5lib/H5.java 2010-01-23 21:03:47.000000000 +0100
++++ jhdf-2.6/ncsa/hdf/hdf5lib/H5.java 2010-01-23 21:04:09.000000000 +0100
+@@ -251,7 +251,7 @@
err.printStackTrace();
- done = false;
+ isLibraryLoaded = false;
} finally {
-- s_logger.log(Level.INFO,"HDF5 library: " + s_libraryName + " resolved to: "+mappedName+"; "+(done ? "" : " NOT") + " successfully loaded from java.library.path");
-+// s_logger.log(Level.INFO,"HDF5 library: " + s_libraryName + " resolved to: "+mappedName+"; "+(done ? "" : " 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");
++// s_logger.log(Level.INFO,"HDF5 library: " + s_libraryName + " resolved to: "+mappedName+"; "+(isLibraryLoaded ? "" : " NOT") + " successfully loaded from java.library.path");
}
}
-@@ -257,7 +257,7 @@
+@@ -270,7 +270,7 @@
err.printStackTrace();
- done = false;
+ isLibraryLoaded = false;
} finally {
-- s_logger.log(Level.INFO,"HDF5 library: " + filename + (done ? "" : " NOT") + " successfully loaded.");
-+// s_logger.log(Level.INFO,"HDF5 library: " + filename + (done ? "" : " NOT") + " successfully loaded.");
+- s_logger.log(Level.INFO,"HDF5 library: " + filename + (isLibraryLoaded ? "" : " NOT") + " successfully loaded.");
++// s_logger.log(Level.INFO,"HDF5 library: " + filename + (isLibraryLoaded ? "" : " NOT") + " successfully loaded.");
}
} else {
-@@ -278,7 +278,7 @@
- } catch (Throwable err) {
- err.printStackTrace(); done = false;
+@@ -292,7 +292,7 @@
+ err.printStackTrace();
+ isLibraryLoaded = false;
} finally {
-- s_logger.log(Level.INFO,"HDF5 library: " + s_libraryName + " resolved to: "+mappedName+"; "+(done ? "" : " NOT") + " successfully loaded from java.library.path");
-+// s_logger.log(Level.INFO,"HDF5 library: " + s_libraryName + " resolved to: "+mappedName+"; "+(done ? "" : " 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");
++// s_logger.log(Level.INFO,"HDF5 library: " + s_libraryName + " resolved to: "+mappedName+"; "+(isLibraryLoaded ? "" : " NOT") + " successfully loaded from java.library.path");
}
}
Modified: packages/jhdf/trunk/debian/patches/source15.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/source15.diff?rev=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/source15.diff (original)
+++ packages/jhdf/trunk/debian/patches/source15.diff Sun Feb 14 16:54:45 2010
@@ -46,18 +46,6 @@
all: H5_CreateAttribute H5_CreateDataset H5_CreateFile H5_CreateGroup H5_CreateGroupAbsoluteRelative H5_CreateGroupDataset H5_ReadWrite
-diff -ur jhdf-2.5.obsolete.0.262725480673001/Makefile.in jhdf-2.5.obsolete.0.958577492115186/Makefile.in
---- jhdf-2.5.obsolete.0.262725480673001/Makefile.in 2009-10-10 16:43:39.000000000 +0200
-+++ jhdf-2.5.obsolete.0.958577492115186/Makefile.in 2009-10-28 18:11:32.000000000 +0100
-@@ -107,7 +107,7 @@
- .SUFFIXES: .java .class
-
- .java.class:
-- $(JAVAC) -classpath $(CLASSPATH) $<
-+ $(JAVAC) -target 1.5 -source 1.5 -classpath $(CLASSPATH) $<
-
- all: natives packages do-examples
-
diff -ur jhdf-2.5.obsolete.0.262725480673001/test/linktest/Makefile.in jhdf-2.5.obsolete.0.958577492115186/test/linktest/Makefile.in
--- jhdf-2.5.obsolete.0.262725480673001/test/linktest/Makefile.in 2007-10-11 23:28:28.000000000 +0200
+++ jhdf-2.5.obsolete.0.958577492115186/test/linktest/Makefile.in 2009-10-28 18:11:32.000000000 +0100
@@ -94,3 +82,16 @@
all: AllH5ObjectTests.class \
AttributeTest.class \
+Index: jhdf-2.6/Makefile.in
+===================================================================
+--- jhdf-2.6.orig/Makefile.in 2010-01-23 21:23:38.000000000 +0100
++++ jhdf-2.6/Makefile.in 2010-01-23 21:24:27.000000000 +0100
+@@ -108,7 +108,7 @@
+ .SUFFIXES: .java .class
+
+ .java.class:
+- $(JAVAC) -source 5 -classpath $(CLASSPATH) $<
++ $(JAVAC) -target 1.5 -source 1.5 -classpath $(CLASSPATH) $<
+
+ all: natives packages do-examples
+
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=36165&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff Sun Feb 14 16:54:45 2010
@@ -1,31 +1,37 @@
---- jhdf-2.5.obsolete.0.262725480673001/Makefile.in 2009-10-10 16:43:39.000000000 +0200
-+++ jhdf-2.5/Makefile.in 2009-10-10 16:55:05.000000000 +0200
-@@ -40,10 +40,6 @@
+Index: jhdf-2.6/Makefile.in
+===================================================================
+--- jhdf-2.6.orig/Makefile.in 2010-01-23 21:27:55.000000000 +0100
++++ jhdf-2.6/Makefile.in 2010-01-23 21:29:40.000000000 +0100
+@@ -40,9 +40,9 @@
H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java
-FITSDISTJARFILE = ./lib/fits.jar
-NC2SDISTJARFILE = ./lib/netcdf.jar
-JUNITSDISTJARFILE = ./lib/junit.jar
--
++#FITSDISTJARFILE = ./lib/fits.jar
++#NC2SDISTJARFILE = ./lib/netcdf.jar
++#JUNITSDISTJARFILE = ./lib/junit.jar
+
NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./lib/netcdf.jar
- FITSOBJDISTFILES= ./ncsa/hdf/object/fits/*.java ./lib/fits.jar
-@@ -119,7 +115,7 @@
+@@ -120,7 +120,7 @@
install-just-hdf5: install-hdf5lib install-jhdf5
--packages: jhdf-packages jhdf5-packages nc2-packages fits-packages jhdfobj-packages h5srb-packages jhdfview-packages
-+packages: jhdf-packages jhdf5-packages jhdfobj-packages h5srb-packages jhdfview-packages
+-packages: jhdf-packages jhdf5-packages nc2-packages fits-packages jhdfobj-packages jhdfview-packages
++packages: jhdf-packages jhdf5-packages jhdfobj-packages jhdfview-packages
jhdf-packages:
@if test -n "$(H4INC)" ; then $(MAKE) do-jhdf-packages; fi
-@@ -328,17 +324,12 @@
+@@ -330,17 +330,17 @@
-mkdir -p $(LIBDIR);
$(JAR) cf $(LIBDIR)/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-mkdir -p $(LIBDIR)/ext
- $(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
- $(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
++# $(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
++# $(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
$(RM) -rf $(UGDIR);
-mkdir -p $(UGDIR);
cp -R docs/hdfview/UsersGuide/* $(UGDIR);
@@ -35,6 +41,9 @@
- cp lib/netcdf.jar $(LIBDIR)
- cp lib/fits.jar $(LIBDIR)
- cp lib/junit.jar $(LIBDIR)
++# cp lib/netcdf.jar $(LIBDIR)
++# cp lib/fits.jar $(LIBDIR)
++# cp lib/junit.jar $(LIBDIR)
cp bin/hdfview.sh $(BINDIR)
chmod a+x $(BINDIR)/hdfview.sh
@echo "Install HDFVIEW complete"
More information about the debian-science-commits
mailing list