[grads] 04/11: update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jul 19 06:14:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag 3%2.1.1.b0-1
in repository grads.
commit 529400f069c4c1df76adf50296601e9af6032e52
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jul 6 11:34:45 2017 +0100
update patches
---
debian/patches/asneeded.patch | 18 +++++++-------
debian/patches/format-security.patch | 18 +++++++-------
debian/patches/hdf4-alt.patch | 36 ++++++++++++++--------------
debian/patches/hdf5_hl.patch | 10 ++++----
debian/patches/nc-config.patch | 14 +++++------
debian/patches/paths.patch | 16 ++++++-------
debian/patches/png16.patch | 12 +++++-----
debian/patches/remove-jpeg.patch | 6 ++---
debian/patches/reproducible-builds.patch | 28 +++++++++++-----------
debian/patches/supplibs.patch | 14 +++++------
debian/patches/timeunits_parse.patch | 8 +++----
debian/patches/udunits2.patch | 40 +++++++++++++++-----------------
12 files changed, 109 insertions(+), 111 deletions(-)
diff --git a/debian/patches/asneeded.patch b/debian/patches/asneeded.patch
index 8acd36d..161167d 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-2.1~a3/aclocal.m4
+Index: grads.git/aclocal.m4
===================================================================
---- grads-2.1~a3.orig/aclocal.m4
-+++ grads-2.1~a3/aclocal.m4
+--- grads.git.orig/aclocal.m4
++++ grads.git/aclocal.m4
@@ -614,4 +614,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-2.1~a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
-@@ -1094,6 +1094,8 @@ echo "configure: creating src/buildinfo.
+--- grads.git.orig/configure.ac
++++ grads.git/configure.ac
+@@ -1099,6 +1099,8 @@ echo "configure: creating src/buildinfo.
mkdir -p src
echo "static char *buildinfo = \"${build_info}\";" > src/buildinfo.h
@@ -25,10 +25,10 @@ Index: grads-2.1~a3/configure.ac
AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT
-Index: grads-2.1~a3/m4/as-needed.m4
+Index: grads.git/m4/as-needed.m4
===================================================================
--- /dev/null
-+++ grads-2.1~a3/m4/as-needed.m4
++++ grads.git/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 07d95f4..22b4f23 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-2.1~a3/src/gagx.c
+Index: grads.git/src/gagx.c
===================================================================
---- grads-2.1~a3.orig/src/gagx.c
-+++ grads-2.1~a3/src/gagx.c
-@@ -3648,7 +3648,7 @@ struct dbfld *fld=NULL,*newfld=NULL,*nex
+--- grads.git.orig/src/gagx.c
++++ grads.git/src/gagx.c
+@@ -3655,7 +3655,7 @@ struct dbfld *fld=NULL,*newfld=NULL,*nex
else {
len = strlen(pcm->shpfname);
fnroot = (char *)galloc(len+1,"shpfn");
@@ -16,17 +16,17 @@ Index: grads-2.1~a3/src/gagx.c
}
if ((dbfid = DBFCreate(fnroot))==NULL) {
gaprnt(0,"Error in gashpwrt: Unable to create data base file\n");
-@@ -4962,11 +4962,11 @@ gadouble *gr;
+@@ -4971,11 +4971,11 @@ gadouble *gr;
if (pcm->ffile != stdout) {
if (pcm->fwname) {
-- snprintf(pout,255,"Wrote %ld of %i elements to ", written, exsz);
-+ snprintf(pout,255,"Wrote %ld of %i elements to ", (long) written, exsz);
+- snprintf(pout,1255,"Wrote %ld of %i elements to ", written, exsz);
++ snprintf(pout,1255,"Wrote %ld of %i elements to ", (long) written, exsz);
gaprnt (2,pout);
gaprnt (2,pcm->fwname);
} else {
-- snprintf(pout,255,"Wrote %ld of %i elements to grads.fwrite", written, exsz);
-+ snprintf(pout,255,"Wrote %ld of %i elements to grads.fwrite", (long) written, exsz);
+- snprintf(pout,1255,"Wrote %ld of %i elements to grads.fwrite", written, exsz);
++ snprintf(pout,1255,"Wrote %ld of %i elements to grads.fwrite", (long) written, exsz);
gaprnt (2,pout);
}
diff --git a/debian/patches/hdf4-alt.patch b/debian/patches/hdf4-alt.patch
index 92e969e..caf4a9b 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-2.1~a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
-@@ -695,11 +695,11 @@ else
+--- 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_LIB([sz], [main],
- [ 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 sz jpeg z])
-+ GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits sz jpeg z])
- ])
+ 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])
])
])
-Index: grads-2.1~a3/m4/hdf4.m4
+ ])
+Index: grads.git/m4/hdf4.m4
===================================================================
---- grads-2.1~a3.orig/m4/hdf4.m4
-+++ grads-2.1~a3/m4/hdf4.m4
+--- grads.git.orig/m4/hdf4.m4
++++ grads.git/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 59aba4b..c56ac2c 100644
--- a/debian/patches/hdf5_hl.patch
+++ b/debian/patches/hdf5_hl.patch
@@ -4,13 +4,13 @@ Description: When building HDF5 on Debian, hdf5 is needed to link hdf5_hl
Last-Updated: 2010-05-09
Forwarded: no
-Index: grads-2.1~a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
-@@ -813,7 +813,7 @@ else
+--- 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 sz curl])
+ GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z curl])
])
- ])
+ ],[],[-lhdf5])
diff --git a/debian/patches/nc-config.patch b/debian/patches/nc-config.patch
index e80474b..d209452 100644
--- a/debian/patches/nc-config.patch
+++ b/debian/patches/nc-config.patch
@@ -1,13 +1,13 @@
-Index: grads-2.1~a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
-@@ -834,7 +834,7 @@ else
+--- 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"
+- 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
- AC_DEFINE(USENETCDF, 0, [Enable netcdf])
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index 3a078e5..c123a8f 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-2.1~a3/src/gxsubs.c
+Index: grads.git/src/gxsubs.c
===================================================================
---- grads-2.1~a3.orig/src/gxsubs.c
-+++ grads-2.1~a3/src/gxsubs.c
-@@ -32,7 +32,7 @@ void gree();
+--- grads.git.orig/src/gxsubs.c
++++ grads.git/src/gxsubs.c
+@@ -31,7 +31,7 @@ void gree();
/* The following variables are local to this file, and are used by
all the routines in the file. */
@@ -16,11 +16,11 @@ Index: grads-2.1~a3/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-2.1~a3/src/Makefile.in
+Index: grads.git/src/Makefile.in
===================================================================
---- grads-2.1~a3.orig/src/Makefile.in
-+++ grads-2.1~a3/src/Makefile.in
-@@ -301,8 +301,8 @@ target_alias = @target_alias@
+--- 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
diff --git a/debian/patches/png16.patch b/debian/patches/png16.patch
index 719e7ca..cf79552 100644
--- a/debian/patches/png16.patch
+++ b/debian/patches/png16.patch
@@ -3,10 +3,10 @@ Description: Move from png1.5 -> png1.6
Last-Updated: 2016-01-05
Forwarded: no
-Index: grads-2.1~a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
+--- grads.git.orig/configure.ac
++++ grads.git/configure.ac
@@ -463,8 +463,8 @@ if test "$with_printim" != "no" ; then
])
])
@@ -72,10 +72,10 @@ Index: grads-2.1~a3/configure.ac
])
])
GA_UNSET_FLAGS
-Index: grads-2.1~a3/doc/supplibs.html
+Index: grads.git/doc/supplibs.html
===================================================================
---- grads-2.1~a3.orig/doc/supplibs.html
-+++ grads-2.1~a3/doc/supplibs.html
+--- grads.git.orig/doc/supplibs.html
++++ grads.git/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 426b6f1..3c16004 100644
--- a/debian/patches/remove-jpeg.patch
+++ b/debian/patches/remove-jpeg.patch
@@ -3,10 +3,10 @@ Description: Remove unnnecessary dependencies on png, openjpeg.
Last-Updated: 2016-06-10
Forwarded: not-needed
-Index: grads-2.1.a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1.a3.orig/configure.ac
-+++ grads-2.1.a3/configure.ac
+--- grads.git.orig/configure.ac
++++ grads.git/configure.ac
@@ -609,25 +609,15 @@ if test "$with_grib2" != "no" ; then
])
GA_UNSET_FLAGS
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index e20c055..3fb55b6 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -3,27 +3,27 @@ Description: Remove build_date so that build is bit-reproducible.
Last-Updated: 2016-07-10
Forwarded: no
-Index: grads-2.1.0/configure
+Index: grads.git/configure
===================================================================
---- grads-2.1.0.orig/configure
-+++ grads-2.1.0/configure
-@@ -23307,12 +23307,12 @@ fi
+--- grads.git.orig/configure
++++ grads.git/configure
+@@ -23191,13 +23191,11 @@ fi
- build_date=`date +%D`
+
+-build_date=`date +%D`
-build_host=`uname -sr`
-build_info="Built `date` for ${host}"
+build_host='debian'
-+
echo \
" +=========================================================================+"
-- echo " GrADS "2.1.0 ":" $build_info
-+ echo " GrADS 2.1.0 "
+- echo " GrADS "2.1.1.b0 ":" $build_info
++ echo " GrADS "2.1.1.b0 ":"
echo \
" +=========================================================================+"
echo
-@@ -23413,7 +23413,7 @@ echo 2.1.0 > src/VERSION
+@@ -23298,7 +23296,7 @@ echo 2.1.1.b0 > src/VERSION
echo "configure: creating src/buildinfo.h"
mkdir -p src
@@ -32,11 +32,11 @@ Index: grads-2.1.0/configure
ac_config_files="$ac_config_files Makefile src/Makefile"
-Index: grads-2.1.0/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1.0.orig/configure.ac
-+++ grads-2.1.0/configure.ac
-@@ -985,13 +985,11 @@ dnl ------------------------------------
+--- grads.git.orig/configure.ac
++++ grads.git/configure.ac
+@@ -990,13 +990,11 @@ dnl ------------------------------------
dnl Print summary and write output files
dnl ----------------------------------------------------
@@ -52,7 +52,7 @@ Index: grads-2.1.0/configure.ac
echo \
" +=========================================================================+"
echo
-@@ -1092,7 +1090,7 @@ echo AC_PACKAGE_VERSION > src/VERSION
+@@ -1097,7 +1095,7 @@ echo AC_PACKAGE_VERSION > src/VERSION
echo "configure: creating src/buildinfo.h"
mkdir -p src
diff --git a/debian/patches/supplibs.patch b/debian/patches/supplibs.patch
index 4bff3e0..3a8cc06 100644
--- a/debian/patches/supplibs.patch
+++ b/debian/patches/supplibs.patch
@@ -4,11 +4,11 @@ Description: remove wrong "supplibs" dir handling
paths.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/749178
-Index: grads-2.1~a3/src/Makefile.am
+Index: grads.git/src/Makefile.am
===================================================================
---- grads-2.1~a3.orig/src/Makefile.am
-+++ grads-2.1~a3/src/Makefile.am
-@@ -26,6 +26,7 @@ utils: bufrscan gribscan gribmap stnmap
+--- grads.git.orig/src/Makefile.am
++++ grads.git/src/Makefile.am
+@@ -27,6 +27,7 @@ utils: bufrscan gribscan gribmap stnmap
#
# Paths to external headers and libraries
@@ -16,10 +16,10 @@ Index: grads-2.1~a3/src/Makefile.am
supp_include_dir = $(SUPPLIBS)/include
supp_lib_dir = $(SUPPLIBS)/lib
-Index: grads-2.1~a3/acinclude.m4
+Index: grads.git/acinclude.m4
===================================================================
---- grads-2.1~a3.orig/acinclude.m4
-+++ grads-2.1~a3/acinclude.m4
+--- grads.git.orig/acinclude.m4
++++ grads.git/acinclude.m4
@@ -92,14 +92,12 @@ AC_DEFUN([GA_SET_CAIRO_FLAGS],
])
diff --git a/debian/patches/timeunits_parse.patch b/debian/patches/timeunits_parse.patch
index 59c93ab..92441d0 100644
--- a/debian/patches/timeunits_parse.patch
+++ b/debian/patches/timeunits_parse.patch
@@ -4,11 +4,11 @@ Last-Updated: 2011-01-07
Bug-Debian: #587496.
Forwarded: no
-Index: grads-2.1~a3/src/gasdf.c
+Index: grads.git/src/gasdf.c
===================================================================
---- grads-2.1~a3.orig/src/gasdf.c
-+++ grads-2.1~a3/src/gasdf.c
-@@ -837,7 +837,7 @@ utUnit timeunit ;
+--- grads.git.orig/src/gasdf.c
++++ grads.git/src/gasdf.c
+@@ -859,7 +859,7 @@ utUnit timeunit ;
if (!temp_str) {
trunc_point = strlen(time_units) ;
} else {
diff --git a/debian/patches/udunits2.patch b/debian/patches/udunits2.patch
index 919766c..8ebd23e 100644
--- a/debian/patches/udunits2.patch
+++ b/debian/patches/udunits2.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2012-09-16
Forwarded: no
-Index: grads-2.1~a3/configure.ac
+Index: grads.git/configure.ac
===================================================================
---- grads-2.1~a3.orig/configure.ac
-+++ grads-2.1~a3/configure.ac
+--- grads.git.orig/configure.ac
++++ grads.git/configure.ac
@@ -678,7 +678,7 @@ else
# look for udunits
GA_SET_FLAGS([udunits])
@@ -16,18 +16,16 @@ Index: grads-2.1~a3/configure.ac
[ have_udunits=yes
])
])
-@@ -698,8 +698,8 @@ else
- [ 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], [mfhdfalt dfalt udunits sz jpeg z])
-+ GA_SET_INCLUDE_VAR([hdf_inc], [hdf udunits2])
-+ GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits2 sz jpeg z])
- ])
+@@ -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])
])
])
-@@ -796,7 +796,7 @@ else
+ ])
+@@ -792,7 +792,7 @@ else
if test "$have_udunits" = "no" ; then
GA_SET_FLAGS([udunits])
AC_CHECK_HEADERS([udunits.h],
@@ -36,16 +34,16 @@ Index: grads-2.1~a3/configure.ac
[ have_udunits=yes
])
])
-@@ -811,7 +811,7 @@ else
+@@ -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 sz curl])
-+ GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z sz curl])
+- 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])
])
])
])
-@@ -863,7 +863,7 @@ else
+@@ -868,7 +868,7 @@ else
if test "$have_udunits" = "no" ; then
GA_SET_FLAGS([udunits])
AC_CHECK_HEADERS([udunits.h],
@@ -54,7 +52,7 @@ Index: grads-2.1~a3/configure.ac
[ have_udunits=yes
])
])
-@@ -875,7 +875,7 @@ else
+@@ -880,7 +880,7 @@ else
[ AC_CHECK_LIB([netcdf], [main],
[ use_nc="yes"
GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
@@ -63,10 +61,10 @@ Index: grads-2.1~a3/configure.ac
])
])
GA_UNSET_FLAGS
-Index: grads-2.1~a3/m4/udunits.m4
+Index: grads.git/m4/udunits.m4
===================================================================
---- grads-2.1~a3.orig/m4/udunits.m4
-+++ grads-2.1~a3/m4/udunits.m4
+--- grads.git.orig/m4/udunits.m4
++++ grads.git/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