[scilab] 06/16: Import Debian changes 5.5.1-7

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit 68fd228c36e2e3e767e30898fba05b49ef211813
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Mar 1 10:39:14 2015 +0100

    Import Debian changes 5.5.1-7
    
    scilab (5.5.1-7) unstable; urgency=medium
    
      * Team upload.
      * Readd m4-hdf5.patch in d/patches/series, which had been mistakenly
        removed in version 5.5.1-4. Remove hdf5-libsz.diff which has been
        introduced in replacement.
      * Also readd remove-exit.diff.
---
 debian/changelog               | 10 ++++++++++
 debian/patches/hdf5-libsz.diff | 44 ------------------------------------------
 debian/patches/series          |  5 +++--
 3 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index defa2e5..9f3d7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+scilab (5.5.1-7) unstable; urgency=medium
+
+  * Team upload.
+  * Readd m4-hdf5.patch in d/patches/series, which had been mistakenly
+    removed in version 5.5.1-4. Remove hdf5-libsz.diff which has been
+    introduced in replacement.
+  * Also readd remove-exit.diff.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Sun, 01 Mar 2015 10:39:14 +0100
+
 scilab (5.5.1-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/hdf5-libsz.diff b/debian/patches/hdf5-libsz.diff
deleted file mode 100644
index 0de0909..0000000
--- a/debian/patches/hdf5-libsz.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: scilab-5.5.1/configure
-===================================================================
---- scilab-5.5.1.orig/configure
-+++ scilab-5.5.1/configure
-@@ -10359,7 +10359,7 @@ if ${ac_cv_lib_hdf5_H5Fopen+:} false; th
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lhdf5 -lsz -lz
-+LIBS="-lhdf5 -lz
-              $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -10450,7 +10450,7 @@ _ACEOF
- 
- else
-   as_fn_error $? "libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct" "$LINENO" 5
--            -lsz -lz
-+            -lz
- 
- fi
- 
-Index: scilab-5.5.1/m4/hdf5.m4
-===================================================================
---- scilab-5.5.1.orig/m4/hdf5.m4
-+++ scilab-5.5.1/m4/hdf5.m4
-@@ -53,7 +53,7 @@ if test "x$with_hdf5_library" != "xyes";
-     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
-@@ -62,7 +62,7 @@ else
-     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]
-+            [-lz]
-             )
- fi
- 
diff --git a/debian/patches/series b/debian/patches/series
index f32f526..0f5c347 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,8 @@ disable-xcos-dep-check.diff
 jh.diff
 depend-scicos.diff
 missing-lib.diff
+m4-hdf5.patch
+m4-java-ppc64el.patch
+remove-exit.diff
 bashim.diff
 jogl-2.2.diff
-hdf5-libsz.diff
-m4-java-ppc64el.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git