[grads] 04/06: Test linking libsz from libaec-dev

[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 c575db3df56f3b50c6cdcc2ca18325b55e153d86
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 3 23:04:16 2016 +0000

    Test linking libsz from libaec-dev
---
 debian/changelog      | 2 ++
 debian/control        | 2 +-
 debian/patches/series | 2 +-
 debian/rules          | 8 ++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bafed85..267b38a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 grads (2:2.1~a3-1) UNRELEASED; urgency=medium
 
   * WIP
+  * B-D on libaec-dev, remove libsz-not-present patch as libaec provides
+    libsz
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 03 Jan 2016 10:14:42 +0000
 
diff --git a/debian/control b/debian/control
index 1a6aeb6..2ecfebe 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf,
  libsx-dev (>= 2.05-7), 
  automake, autoconf, libx11-dev, libxmu-headers, 
  libgd-dev, libshp-dev, libhdf4-alt-dev, 
- libgadap-dev
+ libgadap-dev, libaec-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.6
 Homepage: http://www.iges.org/grads/
diff --git a/debian/patches/series b/debian/patches/series
index d0c766b..a17c2f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,7 @@ paths.patch
 udunits2.patch
 hdf5_hl.patch
 asneeded.patch
-libsz_notpresent.patch
+# libsz_notpresent.patch
 timeunits_parse.patch
 format-security.patch
 reproducible-builds.patch
diff --git a/debian/rules b/debian/rules
index 315f0b0..48a887c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,13 +33,13 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	autoreconf -fiv
 	dh_auto_configure -- $(COND_CC) \
-		--enable-dyn-supplibs --with-gui  --with-readline --with-printim --with-x \
-		--with-grib2 --with-netcdf \
+		--enable-dyn-supplibs --with-readline --with-printim \
+		--with-grib2 --with-netcdf  --with-cairo \
 		$(WITH_HDF5) \
 		--with-geotiff --with-sdf \
 		--with-hdf4-include=/usr/include/hdf --with-hdf4-libdir=/usr/lib \
 		--with-gadap
 	mkdir -p  data doc
-	( cd data ; tar xapf ../../grads_2.0.2.orig-data.tar.xz )
-	( cd doc ; tar xapf ../../grads_2.0.2.orig-example.tar.xz )
+	( cd data ; tar xapf ../../grads_2.1.a3.orig-data.tar.xz )
+	( cd doc ; tar xapf ../../grads_2.1.a3.orig-example.tar.xz )
 

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