[grads] 02/10: WIP: 2.1 build test

[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 ae4fbe1641a744de9d1cb9f50d819e7f98666163
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 7 09:37:50 2016 +0100

    WIP: 2.1 build test
---
 debian/changelog                   |  6 ++--
 debian/control                     | 11 ++++---
 debian/patches/remove-jasper.patch | 63 ++++++++++++++++++++++++++++++++++++++
 debian/rules                       |  5 +++
 4 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb5fdb6..877dcd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-grads (2:2.1~a3-1) unstable; urgency=medium
+grads (2:2.1~a3-1) UNRELEASED; 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
 
diff --git a/debian/control b/debian/control
index 2377873..2fb2298 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,18 @@ 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, libopenjpeg-dev,
  libnetcdf-dev,  netcdf-bin,
- libjasper-dev, zlib1g-dev, libudunits2-dev,  libhdf5-serial-dev | libhdf5-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, 
  libgd-dev, libshp-dev, libhdf4-alt-dev, 
  libgadap-dev, libaec-dev,
- libcairo2-dev, libpng16-dev
-Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.6
+ libcairo2-dev, libpng-dev
+Build-Conflicts: autoconf2.13, libjasper-dev
+Standards-Version: 3.9.7
 Homepage: http://www.iges.org/grads/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/grads.git
 
diff --git a/debian/patches/remove-jasper.patch b/debian/patches/remove-jasper.patch
new file mode 100644
index 0000000..e391622
--- /dev/null
+++ b/debian/patches/remove-jasper.patch
@@ -0,0 +1,63 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Drop libjasper in favour of libopenjpeg
+Last-Updated: 2016-03-01
+Forwarded: no
+
+Index: grads-2.0.2/configure.ac
+===================================================================
+--- grads-2.0.2.orig/configure.ac
++++ grads-2.0.2/configure.ac
+@@ -526,19 +526,19 @@ if test "$with_grib2" != "no" ; then
+       GA_UNSET_FLAGS
+     fi
+     if test "$have_zlib" = "yes" -a "$have_libpng" = "yes" ; then
+-      have_libjasper=no
++      have_libopenjpeg=no
+       GA_SET_FLAGS([])
+-      AC_CHECK_LIB([jasper], [main], 
+-      [ have_libjasper=yes 
++      AC_CHECK_LIB([openjpeg], [main], 
++      [ have_libopenjpeg=yes 
+       ])
+       GA_UNSET_FLAGS
+-      if test "$have_libjasper" = "yes" ; then
++      if test "$have_libopenjpeg" = "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 png12 z])
++            GA_SET_LIB_VAR([grib2_libs], [grib2c openjpeg png12 z])
+           ])
+         ])
+         GA_UNSET_FLAGS
+Index: grads-2.0.2/m4/grib2.m4
+===================================================================
+--- grads-2.0.2.orig/m4/grib2.m4
++++ grads-2.0.2/m4/grib2.m4
+@@ -7,9 +7,9 @@ AC_DEFUN([GA_CHECK_LIB_GRIB2],
+   [ AC_CHECK_LIB(grib2c, main, 
+     [ AC_CHECK_LIB(png12, main,
+       [ AC_CHECK_LIB(z, main,
+-        [ AC_CHECK_LIB(jasper, main,
++        [ AC_CHECK_LIB(openjpeg, main,
+           [ ga_check_grib2="yes"
+-            G2_LIBS='-lgrib2c -ljasper -lpng -lz'
++            G2_LIBS='-lgrib2c -lopenjpeg -lpng -lz'
+ 	  ])
+         ])
+       ])
+Index: grads-2.0.2/src/gacfg.c
+===================================================================
+--- grads-2.0.2.orig/src/gacfg.c
++++ grads-2.0.2/src/gacfg.c
+@@ -159,7 +159,7 @@ snprintf(cmd,255,"Config: v%s",GRADS_VER
+ #if GRIB2==1
+    gaprnt(verbose,"  o GRIB2 interface ENABLED \n");
+    gaprnt(verbose,"      http://www.ijg.org \n");
+-   gaprnt(verbose,"      http://www.ece.uvic.ca/~mdadams/jasper \n");
++   gaprnt(verbose,"      http://www.openjpeg.org \n");
+    gaprnt(verbose,"      http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2 \n");
+    snprintf(cmd,255,   "      %s  \n",G2_VERSION);
+    gaprnt(verbose,cmd);
diff --git a/debian/rules b/debian/rules
index 92c0c69..3a09865 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"

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