r38151 - in /packages/jhdf/trunk/debian: control patches/removeDebugMessage.diff patches/source15.diff patches/useSharedLib.diff patches/z_missing_shared_flag.diff
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Thu Mar 3 14:41:36 UTC 2011
Author: sylvestre
Date: Thu Mar 3 14:41:35 2011
New Revision: 38151
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38151
Log:
update of the new upstream release
Removed:
packages/jhdf/trunk/debian/patches/source15.diff
Modified:
packages/jhdf/trunk/debian/control
packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
packages/jhdf/trunk/debian/patches/useSharedLib.diff
packages/jhdf/trunk/debian/patches/z_missing_shared_flag.diff
Modified: packages/jhdf/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/control?rev=38151&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/control (original)
+++ packages/jhdf/trunk/debian/control Thu Mar 3 14:41:35 2011
@@ -4,7 +4,7 @@
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,
- libjpeg-dev, zlib1g-dev, libhdf4-dev, libhdf5-serial-dev (>= 1.8.4),
+ libjpeg-dev, zlib1g-dev, libhdf4-dev, libhdf5-serial-dev (>= 1.8.6),
automake, autoconf, imagemagick
Standards-Version: 3.9.1
Homepage: http://www.hdfgroup.org/hdf-java-html/
Modified: packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/removeDebugMessage.diff?rev=38151&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/removeDebugMessage.diff (original)
+++ packages/jhdf/trunk/debian/patches/removeDebugMessage.diff Thu Mar 3 14:41:35 2011
@@ -1,31 +1,47 @@
-Index: jhdf-2.6/ncsa/hdf/hdf5lib/H5.java
+Index: jhdf-2.7/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();
- 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");
+--- jhdf-2.7.orig/ncsa/hdf/hdf5lib/H5.java 2011-03-03 15:23:41.000000000 +0100
++++ jhdf-2.7/ncsa/hdf/hdf5lib/H5.java 2011-03-03 15:25:20.000000000 +0100
+@@ -294,10 +294,10 @@
+ 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");
- }
- }
-@@ -270,7 +270,7 @@
- err.printStackTrace();
- isLibraryLoaded = false;
- } finally {
-- s_logger.log(Level.INFO,"HDF5 library: " + filename + (isLibraryLoaded ? "" : " NOT") + " successfully loaded.");
-+// s_logger.log(Level.INFO,"HDF5 library: " + filename + (isLibraryLoaded ? "" : " NOT") + " successfully loaded.");
+ }
+ }
+@@ -317,9 +317,9 @@
+ isLibraryLoaded = false;
+ }
+ finally {
+- 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 {
-@@ -292,7 +292,7 @@
- err.printStackTrace();
- 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");
+ }
+ }
+@@ -344,10 +344,10 @@
+ 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");
- }
- }
+ }
+ }
Modified: packages/jhdf/trunk/debian/patches/useSharedLib.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/useSharedLib.diff?rev=38151&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/useSharedLib.diff (original)
+++ packages/jhdf/trunk/debian/patches/useSharedLib.diff Thu Mar 3 14:41:35 2011
@@ -1,6 +1,8 @@
---- hdf5.java.orig/configure.in 2009-02-11 16:46:31.000000000 +0100
-+++ hdf5.java/configure.in 2009-09-14 17:33:44.000000000 +0200
-@@ -165,30 +165,12 @@
+Index: jhdf-2.7.obsolete.0.647783268782408/configure.in
+===================================================================
+--- jhdf-2.7.obsolete.0.647783268782408.orig/configure.in 2011-03-03 15:32:36.000000000 +0100
++++ jhdf-2.7.obsolete.0.647783268782408/configure.in 2011-03-03 15:34:32.000000000 +0100
+@@ -165,26 +165,7 @@
AC_SUBST(ZLIB) ZLIB=""
AC_ARG_WITH(libz,[ --with-libz=LIB Path to the gzip library (required if not in default path)],,)
@@ -28,12 +30,7 @@
if test -n "$ZLIB"; then
LIBS="$LIBS $ZLIB"
HAVE_ZLIB="yes"
- fi
-+
- AC_MSG_RESULT([$HAVE_ZLIB])
- if test $HAVE_ZLIB = "yes"; then
- AC_MSG_RESULT([zlib found: $ZLIB]);
-@@ -200,25 +182,8 @@
+@@ -200,25 +181,7 @@
AC_SUBST(JPEGLIB) JPEGLIB=""
AC_ARG_WITH(libjpeg,[ --with-libjpeg=LIB Path to the jpeg library (required if not in default path)],,)
@@ -49,7 +46,7 @@
- if test -n "$withval" ; then
- jpeg_lib="`echo $withval |cut -f2 -d, -s`"
- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
-- #AC_MSG_RESULT([jpeg found: $JPEGLIB]);
+- dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]);
- HAVE_JPEG="yes"
- else
- HAVE_JPEG="no"
@@ -57,17 +54,16 @@
-;;
-esac
+JPEGLIB=" -ljpeg"
-+
if test -n "$JPEGLIB"; then
LIBS="$LIBS $JPEGLIB"
HAVE_JPEG="yes"
-@@ -274,37 +239,11 @@
+@@ -274,33 +237,11 @@
AC_SUBST(HDF4LIB) HDF4LIB=""
AC_ARG_WITH(hdf4,[ --with-hdf4=LIB Path to the hdf library (required if not in default path)],,)
-case "$withval" in
- yes)
-- #AC_MSG_ERROR(HDF4 library needed for compilation.)
+- dnl AC_MSG_ERROR(HDF4 library needed for compilation.)
- HDF4LIB=""
- HAVE_HDF4="no"
- ;;
@@ -92,19 +88,15 @@
- fi
- ;;
-esac
--if test -n "$HDF4LIB"; then
-- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
-- HAVE_HDF4="yes"
--fi
+HDF4LIB=" -lmfhdf -ldf "
+LIBS=" -lmfhdf -ldf $LIBS"
+HDF4INC="/usr/include/hdf/"
+HAVE_HDF4="yes"
+
- AC_MSG_RESULT([$HAVE_HDF4])
- if test $HAVE_HDF4 = "yes"; then
- AC_MSG_RESULT([HDF4 found: $HDF4LIB]);
-@@ -351,38 +290,11 @@
+ if test -n "$HDF4LIB"; then
+ LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
+ HAVE_HDF4="yes"
+@@ -351,38 +292,12 @@
AC_SUBST(HDF5LIB) HDF5LIB=""
AC_ARG_WITH(hdf5,[ --with-hdf5=LIB Path to the hdf5 library (required if not in default path)],,)
@@ -145,28 +137,35 @@
+HDF5INC="/usr/include/"
+HAVE_HDF5="yes"
+
++
AC_MSG_RESULT([$HAVE_HDF5])
if test $HAVE_HDF5 = "yes"; then
AC_MSG_RESULT([HDF5 found: $HDF5LIB]);
---- hdf5.java.orig/native/hdflib/Makefile.in 2007-10-11 23:28:30.000000000 +0200
-+++ hdf5.java/native/hdflib/Makefile.in 2009-09-14 17:16:48.000000000 +0200
-@@ -37,7 +37,7 @@
+Index: jhdf-2.7.obsolete.0.647783268782408/native/hdf5lib/Makefile.in
+===================================================================
+--- jhdf-2.7.obsolete.0.647783268782408.orig/native/hdf5lib/Makefile.in 2011-03-03 15:35:23.000000000 +0100
++++ jhdf-2.7.obsolete.0.647783268782408/native/hdf5lib/Makefile.in 2011-03-03 15:36:01.000000000 +0100
+@@ -35,7 +35,8 @@
+
+ CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)
+
+-LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm
++#LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm
++LIBS = $(HDF5LIB) $(ZLIB) $(SZLIB) -lm
+
+ # Macro def: object filename used
+ OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o
+Index: jhdf-2.7.obsolete.0.647783268782408/native/hdflib/Makefile.in
+===================================================================
+--- jhdf-2.7.obsolete.0.647783268782408.orig/native/hdflib/Makefile.in 2011-03-03 15:35:23.000000000 +0100
++++ jhdf-2.7.obsolete.0.647783268782408/native/hdflib/Makefile.in 2011-03-03 15:35:49.000000000 +0100
+@@ -41,7 +41,8 @@
CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC)
# Be sure to add -lbsd if compiling in a SYSV environment
-LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm
++#LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm
+LIBS = -lmfhdf -ldf $(SZLIB) $(ZLIB) $(JPEGLIB) -lm
# Macro def: object filename used
OBJECTS = hdfstructsutil.o \
---- hdf5.java.orig/native/hdf5lib/Makefile.in 2009-01-05 23:25:41.000000000 +0100
-+++ hdf5.java/native/hdf5lib/Makefile.in 2009-09-14 17:35:44.000000000 +0200
-@@ -33,7 +33,7 @@
-
- CFLAGS = -DH5_USE_16_API -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)
-
--LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm
-+LIBS = $(HDF5LIB) $(ZLIB) $(SZLIB) -lm
-
- # Macro def: object filename used
- OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5fImp.o h5gImp.o h5iImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o
Modified: packages/jhdf/trunk/debian/patches/z_missing_shared_flag.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_missing_shared_flag.diff?rev=38151&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_missing_shared_flag.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_missing_shared_flag.diff Thu Mar 3 14:41:35 2011
@@ -1,5 +1,7 @@
---- jhdf-2.5.obsolete.0.285715800550864/configure.in 2009-11-03 00:33:51.000000000 +0100
-+++ jhdf-2.5/configure.in 2009-11-27 18:27:08.000000000 +0100
+Index: jhdf-2.7/configure.in
+===================================================================
+--- jhdf-2.7.orig/configure.in 2011-03-03 14:02:22.000000000 +0100
++++ jhdf-2.7/configure.in 2011-03-03 14:03:08.000000000 +0100
@@ -112,28 +112,28 @@
LLEXT="a";
JSLEXT="so";
@@ -8,7 +10,7 @@
+x86_64-pc-linux*) LD=$CC; LDOPT="-g -shared"; SLEXT="so";
TARGETLIB="linux"
SLEXT="so";
- LLEXT="a"; # the extension for the HDF and other libraries to link to
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
JSLEXT="so";
COPT="-shared -Dx86_64 -fPIC" ;
;;
@@ -16,7 +18,7 @@
+ia64-pc-linux*) LD=$CC; LDOPT="-g -shared"; SLEXT="so";
TARGETLIB="linux"
SLEXT="so";
- LLEXT="a"; # the extension for the HDF and other libraries to link to
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
JSLEXT="so";
COPT="-shared -Dia64 -fPIC" ;
;;
@@ -24,7 +26,7 @@
+*-pc-linux*) LD=$CC; LDOPT="-g -shared"; SLEXT="so";
TARGETLIB="linux"
SLEXT="so";
- LLEXT="a"; # the extension for the HDF and other libraries to link to
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
JSLEXT="so";
COPT="-shared -DUNIX386" ;
;;
@@ -32,13 +34,4 @@
+*-freebsd*) LD=$CC; LDOPT="-g -shared";
TARGETLIB="freebsd"
SLEXT="so";
- LLEXT="a"; # the extension for the HDF and other libraries to link to
-@@ -146,7 +146,7 @@
- LLEXT="a";
- SLEXT="dylib";
- ;;
--*) LD=$CC; LDOPT=-g; SLEXT="so";
-+*) LD=$CC; LDOPT="-g -shared"; SLEXT="so";
- LLEXT="a";
- TARGETLIB="$target"
- esac
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
More information about the debian-science-commits
mailing list