[grads] 04/10: * Standards-Version: 3.9.8 * Rename and upload additional data, examples tarballs * Build against libcairo2-dev, libpng-dev for new UX * Drop libjasper in favour of libopenjpeg. * Standards-Version: 3.9.7. No changes required.

[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 0c5815b35c1dfce145b2f38b90104bf2b73650a4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue May 24 08:59:00 2016 +0100

    * Standards-Version: 3.9.8
    * Rename and upload additional data, examples tarballs
    * Build against libcairo2-dev, libpng-dev for new UX
    * Drop libjasper in favour of libopenjpeg.
    * Standards-Version: 3.9.7. No changes required.
---
 debian/changelog | 13 +++++++++++--
 debian/control   |  7 ++++---
 debian/rules     | 12 +++++++++---
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 354ac0b..5778465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
+grads (2:2.1~a3-2) UNRELEASED; urgency=medium
+
+  * Standards-Version: 3.9.8
+  * Rename and upload additional data, examples tarballs	
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 12 May 2016 21:43:55 +0100
+
 grads (2:2.1~a3-1) experimental; urgency=medium
 
   * New upstream release.
   * B-D on libaec-dev, remove libsz-not-present patch as libaec provides
     libsz
-  * Build against libcairo2-dev, libpng16-dev for new UX
+  * Build against libcairo2-dev, libpng-dev for new UX
+  * Drop libjasper in favour of libopenjpeg.
+  * Standards-Version: 3.9.7. No changes required. 
 
- -- Alastair McKinstry <mckinstry at debian.org>  Sun, 03 Jan 2016 10:14:42 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 Apr 2016 09:47:30 +0100
 
 grads (2:2.0.2-7.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2377873..4dc28f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ Section: science
 Priority: extra
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf,
- pkg-config, libreadline-dev, libgeotiff-dev, libgrib2c-dev, 
+ pkg-config, libreadline-dev, libgeotiff-dev, 
+ libgrib2c-dev (>= 1.6.0-3), 
  libnetcdf-dev,  netcdf-bin,
- libjasper-dev, zlib1g-dev, libudunits2-dev,  libhdf5-serial-dev | libhdf5-dev, 
+ libopenjpeg-dev, zlib1g-dev, libudunits2-dev,  libhdf5-serial-dev | libhdf5-dev, 
  libdap-dev (>= 3.14.0-4), 
  libsx-dev (>= 2.05-7), 
  automake, autoconf, libx11-dev, libxmu-headers, 
@@ -13,7 +14,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf,
  libgadap-dev, libaec-dev,
  libcairo2-dev, libpng16-dev
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.iges.org/grads/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/grads.git
 
diff --git a/debian/rules b/debian/rules
index 92c0c69..fe6376e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,11 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) \
+	-I/usr/include/cairo  \
+	-I/usr/include/freetype2 \
+	-I/usr/include/fontconfig
+
 # Build MPI version
 ifneq (,$(findstring mpi,$(DEB_BUILD_OPTIONS)))
         COND_CC:= "CC=mpicc"
@@ -38,8 +43,9 @@ override_dh_auto_configure:
 		$(WITH_HDF5) \
 		--with-geotiff --with-sdf \
 		--with-hdf4-include=/usr/include/hdf --with-hdf4-libdir=/usr/lib \
-		--with-gadap
+		--with-gadap \
+		LIBS=' -lcairo -lfreetype'
 	mkdir -p  data doc
-	( cd data ; tar xapf ../../grads_2.1.a3.orig-data.tar.xz )
-	( cd doc ; tar xapf ../../grads_2.1.a3.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