[grads] 04/17: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 11:29:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/3%2.2.0-1
in repository grads.
commit 7ffd6ec6188e36ae5d97791fad2c5436cbf9b401
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Oct 4 16:57:55 2017 +0100
refresh patches
---
debian/patches/asneeded.patch | 20 +++---
debian/patches/format-security.patch | 10 +--
debian/patches/hdf4-alt.patch | 38 ++++++------
debian/patches/hdf5_hl.patch | 13 ----
debian/patches/nc-config.patch | 33 ++++++----
debian/patches/paths.patch | 26 ++++----
debian/patches/png16.patch | 102 +++++++++++--------------------
debian/patches/remove-jpeg.patch | 62 ++++++++-----------
debian/patches/reproducible-builds.patch | 61 ++++++------------
debian/patches/series | 2 +-
debian/patches/supplibs.patch | 24 ++++----
debian/patches/timeunits_parse.patch | 6 +-
debian/patches/udunits2.patch | 101 +++++++++++++-----------------
13 files changed, 209 insertions(+), 289 deletions(-)
diff --git a/debian/patches/asneeded.patch b/debian/patches/asneeded.patch
index 161167d..9991ce1 100644
--- a/debian/patches/asneeded.patch
+++ b/debian/patches/asneeded.patch
@@ -2,21 +2,21 @@ Descripion: Use --as-needed to remove unnecesary linking.
Author: Alastair McKinstry <mckinstry at debian.org>
Forwared: no
-Index: grads.git/aclocal.m4
+Index: grads-2.2.0/aclocal.m4
===================================================================
---- grads.git.orig/aclocal.m4
-+++ grads.git/aclocal.m4
-@@ -614,4 +614,5 @@ m4_include([m4/netcdf.m4])
+--- grads-2.2.0.orig/aclocal.m4
++++ grads-2.2.0/aclocal.m4
+@@ -776,4 +776,5 @@ m4_include([m4/netcdf.m4])
m4_include([m4/netcdf_header.m4])
m4_include([m4/pkg.m4])
m4_include([m4/udunits.m4])
+m4_include([m4/as-needed.m4])
m4_include([acinclude.m4])
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -1099,6 +1099,8 @@ echo "configure: creating src/buildinfo.
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -847,6 +847,8 @@ build_info="Configured on `date +%D` for
mkdir -p src
echo "static char *buildinfo = \"${build_info}\";" > src/buildinfo.h
@@ -25,10 +25,10 @@ Index: grads.git/configure.ac
AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT
-Index: grads.git/m4/as-needed.m4
+Index: grads-2.2.0/m4/as-needed.m4
===================================================================
--- /dev/null
-+++ grads.git/m4/as-needed.m4
++++ grads-2.2.0/m4/as-needed.m4
@@ -0,0 +1,67 @@
+dnl ./configure support for linking with option --as-needed
+dnl Copyright (C) 2008 Werner Pantke <wpantke at punk-ass-bitch.org>
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
index 22b4f23..397be12 100644
--- a/debian/patches/format-security.patch
+++ b/debian/patches/format-security.patch
@@ -3,11 +3,11 @@ Description: Fix format-security error.
Last-Updated: 2011-10-23
Forwarded: no
-Index: grads.git/src/gagx.c
+Index: grads-2.2.0/src/gagx.c
===================================================================
---- grads.git.orig/src/gagx.c
-+++ grads.git/src/gagx.c
-@@ -3655,7 +3655,7 @@ struct dbfld *fld=NULL,*newfld=NULL,*nex
+--- grads-2.2.0.orig/src/gagx.c
++++ grads-2.2.0/src/gagx.c
+@@ -3661,7 +3661,7 @@ struct dbfld *fld=NULL,*newfld=NULL,*nex
else {
len = strlen(pcm->shpfname);
fnroot = (char *)galloc(len+1,"shpfn");
@@ -16,7 +16,7 @@ Index: grads.git/src/gagx.c
}
if ((dbfid = DBFCreate(fnroot))==NULL) {
gaprnt(0,"Error in gashpwrt: Unable to create data base file\n");
-@@ -4971,11 +4971,11 @@ gadouble *gr;
+@@ -4977,11 +4977,11 @@ gadouble *gr;
if (pcm->ffile != stdout) {
if (pcm->fwname) {
diff --git a/debian/patches/hdf4-alt.patch b/debian/patches/hdf4-alt.patch
index caf4a9b..de22a9f 100644
--- a/debian/patches/hdf4-alt.patch
+++ b/debian/patches/hdf4-alt.patch
@@ -3,29 +3,29 @@ Origin: http://bugs.debian.orf/655869
Forwarded: not-needed
Last-UpdatedL: 2012-09-19
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -694,11 +694,11 @@ else
- if test "$have_zlib" = "yes" -a "$have_udunits" = "yes" -a "$have_jpeg" = "yes" ; then
- GA_SET_FLAGS([hdf])
- AC_CHECK_HEADER([mfhdf.h],
-- [ AC_CHECK_LIB([df], [main],
-- [ AC_CHECK_LIB([mfhdf], [main],
-+ [ AC_CHECK_LIB([dfalt], [main],
-+ [ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
- [ use_hdf=yes
- GA_SET_INCLUDE_VAR([hdf_inc], [hdf udunits])
-- GA_SET_LIB_VAR([hdf_libs], [mfhdf df udunits jpeg z])
-+ GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits jpeg z])
- ])
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -500,11 +500,11 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ if test "$have_zlib" = "yes" -a "$have_jpeg" = "yes" -a "$have_udunits" = "yes" ; then
+ GA_SET_FLAGS([])
+ AC_CHECK_HEADER([mfhdf.h],
+- [ AC_CHECK_LIB([df], [main],
+- [ AC_CHECK_LIB([mfhdf], [main],
++ [ AC_CHECK_LIB([dfalt], [main],
++ [ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
+ [ use_hdf=yes
+ GA_SET_LIB_VAR([hdf_libs], [mfhdf df jpeg z udunits])
+- GA_SET_DYNLIB_VAR([hdf_dynlibs], [mfhdf df jpeg z udunits])
++ GA_SET_DYNLIB_VAR([hdf_dynlibs], [mfhdfalt dfalt jpeg z udunits])
])
])
-Index: grads.git/m4/hdf4.m4
+ ])
+Index: grads-2.2.0/m4/hdf4.m4
===================================================================
---- grads.git.orig/m4/hdf4.m4
-+++ grads.git/m4/hdf4.m4
+--- grads-2.2.0.orig/m4/hdf4.m4
++++ grads-2.2.0/m4/hdf4.m4
@@ -187,11 +187,11 @@ dnl nor required everywhere
ac_hdf4_lib='no'
AC_CHECK_LIB_NOCACHE_HDF4([z],[deflate],
diff --git a/debian/patches/hdf5_hl.patch b/debian/patches/hdf5_hl.patch
index c56ac2c..ce48084 100644
--- a/debian/patches/hdf5_hl.patch
+++ b/debian/patches/hdf5_hl.patch
@@ -4,16 +4,3 @@ Description: When building HDF5 on Debian, hdf5 is needed to link hdf5_hl
Last-Updated: 2010-05-09
Forwarded: no
-Index: grads.git/configure.ac
-===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -809,7 +809,7 @@ else
- GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
- GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z curl])
- ])
-- ])
-+ ],[],[-lhdf5])
- ])
- ])
- GA_UNSET_FLAGS
diff --git a/debian/patches/nc-config.patch b/debian/patches/nc-config.patch
index 42a3461..c2c7329 100644
--- a/debian/patches/nc-config.patch
+++ b/debian/patches/nc-config.patch
@@ -1,13 +1,22 @@
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -831,7 +831,7 @@ else
- ],,
- [])
- ])
-- NC_CONFIG="`pkg-config --variable=prefix netcdf`/bin/nc-config"
-+ NC_CONFIG="/usr/bin/nc-config"
- CURL_CONFIG="`pkg-config --variable=prefix libcurl`/bin/curl-config"
- fi
- if test $use_nc4 != "yes" ; then
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -521,7 +521,7 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ [ AC_CHECK_LIB([netcdf], [main],
+ [ use_nc="yes"
+ # check if we have nc-config utility
+- NC_CONFIG=${ga_supplib_dir}/bin/nc-config
++ NC_CONFIG=/usr/bin/nc-config
+ if test ! -f "$NC_CONFIG" || test ! -x "$NC_CONFIG"; then
+ use_nc4="no"
+ GA_SET_LIB_VAR(nc_libs, [udunits netcdf])
+@@ -649,7 +649,7 @@ if test "$ga_dyn_supplibs" = "yes" ; the
+ ],,
+ [])
+ ])
+- NC_CONFIG="`pkg-config --variable=prefix netcdf`/bin/nc-config"
++ NC_CONFIG="/usr/bin/nc-config"
+ CURL_CONFIG="`pkg-config --variable=prefix libcurl`/bin/curl-config"
+ fi
+
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index c123a8f..bec063e 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -3,11 +3,11 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2010-05-09
Forwarded: no
-Index: grads.git/src/gxsubs.c
+Index: grads-2.2.0/src/gxsubs.c
===================================================================
---- grads.git.orig/src/gxsubs.c
-+++ grads.git/src/gxsubs.c
-@@ -31,7 +31,7 @@ void gree();
+--- grads-2.2.0.orig/src/gxsubs.c
++++ grads-2.2.0/src/gxsubs.c
+@@ -32,7 +32,7 @@ void gree ();
/* The following variables are local to this file, and are used by
all the routines in the file. */
@@ -16,18 +16,18 @@ Index: grads.git/src/gxsubs.c
static gadouble xsize, ysize; /* Virtual page size */
static gadouble rxsize, rysize; /* Real page size */
static gaint lwflg; /* Reduce lw due vpage*/
-Index: grads.git/src/Makefile.in
+Index: grads-2.2.0/src/Makefile.in
===================================================================
---- grads.git.orig/src/Makefile.in
-+++ grads.git/src/Makefile.in
-@@ -329,8 +329,8 @@ target_alias = @target_alias@
- #
-
- # Paths to external headers and libraries
+--- grads-2.2.0.orig/src/Makefile.in
++++ grads-2.2.0/src/Makefile.in
+@@ -483,8 +483,8 @@ hdr_ga = gagmap.h gagui.h gabufr.h gasdf
+ hdr_gx = gx.h gxGD.h gxC.h gxmap.h
+ noinst_HEADERS = $(hdr_core) $(hdr_ga) $(hdr_gx)
+ DISTCLEANFILES = buildinfo.h config.h
-supp_include_dir = $(SUPPLIBS)/include
-supp_lib_dir = $(SUPPLIBS)/lib
+supp_include_dir = /usr/include
+supp_lib_dir = /usr/lib
-
- # Settings used for all binaries
LDADD = -L$(supp_lib_dir)
+ common_ldadd = $(LDADD) $(host_ldadd)
+ X11_ldadd = $(X_LIBS) $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
diff --git a/debian/patches/png16.patch b/debian/patches/png16.patch
index cf79552..9add534 100644
--- a/debian/patches/png16.patch
+++ b/debian/patches/png16.patch
@@ -3,79 +3,49 @@ Description: Move from png1.5 -> png1.6
Last-Updated: 2016-01-05
Forwarded: no
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -463,8 +463,8 @@ if test "$with_printim" != "no" ; then
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -339,12 +339,12 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ ])
+ GA_UNSET_FLAGS
+
+- # png15
++ # png16
+ echo
+ echo png
+ echo ---
+ GA_SET_FLAGS([])
+- AC_CHECK_LIB([png15], [main], [have_png=yes])
++ AC_CHECK_LIB([png16], [main], [have_png=yes])
+ GA_UNSET_FLAGS
+
+ # zlib
+@@ -402,8 +402,8 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ AC_CHECK_HEADER(grib2.h,
+ [ AC_CHECK_LIB([grib2c], [main],
+ [ use_grib2=yes
+- GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png15 z])
+- GA_SET_DYNLIB_VAR([grib2_dynlibs], [grib2c jasper png15 z])
++ GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png16 z])
++ GA_SET_DYNLIB_VAR([grib2_dynlibs], [grib2c jasper png16 z])
])
])
GA_UNSET_FLAGS
-- GA_SET_FLAGS([libpng15])
-- AC_CHECK_LIB([png15], [main],
-+ GA_SET_FLAGS([libpng16])
-+ AC_CHECK_LIB([png16], [main],
- [ have_libpng=yes
- ])
- GA_UNSET_FLAGS
-@@ -480,9 +480,9 @@ if test "$with_printim" != "no" ; then
- [ use_printim=yes
- GA_SET_INCLUDE_VAR([printim_inc], [gd])
- if test "$have_jpeg" = "yes" ; then
-- GA_SET_LIB_VAR([printim_libs], [gd png15 z jpeg])
-+ GA_SET_LIB_VAR([printim_libs], [gd png16 z jpeg])
- else
-- GA_SET_LIB_VAR([printim_libs], [gd png15 z])
-+ GA_SET_LIB_VAR([printim_libs], [gd png16 z])
- fi
+@@ -437,7 +437,7 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ [ use_cairo="yes"
+ have_cairo="yes"
+ GA_SET_INCLUDE_VAR([cairo_inc], [cairo freetype2])
+- GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png15 xml2 z])
++ GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png16 xml2 z])
+ GA_SET_DYNLIB_VAR(cairo_dynlibs, [cairo])
])
])
-@@ -528,8 +528,8 @@ if test "$with_cairo" != "no" ; then
- fi
- # libpng
- if test "$have_libpng" = "no" ; then
-- GA_SET_FLAGS([libpng15])
-- AC_CHECK_LIB([png15], [main],
-+ GA_SET_FLAGS([libpng16])
-+ AC_CHECK_LIB([png16], [main],
- [ have_libpng=yes
- ])
- GA_UNSET_FLAGS
-@@ -559,8 +559,8 @@ if test "$with_cairo" != "no" ; then
- [ AC_CHECK_LIB(Xrender,main,
- [ AC_CHECK_LIB(cairo,main,
- [ use_cairo="yes"
-- GA_SET_INCLUDE_VAR([cairo_inc], [cairo freetype2 fontconfig libpng15 pixman-1])
-- GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png15 xml2 z])
-+ GA_SET_INCLUDE_VAR([cairo_inc], [cairo freetype2 fontconfig libpng16 pixman-1])
-+ GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png16 xml2 z])
- ])
- ])
- ])
-@@ -603,8 +603,8 @@ if test "$with_grib2" != "no" ; then
- GA_UNSET_FLAGS
- fi
- if test "$have_libpng" = "no" ; then
-- GA_SET_FLAGS([libpng15])
-- AC_CHECK_LIB([png15], [main],
-+ GA_SET_FLAGS([libpng16])
-+ AC_CHECK_LIB([png16], [main],
- [ have_libpng=yes
- ])
- GA_UNSET_FLAGS
-@@ -622,7 +622,7 @@ if test "$with_grib2" != "no" ; then
- [ AC_CHECK_LIB([grib2c], [main],
- [ use_grib2=yes
- GA_SET_INCLUDE_VAR([grib2_inc], [grib2c])
-- GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png15 z])
-+ GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png16 z])
- ])
- ])
- GA_UNSET_FLAGS
-Index: grads.git/doc/supplibs.html
+Index: grads-2.2.0/doc/supplibs.html
===================================================================
---- grads.git.orig/doc/supplibs.html
-+++ grads.git/doc/supplibs.html
+--- grads-2.2.0.orig/doc/supplibs.html
++++ grads-2.2.0/doc/supplibs.html
@@ -118,10 +118,10 @@ mkdir $HOME/supplibs/bin</span></p>
--prefix=$HOME/supplibs/src/libpng<br>
make ;
diff --git a/debian/patches/remove-jpeg.patch b/debian/patches/remove-jpeg.patch
index 3c16004..c50b4bf 100644
--- a/debian/patches/remove-jpeg.patch
+++ b/debian/patches/remove-jpeg.patch
@@ -3,41 +3,31 @@ Description: Remove unnnecessary dependencies on png, openjpeg.
Last-Updated: 2016-06-10
Forwarded: not-needed
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -609,25 +609,15 @@ 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_SET_FLAGS([grib2c])
-+ AC_CHECK_HEADER(grib2.h,
-+ [ AC_CHECK_LIB([grib2c], [main],
-+ [ use_grib2=yes
-+ GA_SET_INCLUDE_VAR([grib2_inc], [grib2c])
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -397,17 +397,15 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ echo
+ echo grib2
+ echo -----
+- if test "$have_zlib" = "yes" -a "$have_png" = "yes" -a "$have_jasper" = "yes" ; then
+- GA_SET_FLAGS([])
+- AC_CHECK_HEADER(grib2.h,
++ GA_SET_FLAGS([])
++ AC_CHECK_HEADER(grib2.h,
+ [ AC_CHECK_LIB([grib2c], [main],
+ [ use_grib2=yes
+- GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png16 z])
+- GA_SET_DYNLIB_VAR([grib2_dynlibs], [grib2c jasper png16 z])
+ GA_SET_LIB_VAR([grib2_libs], [grib2c])
- ])
-- GA_UNSET_FLAGS
-- fi
-- fi
-+ ])
-+ 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
++ GA_SET_DYNLIB_VAR([grib2_dynlibs], [grib2c])
+ ])
+- ])
+- GA_UNSET_FLAGS
+- fi
++ ])
++ GA_UNSET_FLAGS
+
+ # xml2
+ echo
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index 3fb55b6..9505ced 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -3,61 +3,38 @@ Description: Remove build_date so that build is bit-reproducible.
Last-Updated: 2016-07-10
Forwarded: no
-Index: grads.git/configure
+Index: grads-2.2.0/configure
===================================================================
---- grads.git.orig/configure
-+++ grads.git/configure
-@@ -23191,13 +23191,11 @@ fi
-
-
-
--build_date=`date +%D`
--build_host=`uname -sr`
--build_info="Built `date` for ${host}"
-+build_host='debian'
-
- echo \
- " +=========================================================================+"
-- echo " GrADS "2.1.1.b0 ":" $build_info
-+ echo " GrADS "2.1.1.b0 ":"
- echo \
- " +=========================================================================+"
- echo
-@@ -23298,7 +23296,7 @@ echo 2.1.1.b0 > src/VERSION
-
+--- grads-2.2.0.orig/configure
++++ grads-2.2.0/configure
+@@ -23866,7 +23866,7 @@ echo 2.2.0 > src/VERSION
echo "configure: creating src/buildinfo.h"
+ build_info="Configured on `date +%D` for ${host}"
mkdir -p src
-echo "static char *buildinfo = \"${build_info}\";" > src/buildinfo.h
+echo "static char *buildinfo = \"${build_host}\";" > src/buildinfo.h
- ac_config_files="$ac_config_files Makefile src/Makefile"
+ ac_config_files="$ac_config_files Makefile src/Makefile"
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -990,13 +990,11 @@ dnl ------------------------------------
- dnl Print summary and write output files
- dnl ----------------------------------------------------
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -845,7 +845,7 @@ echo AC_PACKAGE_VERSION > src/VERSION
+ echo "configure: creating src/buildinfo.h"
+ build_info="Configured on `date +%D` for ${host}"
+ mkdir -p src
+-echo "static char *buildinfo = \"${build_info}\";" > src/buildinfo.h
++echo "static char *buildinfo = \"${build_host}\";" > src/buildinfo.h
--build_date=`date +%D`
--build_host=`uname -sr`
--build_info="Built `date` for ${host}"
-+build_host='debian'
+ LINK_AS_NEEDED
+@@ -859,7 +859,7 @@ AC_OUTPUT
+ echo
echo \
" +=========================================================================+"
- echo " GrADS "AC_PACKAGE_VERSION ":" $build_info
-+ echo " GrADS "AC_PACKAGE_VERSION
++ echo " GrADS "AC_PACKAGE_VERSION ":" " DEBIAN "
echo \
" +=========================================================================+"
echo
-@@ -1097,7 +1095,7 @@ echo AC_PACKAGE_VERSION > src/VERSION
-
- echo "configure: creating src/buildinfo.h"
- mkdir -p src
--echo "static char *buildinfo = \"${build_info}\";" > src/buildinfo.h
-+echo "static char *buildinfo = \"${build_host}\";" > src/buildinfo.h
-
- LINK_AS_NEEDED
-
diff --git a/debian/patches/series b/debian/patches/series
index fd2703a..15c7924 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@ hdf4-alt.patch
supplibs.patch
paths.patch
udunits2.patch
-hdf5_hl.patch
+# hdf5_hl.patch
asneeded.patch
timeunits_parse.patch
format-security.patch
diff --git a/debian/patches/supplibs.patch b/debian/patches/supplibs.patch
index 3a8cc06..3c2edbb 100644
--- a/debian/patches/supplibs.patch
+++ b/debian/patches/supplibs.patch
@@ -4,23 +4,23 @@ Description: remove wrong "supplibs" dir handling
paths.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/749178
-Index: grads.git/src/Makefile.am
+Index: grads-2.2.0/src/Makefile.am
===================================================================
---- grads.git.orig/src/Makefile.am
-+++ grads.git/src/Makefile.am
-@@ -27,6 +27,7 @@ utils: bufrscan gribscan gribmap stnmap
- #
+--- grads-2.2.0.orig/src/Makefile.am
++++ grads-2.2.0/src/Makefile.am
+@@ -70,6 +70,7 @@ DISTCLEANFILES = buildinfo.h config.h
- # Paths to external headers and libraries
-+SUPPLIBS = /usr
+
+ ## Paths to external headers and libraries
++SUPPLIBS = /usr
supp_include_dir = $(SUPPLIBS)/include
supp_lib_dir = $(SUPPLIBS)/lib
-
-Index: grads.git/acinclude.m4
+ LDADD = -L$(supp_lib_dir)
+Index: grads-2.2.0/acinclude.m4
===================================================================
---- grads.git.orig/acinclude.m4
-+++ grads.git/acinclude.m4
-@@ -92,14 +92,12 @@ AC_DEFUN([GA_SET_CAIRO_FLAGS],
+--- grads-2.2.0.orig/acinclude.m4
++++ grads-2.2.0/acinclude.m4
+@@ -75,14 +75,12 @@ AC_DEFUN([GA_UNSET_FLAGS],
])
dnl GA_SET_LIB_VAR : Puts necessary linker options to link with libraries given into
diff --git a/debian/patches/timeunits_parse.patch b/debian/patches/timeunits_parse.patch
index 92441d0..8b11b83 100644
--- a/debian/patches/timeunits_parse.patch
+++ b/debian/patches/timeunits_parse.patch
@@ -4,10 +4,10 @@ Last-Updated: 2011-01-07
Bug-Debian: #587496.
Forwarded: no
-Index: grads.git/src/gasdf.c
+Index: grads-2.2.0/src/gasdf.c
===================================================================
---- grads.git.orig/src/gasdf.c
-+++ grads.git/src/gasdf.c
+--- grads-2.2.0.orig/src/gasdf.c
++++ grads-2.2.0/src/gasdf.c
@@ -859,7 +859,7 @@ utUnit timeunit ;
if (!temp_str) {
trunc_point = strlen(time_units) ;
diff --git a/debian/patches/udunits2.patch b/debian/patches/udunits2.patch
index 8ebd23e..3e32b6f 100644
--- a/debian/patches/udunits2.patch
+++ b/debian/patches/udunits2.patch
@@ -3,68 +3,55 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2012-09-16
Forwarded: no
-Index: grads.git/configure.ac
+Index: grads-2.2.0/configure.ac
===================================================================
---- grads.git.orig/configure.ac
-+++ grads.git/configure.ac
-@@ -678,7 +678,7 @@ else
- # look for udunits
- GA_SET_FLAGS([udunits])
- AC_CHECK_HEADERS([udunits.h],
-- [ AC_CHECK_LIB([udunits], [utInit],
-+ [ AC_CHECK_LIB([udunits2], [utInit],
- [ have_udunits=yes
- ])
+--- grads-2.2.0.orig/configure.ac
++++ grads-2.2.0/configure.ac
+@@ -456,7 +456,7 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ echo -------
+ GA_SET_FLAGS([])
+ AC_CHECK_HEADER([udunits.h],
+- [ AC_CHECK_LIB([udunits], [utInit],
++ [ AC_CHECK_LIB([udunits2], [utInit],
+ [ have_udunits=yes
])
-@@ -698,7 +698,7 @@ else
- [ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
- [ use_hdf=yes
- GA_SET_INCLUDE_VAR([hdf_inc], [hdf udunits])
-- GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits jpeg z])
-+ GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits2 jpeg z])
- ])
+ ])
+@@ -503,8 +503,8 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ [ AC_CHECK_LIB([dfalt], [main],
+ [ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
+ [ use_hdf=yes
+- GA_SET_LIB_VAR([hdf_libs], [mfhdf df jpeg z udunits])
+- GA_SET_DYNLIB_VAR([hdf_dynlibs], [mfhdfalt dfalt jpeg z udunits])
++ GA_SET_LIB_VAR([hdf_libs], [mfhdf df jpeg z udunits2])
++ GA_SET_DYNLIB_VAR([hdf_dynlibs], [mfhdfalt dfalt jpeg z udunits2])
])
])
-@@ -792,7 +792,7 @@ else
- if test "$have_udunits" = "no" ; then
- GA_SET_FLAGS([udunits])
- AC_CHECK_HEADERS([udunits.h],
-- [ AC_CHECK_LIB([udunits], [utInit],
-+ [ AC_CHECK_LIB([udunits2], [utInit],
- [ have_udunits=yes
- ])
- ])
-@@ -807,7 +807,7 @@ else
- [ AC_CHECK_LIB(curl,main,
- [ use_nc4="yes"
- GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
-- GA_SET_LIB_VAR(nc_libs, [udunits netcdf hdf5_hl hdf5 z curl])
-+ GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z curl])
- ])
- ])
- ])
-@@ -868,7 +868,7 @@ else
- if test "$have_udunits" = "no" ; then
- GA_SET_FLAGS([udunits])
- AC_CHECK_HEADERS([udunits.h],
-- [ AC_CHECK_LIB([udunits], [utInit],
-+ [ AC_CHECK_LIB([udunits2], [utInit],
- [ have_udunits=yes
- ])
- ])
-@@ -880,7 +880,7 @@ else
- [ AC_CHECK_LIB([netcdf], [main],
- [ use_nc="yes"
- GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
-- GA_SET_LIB_VAR(nc_libs, [netcdf udunits])
-+ GA_SET_LIB_VAR(nc_libs, [netcdf udunits2])
- ])
- ])
- GA_UNSET_FLAGS
-Index: grads.git/m4/udunits.m4
+ ])
+@@ -524,16 +524,16 @@ if test "Z$ga_supplib_dir" != "Z" ; then
+ NC_CONFIG=/usr/bin/nc-config
+ if test ! -f "$NC_CONFIG" || test ! -x "$NC_CONFIG"; then
+ use_nc4="no"
+- GA_SET_LIB_VAR(nc_libs, [udunits netcdf])
+- GA_SET_DYNLIB_VAR(nc_dynlibs, [udunits netcdf])
++ GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf])
++ GA_SET_DYNLIB_VAR(nc_dynlibs, [udunits2 netcdf])
+ else
+ # check if netcdf lib has hdf5 and if dap-enabled
+ nchdf5=`$NC_CONFIG --has-hdf5`
+ use_dap=`$NC_CONFIG --has-dap`
+ if test "$nchdf5" = "yes" -a "$use_dap" = "yes" -a "$have_curl" = "yes" ; then
+ use_nc4="yes"
+- GA_SET_LIB_VAR(nc_libs, [udunits netcdf hdf5_hl hdf5 curl z])
+- GA_SET_DYNLIB_VAR(nc_dynlibs, [udunits netcdf hdf5_hl hdf5 curl z])
++ GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 curl z])
++ GA_SET_DYNLIB_VAR(nc_dynlibs, [udunits2 netcdf hdf5_hl hdf5 curl z])
+ fi
+ fi
+ ])
+Index: grads-2.2.0/m4/udunits.m4
===================================================================
---- grads.git.orig/m4/udunits.m4
-+++ grads.git/m4/udunits.m4
+--- grads-2.2.0.orig/m4/udunits.m4
++++ grads-2.2.0/m4/udunits.m4
@@ -5,9 +5,9 @@ AC_DEFUN([GA_CHECK_UDUNITS],
[
ga_use_udunits='no'
--
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