Source: jhdf
Version: 2.9-1
Severity: important
Tags: patch
User: p...@debian.org
Usertags: HDF5-transition

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

The hdf5 1.8.13 package in experimental features a new layout for
headers and libraries, so that all the binary packages are now
co-installable.

Please find attached a patch proposal to support both the current
and the new layouts.

Because this bug is in the way of the hdf5 transition I intend to NMU
in a few days. I apologize for the urge, and I hope this approach won't
offend you. Please tell me otherwise.

Kind regards,

_g.

- -- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBCAAGBQJT2sIIAAoJEO/obGx//s+DuhkH/iG3oP95A5FxHoyNuceh0vZ2
XOp3uydh5duD5qMYk6BEiSLiVvhUr1JTJENjSoL85noUrdBq60KEdPnNTANajeT8
33Vw2Rq6REylexrkMTocZrYFNrsILgrfK50kW1PDjwbIORHsjCckwocDPmfqI8SZ
ZNWs2EtnfQ7IwjS/MUbAdPBY/VJuOR4hRo31X8wRnkejxg2bxJe8+2hmbnhY5smA
KR0H8t1t/OiJI3g7Or1Xq1UNF0zGqeKIweIRdL7V0i/37X6h9sFLbtdMWBsJrpb2
SaNtIVoUZ+RMnmk/WgvN08fjwEyVX7UfVe2u0TMeZrJNmpd1MaS/7M9F+1+1TU8=
=pRMY
-----END PGP SIGNATURE-----
diff -Nru jhdf-2.9/debian/changelog jhdf-2.9/debian/changelog
--- jhdf-2.9/debian/changelog	2013-08-06 12:26:34.000000000 +0200
+++ jhdf-2.9/debian/changelog	2014-07-25 09:57:03.000000000 +0200
@@ -1,3 +1,11 @@
+jhdf (2.9-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+  * Fix patch useSharedLib.diff to set correct HDF5 path via configure.
+
+ -- Gilles Filippini <p...@debian.org>  Fri, 25 Jul 2014 09:47:38 +0200
+
 jhdf (2.9-1) unstable; urgency=low
 
   * Upload to unstable
diff -Nru jhdf-2.9/debian/patches/useSharedLib.diff jhdf-2.9/debian/patches/useSharedLib.diff
--- jhdf-2.9/debian/patches/useSharedLib.diff	2013-08-06 12:24:54.000000000 +0200
+++ jhdf-2.9/debian/patches/useSharedLib.diff	2014-07-25 10:22:22.000000000 +0200
@@ -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
diff -Nru jhdf-2.9/debian/rules jhdf-2.9/debian/rules
--- jhdf-2.9/debian/rules	2013-08-06 12:34:13.000000000 +0200
+++ jhdf-2.9/debian/rules	2014-07-31 10:06:43.000000000 +0200
@@ -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/

Reply via email to