r46840 - in /packages/scilab/branches/5.5/debian: changelog patches/m4-hdf5.patch patches/series rules

[pini at users.alioth.debian.org]

Author: pini
Date: Sat Aug  2 10:52:17 2014
New Revision: 46840

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46840
Log:
* Team upload release 5.5.0-3 to unstable (closes: #756698).
* Support hdf5 1.8.13 new packaging layout.
* New patch m4-hdf5.patch: fix typo and unneeded dependency on
  inexistant libsz.

Added:
    packages/scilab/branches/5.5/debian/patches/m4-hdf5.patch
Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/series
    packages/scilab/branches/5.5/debian/rules

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46840&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Sat Aug  2 10:52:17 2014
@@ -1,8 +1,15 @@
-scilab (5.5.0-3) UNRELEASED; urgency=medium
-
+scilab (5.5.0-3) unstable; urgency=medium
+
+  [Gilles Filippini]
+  * Team upload (closes: #756698).
+  * Support hdf5 1.8.13 new packaging layout.
+  * New patch m4-hdf5.patch: fix typo and unneeded dependency on
+    inexistant libsz.
+
+  [Sylvestre Ledru]
   * Vcs-* tag fixed
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 02 Aug 2014 12:45:22 +0200
+ -- Gilles Filippini <pini at debian.org>  Sat, 02 Aug 2014 12:50:57 +0200
 
 scilab (5.5.0-2) unstable; urgency=medium
 

Added: packages/scilab/branches/5.5/debian/patches/m4-hdf5.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/m4-hdf5.patch?rev=46840&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/m4-hdf5.patch	(added)
+++ packages/scilab/branches/5.5/debian/patches/m4-hdf5.patch	Sat Aug  2 10:52:17 2014
@@ -0,0 +1,30 @@
+Description: There is no libsz availlable.
+ The macro was succesfull with libhdf5 installed in system path because
+ of the missing comma in the second block. With this comma in place the
+ test fails in every case because of libsz beeing unavaillable. Then
+ removing -lsz.
+Author: Gilles Filippini <pini at debian.org>
+Index: scilab-5.5.0/m4/hdf5.m4
+===================================================================
+--- scilab-5.5.0.orig/m4/hdf5.m4	2014-04-11 11:51:34.000000000 +0200
++++ scilab-5.5.0/m4/hdf5.m4	2014-07-27 13:24:54.247645063 +0200
+@@ -53,7 +53,7 @@
+     AC_CHECK_LIB([hdf5], [H5Fopen],
+             [],
+             [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen) in $with_hdf5_library. Check if libhdf5 is installed and if the version is correct])],
+-            [-lsz -lz]
++            [-lz]
+             )
+             
+ else
+@@ -61,8 +61,8 @@
+     LIBS="$LIBS $HDF5_LIBS"
+     AC_CHECK_LIB([hdf5], [H5Fopen],
+             [],
+-            [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])]
+-            [-lsz -lz]
++            [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])],
++            [-lz]
+             )
+ fi
+ 

Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=46840&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Sat Aug  2 10:52:17 2014
@@ -5,3 +5,4 @@
 jh.diff
 depend-scicos.diff
 missing-lib.diff
+m4-hdf5.patch

Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46840&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules	(original)
+++ packages/scilab/branches/5.5/debian/rules	Sat Aug  2 10:52:17 2014
@@ -21,6 +21,10 @@
 	--enable-mpi --disable-static-system-lib
 #	--enable-compilation-tests
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  DEB_CONFIGURE_NORMAL_ARGS += --with-hdf5-include=/usr/include/hdf5/serial \
+	        --with-hdf5-library=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
 
 # requires ocamlopt
 ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el mips mipsel s390x sparc))