[grads] 03/20: WIP: remove jpeg dependencies

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository grads.

commit 1be2bccc38fd92a31c60249e75df35201df3e944
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 10 07:31:35 2016 +0100

    WIP: remove jpeg dependencies
---
 debian/patches/remove-jpeg.patch | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  2 +-
 debian/rules                     |  1 +
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/patches/remove-jpeg.patch b/debian/patches/remove-jpeg.patch
new file mode 100644
index 0000000..eb1c3e4
--- /dev/null
+++ b/debian/patches/remove-jpeg.patch
@@ -0,0 +1,38 @@
+Index: grads-2.1.a3/configure.ac
+===================================================================
+--- grads-2.1.a3.orig/configure.ac
++++ grads-2.1.a3/configure.ac
+@@ -609,25 +609,14 @@ if test "$with_grib2" != "no" ; then
+       ])
+       GA_UNSET_FLAGS
+     fi
+-    if test "$have_zlib" = "yes" -a "$have_libpng" = "yes" ; then
+-      have_libjasper=no
+-      GA_SET_FLAGS([])
+-      AC_CHECK_LIB([jasper], [main], 
+-      [ have_libjasper=yes 
+-      ])
+-      GA_UNSET_FLAGS
+-      if test "$have_libjasper" = "yes" ; then
+-        GA_SET_FLAGS([grib2c])
+-        AC_CHECK_HEADER(grib2.h,
+-        [ AC_CHECK_LIB([grib2c], [main], 
+-          [ use_grib2=yes 
+-            GA_SET_INCLUDE_VAR([grib2_inc], [grib2c])
+-            GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png16 z])
+-          ])
+-        ])
+-        GA_UNSET_FLAGS
+-      fi
+-    fi
++    GA_SET_FLAGS([grib2c])
++    AC_CHECK_HEADER(grib2.h,
++    [ AC_CHECK_LIB([grib2c], [main], 
++    [ use_grib2=yes 
++    GA_SET_INCLUDE_VAR([grib2_inc], [grib2c])
++    GA_SET_LIB_VAR([grib2_libs], [grib2c])
++    ])
++    GA_UNSET_FLAGS
+   fi
+     # if we haven't got what we need, look outside supplibs for grib2
+   if test "$use_grib2" != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
diff --git a/debian/patches/series b/debian/patches/series
index 5903722..fd2703a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,8 @@ paths.patch
 udunits2.patch
 hdf5_hl.patch
 asneeded.patch
-# libsz_notpresent.patch
 timeunits_parse.patch
 format-security.patch
 reproducible-builds.patch
 png16.patch
+remove-jpeg.patch
diff --git a/debian/rules b/debian/rules
index 3512189..443d40c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ endif
 override_dh_auto_clean:
 	# Remove stuff added from tarballs
 	rm -f doc/model.* doc/sample
+	rm -f src/grads src/bufrscan src/wgrib src/stnmap src/gribmap src/gribscan
 	find . -name '*.o' -delete
 	# rm -f data/font* data/mres data/lowres data/hires data/udunits.dat
 

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