Bug#1139600: fixed in gmtsar 6.6+ds-2

[Pini]

Control: reopen -1
Control: tags -1 + patch

Hi,

Debian FTP Masters a écrit le 21/06/2026 à 13:33 :
> Source: gmtsar
> Source-Version: 6.6+ds-2
> Done: Antonio Valentino <antonio.valentino at tiscali.it>
> 
> We believe that the bug you reported is fixed in the latest version of
> gmtsar, which is due to be installed in the Debian FTP archive.
> 
> A summary of the changes between this version and the previous one is
> attached.
> 
> Thank you for reporting the bug, which will now be closed.  If you
> have further comments please address them to 1139600 at bugs.debian.org,
> and the maintainer will reopen the bug report if appropriate.
> 
> Debian distribution maintenance software
> pp.
> Antonio Valentino <antonio.valentino at tiscali.it> (supplier of updated gmtsar package)
> 
> (This message was generated automatically at their request; if you
> believe that there is a problem with it please contact the archive
> administrators by mailing ftpmaster at ftp-master.debian.org)
> 
> 
> Format: 1.8
> Date: Sun, 21 Jun 2026 10:48:16 +0000
> Source: gmtsar
> Architecture: source
> Version: 6.6+ds-2
> Distribution: unstable
> Urgency: medium
> Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
> Changed-By: Antonio Valentino <antonio.valentino at tiscali.it>
> Closes: 1139600
> Changes:
>   gmtsar (6.6+ds-2) unstable; urgency=medium
>   .
>     [ Bas Couwenberg ]
>     * Use test-build-validate-cleanup instead of test-build-twice.
>     * Drop Priority: optional, default since dpkg 1.22.13.
>     * Bump Standards-Version to 4.7.4, changes: priority.
>     * Don't remove symlink in clean target.
>   .
>     [ Gilles Filippini ]
>     * Fix FTBFS against HDF5 2.1.0.
>       (closes: #1139600)
Unfortunately my patch wasn't robust enough, and it doesn't work with 
this new release of the package.

Please find attached an improved one.

Best,
_g.
-------------- next part --------------
diff -Nru gmtsar-6.6+ds/debian/changelog gmtsar-6.6+ds/debian/changelog
--- gmtsar-6.6+ds/debian/changelog	2026-06-21 12:48:16.000000000 +0200
+++ gmtsar-6.6+ds/debian/changelog	2026-06-22 10:11:56.000000000 +0200
@@ -1,3 +1,10 @@
+gmtsar (6.6+ds-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve patch for HDF5 2.1.0 (closes: #1139600)
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 22 Jun 2026 10:11:56 +0200
+
 gmtsar (6.6+ds-2) unstable; urgency=medium
 
   [ Bas Couwenberg ]
diff -Nru gmtsar-6.6+ds/debian/patches/hdf5-2.1.0.patch gmtsar-6.6+ds/debian/patches/hdf5-2.1.0.patch
--- gmtsar-6.6+ds/debian/patches/hdf5-2.1.0.patch	2026-06-21 12:48:16.000000000 +0200
+++ gmtsar-6.6+ds/debian/patches/hdf5-2.1.0.patch	2026-06-22 10:11:56.000000000 +0200
@@ -4,25 +4,30 @@
 Forwarded: https://github.com/gmtsar/gmtsar/pull/1117
 Applied-Upstream: https://github.com/gmtsar/gmtsar/commit/564cdfc789192337c70f6fc3de10596794a0c38a
 
---- a/ax_lib_hdf5.m4
-+++ b/ax_lib_hdf5.m4
-@@ -226,7 +226,14 @@ HDF5 support is being disabled (equivale
+Index: gmtsar-6.6+ds/ax_lib_hdf5.m4
+===================================================================
+--- gmtsar-6.6+ds.orig/ax_lib_hdf5.m4
++++ gmtsar-6.6+ds/ax_lib_hdf5.m4
+@@ -226,7 +226,17 @@ HDF5 support is being disabled (equivale
            esac
          done
  
 -        HDF5_LIBS="$HDF5_LIBS -lhdf5"
 +        HDF5_INFIX=
-+        case "$HDF5_LIBS" in
++        for lib in $HDF5_LIBS; do
++          case "$lib" in
 +            -lhdf5_*)
-+                HDF5_INFIX="${HDF5_LIBS#-lhdf5_}"
++                HDF5_INFIX="${lib#-lhdf5_}"
 +                HDF5_INFIX="_${HDF5_INFIX%%_*}"
++                break
 +                ;;
-+        esac
++          esac
++        done
 +        HDF5_LIBS="$HDF5_LIBS -lhdf5$HDF5_INFIX"
          AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
  
          dnl See if we can compile
-@@ -245,7 +252,7 @@ HDF5 support is being disabled (equivale
+@@ -245,7 +255,7 @@ HDF5 support is being disabled (equivale
            AC_MSG_WARN([Unable to compile HDF5 test program])
          fi
          dnl Look for HDF5's high level library
@@ -31,7 +36,7 @@
  
          CC=$ax_lib_hdf5_save_CC
          CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS
-@@ -281,9 +288,9 @@ HDF5 support is being disabled (equivale
+@@ -281,9 +291,9 @@ HDF5 support is being disabled (equivale
              for arg in $HDF5_LIBS
              do
                case "$arg" in #(
@@ -43,8 +48,10 @@
                    ;; #(
                  *) HDF5_FLIBS="$HDF5_FLIBS $arg"
                    ;;
---- a/configure.ac
-+++ b/configure.ac
+Index: gmtsar-6.6+ds/configure.ac
+===================================================================
+--- gmtsar-6.6+ds.orig/configure.ac
++++ gmtsar-6.6+ds/configure.ac
 @@ -153,7 +153,7 @@ dnl ------------------------------------
  dnl Set the HDF5 include and lib stuff
  dnl ------------------------------------------------------------------