[grads] 04/20: Remove unnecessary dependencies on openjpeg, libpng. Closes: #826815
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed May 17 11:13:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository grads.
commit 676105bde0e90a15eb538c03061e76fcc279a344
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Jun 10 08:12:03 2016 +0100
Remove unnecessary dependencies on openjpeg, libpng. Closes: #826815
---
debian/changelog | 6 ++++
debian/control | 5 ++-
debian/patches/remove-jasper.patch | 63 --------------------------------------
debian/patches/remove-jpeg.patch | 23 ++++++++------
4 files changed, 22 insertions(+), 75 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bacc626..90894f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grads (2:2.1.a3-2) UNRELEASED; urgency=medium
+
+ * Remove unnecessary dependencies on openjpeg, libpng. Closes: #826815
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 10 Jun 2016 08:07:09 +0100
+
grads (2:2.1.a3-1) unstable; urgency=medium
* Standards-Version: 3.9.8
diff --git a/debian/control b/debian/control
index 193cb97..c691a80 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,13 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf,
pkg-config, libreadline-dev, libgeotiff-dev,
libgrib2c-dev (>= 1.6.0-3),
libnetcdf-dev, netcdf-bin,
- libopenjpeg-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,
- libpng-dev (>= 1.6.21-5)
+ libcairo2-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.8
Homepage: http://www.iges.org/grads/
diff --git a/debian/patches/remove-jasper.patch b/debian/patches/remove-jasper.patch
deleted file mode 100644
index e391622..0000000
--- a/debian/patches/remove-jasper.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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/patches/remove-jpeg.patch b/debian/patches/remove-jpeg.patch
index eb1c3e4..426b6f1 100644
--- a/debian/patches/remove-jpeg.patch
+++ b/debian/patches/remove-jpeg.patch
@@ -1,8 +1,13 @@
+Author: Alastair McKinstry <mcmkinstry at debian.org>
+Description: Remove unnnecessary dependencies on png, openjpeg.
+Last-Updated: 2016-06-10
+Forwarded: not-needed
+
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
+@@ -609,25 +609,15 @@ if test "$with_grib2" != "no" ; then
])
GA_UNSET_FLAGS
fi
@@ -21,17 +26,17 @@ Index: grads-2.1.a3/configure.ac
- GA_SET_INCLUDE_VAR([grib2_inc], [grib2c])
- GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png16 z])
- ])
-- ])
++ 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
- 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/grads.git
More information about the debian-science-commits
mailing list