[grads] 05/11: remove old libsz_notpresent.patch

[Alastair McKinstry]

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

mckinstry pushed a commit to tag 3%2.1.1.b0-1
in repository grads.

commit a51aacac33276c25a35e383b4ed99d9484ba669a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 6 13:03:45 2017 +0100

    remove old libsz_notpresent.patch
---
 debian/patches/libsz_notpresent.patch | 54 -----------------------------------
 debian/patches/nc-config.patch        |  2 +-
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/debian/patches/libsz_notpresent.patch b/debian/patches/libsz_notpresent.patch
deleted file mode 100644
index 68bad04..0000000
--- a/debian/patches/libsz_notpresent.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Allow HDF5 to be used even if libsz is not present.
- (libsz cannot be shipped with Debian)
-Last-Updated: 2012-09-19
-Forwarded: no
-
-Index: grads-2.1~a3/configure.ac
-===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
-@@ -693,15 +693,13 @@ else
-     fi
-     if test "$have_zlib" = "yes" -a "$have_udunits" = "yes" -a "$have_jpeg" = "yes" ; then
-       GA_SET_FLAGS([hdf])
--      AC_CHECK_LIB([sz], [main],
--      [ AC_CHECK_HEADER([mfhdf.h],
-+      AC_CHECK_HEADER([mfhdf.h],
-         [ AC_CHECK_LIB([dfalt], [main], 
-           [ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
-             [ use_hdf=yes 
-               GA_SET_INCLUDE_VAR([hdf_inc], [hdf udunits2])
--              GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits2 sz jpeg z])
-+              GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits2 jpeg z])
-             ])
--          ])
-         ])
-       ])
-       GA_UNSET_FLAGS
-@@ -755,14 +753,12 @@ else
-     fi
-     if test "$have_zlib" = "yes" -a "$have_jpeg" = "yes" ; then
-       GA_SET_FLAGS([hdf5])
--      AC_CHECK_LIB([sz], [main],
--      [ AC_CHECK_HEADER([hdf5.h],
-+       AC_CHECK_HEADER([hdf5.h],
-         [ AC_CHECK_LIB([hdf5], [main], 
-           [ use_hdf5=yes 
-             GA_SET_INCLUDE_VAR([hdf5_inc], [hdf5])
--            GA_SET_LIB_VAR([hdf5_libs], [hdf5 sz z])
-+            GA_SET_LIB_VAR([hdf5_libs], [hdf5 z])
-           ])
--        ])
-       ])
-       GA_UNSET_FLAGS
-     fi
-@@ -811,7 +807,7 @@ else
-             [ AC_CHECK_LIB(curl,main,
-               [ use_nc4="yes"
-                 GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
--                GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z sz curl])
-+                GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z  curl])
-               ])
-             ],[],[-lhdf5])
-           ])
diff --git a/debian/patches/nc-config.patch b/debian/patches/nc-config.patch
index d209452..e67925c 100644
--- a/debian/patches/nc-config.patch
+++ b/debian/patches/nc-config.patch
@@ -7,7 +7,7 @@ Index: grads.git/configure.ac
            [])
          ])
 -        NC_CONFIG="`pkg-config --variable=prefix netcdf`/bin/nc-config"
-+        NC_CONFIG="`/usr/bin/nc-config"
++        NC_CONFIG="`usr/bin/nc-config"
          CURL_CONFIG="`pkg-config --variable=prefix libcurl`/bin/curl-config"
      fi
      if test $use_nc4 != "yes" ; then

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