r46834 - in /packages/jhdf/trunk/debian: changelog patches/useSharedLib.diff rules

pini at users.alioth.debian.org pini at users.alioth.debian.org
Sat Aug 2 10:09:02 UTC 2014 

Author: pini
Date: Sat Aug  2 10:09:02 2014
New Revision: 46834

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46834
Log:
* Team upload release 2.9-2 to unstable.
* Support hdf5 1.8.13 new packaging layout (closes: #756672).
* Fix patch useSharedLib.diff to set correct HDF5 path via configure.

Modified:
    packages/jhdf/trunk/debian/changelog
    packages/jhdf/trunk/debian/patches/useSharedLib.diff
    packages/jhdf/trunk/debian/rules

Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=46834&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog	(original)
+++ packages/jhdf/trunk/debian/changelog	Sat Aug  2 10:09:02 2014
@@ -1,10 +1,16 @@
-jhdf (2.9-2) UNRELEASED; urgency=low
-
+jhdf (2.9-2) unstable; urgency=medium
+
+  [Gilles Filippini]
+  * Team upload.
+  * Support hdf5 1.8.13 new packaging layout (closes: #756672).
+  * Fix patch useSharedLib.diff to set correct HDF5 path via configure.
+
+  [Sylvestre Ledru]
   * Move hdfview in the Science section. deborphan was considering
     this package as a lib and proposing to remove it (Closes: #730642)
   * Standards-Version updated to 3.9.5
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 28 Nov 2013 09:49:50 +0100
+ -- Gilles Filippini <pini at debian.org>  Sat, 02 Aug 2014 12:04:36 +0200
 
 jhdf (2.9-1) unstable; urgency=low
 

Modified: packages/jhdf/trunk/debian/patches/useSharedLib.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/useSharedLib.diff?rev=46834&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/useSharedLib.diff	(original)
+++ packages/jhdf/trunk/debian/patches/useSharedLib.diff	Sat Aug  2 10:09:02 2014
@@ -1,7 +1,7 @@
-Index: jhdf-2.7.obsolete.0.647783268782408/native/hdf5lib/Makefile.in
+Index: jhdf-2.9/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
+--- jhdf-2.9.orig/native/hdf5lib/Makefile.in	2012-11-13 00:11:49.000000000 +0100
++++ jhdf-2.9/native/hdf5lib/Makefile.in	2014-07-25 10:21:47.570650000 +0200
 @@ -35,7 +35,8 @@
  
  CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)
@@ -12,10 +12,10 @@
  
  # 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
+Index: jhdf-2.9/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
+--- jhdf-2.9.orig/native/hdflib/Makefile.in	2012-11-13 00:11:48.000000000 +0100
++++ jhdf-2.9/native/hdflib/Makefile.in	2014-07-25 10:21:47.538648940 +0200
 @@ -41,7 +41,8 @@
  CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC)
  
@@ -26,8 +26,10 @@
  
  # Macro def: object filename used
  OBJECTS =  hdfstructsutil.o \
---- jhdf-2.8.orig/configure.in	2011-11-29 21:19:58.000000000 +0100
-+++ jhdf-2.8-beta/configure.in	2011-12-01 01:29:38.584217066 +0100
+Index: jhdf-2.9/configure.in
+===================================================================
+--- jhdf-2.9.orig/configure.in	2014-07-25 09:45:11.000000000 +0200
++++ jhdf-2.9/configure.in	2014-07-25 10:22:19.839719235 +0200
 @@ -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)],,)
@@ -121,47 +123,12 @@
  if test -n "$HDF4LIB"; then
    LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
    HAVE_HDF4="yes"
-@@ -351,38 +291,11 @@
- AC_SUBST(HDF5LIB) HDF5LIB=""
- AC_ARG_WITH(hdf5,[  --with-hdf5=LIB     Path to the hdf5 library (required if not in default path)],,)
- 
--case "$withval" in
--  yes)
--      HDF5LIB=""
--  HAVE_HDF5="no"
--    ;;
--  no)
--      HDF5LIB=""
--  HAVE_HDF5="suppressed"
--    ;;
--  *)
--  if test -n "$withval" ; then
--      hdf5_lib="`echo $withval |cut -f2 -d, -s`"
--    HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
--      hdf5_inc="`echo $withval |cut -f1 -d,`"
--      if test -n "$hdf5_inc"; then
--        HDF5INC="$hdf5_inc"
--      fi
--      hdf5_lib="`echo $withval |cut -f2 -d, -s`"
--      if test -n "$hdf5_lib"; then
+@@ -370,7 +310,7 @@
+       fi
+       hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+       if test -n "$hdf5_lib"; then
 -    HDF5LIB=$hdf5_lib
--      fi
--      HAVE_HDF5="yes"
--  else
--        HDF5LIB=""
--      HAVE_HDF5="no"
--  fi
--  ;;
--esac
--if test -n "$HDF5LIB"; then
--  LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
--  HAVE_HDF5="yes"
--fi
-+HDF5LIB=" -lhdf5 "
-+LIBS=" -lhdf5 $LIBS"
-+HDF5INC="/usr/include/"
-+HAVE_HDF5="yes"
-+
- AC_MSG_RESULT([$HAVE_HDF5])
- if test $HAVE_HDF5 = "yes"; then
-       AC_MSG_RESULT([HDF5 found: $HDF5LIB]);
++    HDF5LIB="-L$hdf5_lib -lhdf5"
+       fi
+       HAVE_HDF5="yes"
+   else

Modified: packages/jhdf/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/rules?rev=46834&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/rules	(original)
+++ packages/jhdf/trunk/debian/rules	Sat Aug  2 10:09:02 2014
@@ -8,8 +8,14 @@
 	autoreconf -i
 	touch debian/stamp-autotools-files
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  WITH_HDF5:=--with-hdf5=/usr/include/hdf5/serial,/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  WITH_HDF5:=--with-hdf5=/usr/include,/usr/lib
+endif
+
 
 DEB_CONFIGURE_EXTRA_FLAGS := CC=gcc
 
-DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=/usr/lib/jvm/default-java/include/,/usr/lib/jvm/default-java/lib/ --with-classpath=/usr/lib/jvm/default-java/lib/ --with-javabin=/usr/lib/jvm/default-java/bin/  --with-libz=yes,/usr/lib  --with-libjpeg=yes,/usr/lib/   --with-hdf5=/usr/include,/usr/lib --with-hdf4=/usr/include/hdf/,/usr/lib/
+DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=/usr/lib/jvm/default-java/include/,/usr/lib/jvm/default-java/lib/ --with-classpath=/usr/lib/jvm/default-java/lib/ --with-javabin=/usr/lib/jvm/default-java/bin/  --with-libz=yes,/usr/lib  --with-libjpeg=yes,/usr/lib/   $(WITH_HDF5) --with-hdf4=/usr/include/hdf/,/usr/lib/
 DEB_CONFIGURE_PREFIX := $(CURDIR)/debian/tmp/

More information about the debian-science-commits mailing list