[grads] 03/06: WIP: Update for 2.1a3
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jan 5 13:14:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository grads.
commit 3d591c753fb4147c399c0d472badc2e24e138484
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Jan 3 10:15:34 2016 +0000
WIP: Update for 2.1a3
---
debian/changelog | 6 +++++
debian/patches/asneeded.patch | 22 +++++++++---------
debian/patches/format-security.patch | 10 ++++----
debian/patches/hdf4-alt.patch | 16 ++++++-------
debian/patches/hdf5_hl.patch | 8 +++----
debian/patches/libsz_notpresent.patch | 12 +++++-----
debian/patches/paths.patch | 20 ++++++++--------
debian/patches/reproducible-builds.patch | 26 ++++++++++-----------
debian/patches/supplibs.patch | 40 ++++++++++----------------------
debian/patches/timeunits_parse.patch | 8 +++----
debian/patches/udunits2.patch | 26 ++++++++++-----------
11 files changed, 92 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3b4e486..bafed85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grads (2:2.1~a3-1) UNRELEASED; urgency=medium
+
+ * WIP
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 03 Jan 2016 10:14:42 +0000
+
grads (2:2.0.2-7.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/patches/asneeded.patch b/debian/patches/asneeded.patch
index 96df104..8acd36d 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.0.1/aclocal.m4
+Index: grads-2.1~a3/aclocal.m4
===================================================================
---- grads-2.0.1.orig/aclocal.m4 2011-10-24 20:45:27.000000000 +0100
-+++ grads-2.0.1/aclocal.m4 2012-09-19 15:26:28.000000000 +0100
-@@ -626,4 +626,5 @@
+--- grads-2.1~a3.orig/aclocal.m4
++++ grads-2.1~a3/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.0.1/configure.ac
+Index: grads-2.1~a3/configure.ac
===================================================================
---- grads-2.0.1.orig/configure.ac 2012-09-19 15:26:28.000000000 +0100
-+++ grads-2.0.1/configure.ac 2012-09-19 15:26:28.000000000 +0100
-@@ -997,6 +997,8 @@
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -1094,6 +1094,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.0.1/configure.ac
AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT
-Index: grads-2.0.1/m4/as-needed.m4
+Index: grads-2.1~a3/m4/as-needed.m4
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ grads-2.0.1/m4/as-needed.m4 2012-09-19 15:26:28.000000000 +0100
+--- /dev/null
++++ grads-2.1~a3/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 fbe1a03..07d95f4 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.0.1/src/gagx.c
+Index: grads-2.1~a3/src/gagx.c
===================================================================
---- grads-2.0.1.orig/src/gagx.c 2012-09-19 18:27:31.000000000 +0100
-+++ grads-2.0.1/src/gagx.c 2012-09-19 18:27:53.000000000 +0100
-@@ -3591,7 +3591,7 @@
+--- 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
else {
len = strlen(pcm->shpfname);
fnroot = (char *)galloc(len+1,"shpfn");
@@ -16,7 +16,7 @@ Index: grads-2.0.1/src/gagx.c
}
if ((dbfid = DBFCreate(fnroot))==NULL) {
gaprnt(0,"Error in gashpwrt: Unable to create data base file\n");
-@@ -4910,11 +4910,11 @@
+@@ -4962,11 +4962,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 4b5d555..92e969e 100644
--- a/debian/patches/hdf4-alt.patch
+++ b/debian/patches/hdf4-alt.patch
@@ -3,11 +3,11 @@ Origin: http://bugs.debian.orf/655869
Forwarded: not-needed
Last-UpdatedL: 2012-09-19
-Index: grads-2.0.1/configure.ac
+Index: grads-2.1~a3/configure.ac
===================================================================
---- grads-2.0.1.orig/configure.ac 2011-10-24 20:45:27.000000000 +0100
-+++ grads-2.0.1/configure.ac 2012-09-19 18:33:20.000000000 +0100
-@@ -611,11 +611,11 @@
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -695,11 +695,11 @@ else
GA_SET_FLAGS([hdf])
AC_CHECK_LIB([sz], [main],
[ AC_CHECK_HEADER([mfhdf.h],
@@ -22,11 +22,11 @@ Index: grads-2.0.1/configure.ac
])
])
])
-Index: grads-2.0.1/m4/hdf4.m4
+Index: grads-2.1~a3/m4/hdf4.m4
===================================================================
---- grads-2.0.1.orig/m4/hdf4.m4 2008-08-06 13:39:53.000000000 +0100
-+++ grads-2.0.1/m4/hdf4.m4 2012-09-19 18:33:03.000000000 +0100
-@@ -187,11 +187,11 @@
+--- grads-2.1~a3.orig/m4/hdf4.m4
++++ grads-2.1~a3/m4/hdf4.m4
+@@ -187,11 +187,11 @@ dnl nor required everywhere
ac_hdf4_lib='no'
AC_CHECK_LIB_NOCACHE_HDF4([z],[deflate],
[ AC_CHECK_LIB_NOCACHE_HDF4([jpeg],[jpeg_start_compress],
diff --git a/debian/patches/hdf5_hl.patch b/debian/patches/hdf5_hl.patch
index 5c8d1d4..59aba4b 100644
--- a/debian/patches/hdf5_hl.patch
+++ b/debian/patches/hdf5_hl.patch
@@ -4,11 +4,11 @@ Description: When building HDF5 on Debian, hdf5 is needed to link hdf5_hl
Last-Updated: 2010-05-09
Forwarded: no
-Index: grads-2.0.a8/configure.ac
+Index: grads-2.1~a3/configure.ac
===================================================================
---- grads-2.0.a8.orig/configure.ac 2010-05-09 18:33:16.000000000 +0100
-+++ grads-2.0.a8/configure.ac 2010-05-09 18:33:34.000000000 +0100
-@@ -700,7 +700,7 @@
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -813,7 +813,7 @@ else
GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z sz curl])
])
diff --git a/debian/patches/libsz_notpresent.patch b/debian/patches/libsz_notpresent.patch
index 0a98c94..68bad04 100644
--- a/debian/patches/libsz_notpresent.patch
+++ b/debian/patches/libsz_notpresent.patch
@@ -4,11 +4,11 @@ Description: Allow HDF5 to be used even if libsz is not present.
Last-Updated: 2012-09-19
Forwarded: no
-Index: grads-2.0.1/configure.ac
+Index: grads-2.1~a3/configure.ac
===================================================================
---- grads-2.0.1.orig/configure.ac 2012-09-19 18:35:07.000000000 +0100
-+++ grads-2.0.1/configure.ac 2012-09-19 18:35:47.000000000 +0100
-@@ -609,15 +609,13 @@
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -693,15 +693,13 @@ else
fi
if test "$have_zlib" = "yes" -a "$have_udunits" = "yes" -a "$have_jpeg" = "yes" ; then
GA_SET_FLAGS([hdf])
@@ -26,7 +26,7 @@ Index: grads-2.0.1/configure.ac
])
])
GA_UNSET_FLAGS
-@@ -671,14 +669,12 @@
+@@ -755,14 +753,12 @@ else
fi
if test "$have_zlib" = "yes" -a "$have_jpeg" = "yes" ; then
GA_SET_FLAGS([hdf5])
@@ -43,7 +43,7 @@ Index: grads-2.0.1/configure.ac
])
GA_UNSET_FLAGS
fi
-@@ -727,7 +723,7 @@
+@@ -811,7 +807,7 @@ else
[ AC_CHECK_LIB(curl,main,
[ use_nc4="yes"
GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index d78bd01..3a078e5 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -3,24 +3,24 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2010-05-09
Forwarded: no
-Index: grads/src/gxsubs.c
+Index: grads-2.1~a3/src/gxsubs.c
===================================================================
---- grads.orig/src/gxsubs.c 2009-10-01 20:43:50.000000000 +0100
-+++ grads/src/gxsubs.c 2009-10-01 20:44:01.000000000 +0100
-@@ -33,7 +33,7 @@
+--- grads-2.1~a3.orig/src/gxsubs.c
++++ grads-2.1~a3/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. */
-static char *datad = "/usr/local/lib/grads";
+static char *datad = "/usr/share/grads";
- static gadouble xsize, ysize; /* Virtual size */
- static gadouble rxsize, rysize; /* Real size */
+ static gadouble xsize, ysize; /* Virtual page size */
+ static gadouble rxsize, rysize; /* Real page size */
static gaint lwflg; /* Reduce lw due vpage*/
-Index: grads-2.0.a8/src/Makefile.in
+Index: grads-2.1~a3/src/Makefile.in
===================================================================
---- grads-2.0.a8.orig/src/Makefile.in 2010-05-09 13:25:21.000000000 +0100
-+++ grads-2.0.a8/src/Makefile.in 2010-05-09 13:25:36.000000000 +0100
-@@ -298,8 +298,8 @@
+--- grads-2.1~a3.orig/src/Makefile.in
++++ grads-2.1~a3/src/Makefile.in
+@@ -301,8 +301,8 @@ target_alias = @target_alias@
#
# Paths to external headers and libraries
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index 01e0e35..a7fd69d 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -3,11 +3,11 @@ Description: Remove build_date so that build is bit-reproducible.
Last-Updated: 2015-07-06
Forwarded: no
-Index: grads-2.0.2/configure
+Index: grads-2.1~a3/configure
===================================================================
---- grads-2.0.2.orig/configure
-+++ grads-2.0.2/configure
-@@ -21779,13 +21779,11 @@ fi
+--- grads-2.1~a3.orig/configure
++++ grads-2.1~a3/configure
+@@ -23306,13 +23306,11 @@ fi
@@ -17,12 +17,12 @@ Index: grads-2.0.2/configure
echo \
" +=========================================================================+"
-- echo " GrADS "2.0.2 ":" $build_info
-+ echo " GrADS "2.0.2 ":" $build_host
+- echo " GrADS "2.1.a3 ":" $build_info
++ echo " GrADS 2.1.a3 "
echo \
" +=========================================================================+"
echo
-@@ -21873,7 +21871,7 @@ echo 2.0.2 > src/VERSION
+@@ -23413,7 +23411,7 @@ echo 2.1.a3 > src/VERSION
echo "configure: creating src/buildinfo.h"
mkdir -p src
@@ -31,11 +31,11 @@ Index: grads-2.0.2/configure
ac_config_files="$ac_config_files Makefile src/Makefile"
-Index: grads-2.0.2/configure.ac
+Index: grads-2.1~a3/configure.ac
===================================================================
---- grads-2.0.2.orig/configure.ac
-+++ grads-2.0.2/configure.ac
-@@ -897,13 +897,11 @@ dnl ------------------------------------
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -981,13 +981,11 @@ dnl ------------------------------------
dnl Print summary and write output files
dnl ----------------------------------------------------
@@ -46,11 +46,11 @@ Index: grads-2.0.2/configure.ac
echo \
" +=========================================================================+"
- echo " GrADS "AC_PACKAGE_VERSION ":" $build_info
-+ echo " GrADS "AC_PACKAGE_VERSION ":" $build_host
++ echo " GrADS "AC_PACKAGE_VERSION
echo \
" +=========================================================================+"
echo
-@@ -991,7 +989,7 @@ echo AC_PACKAGE_VERSION > src/VERSION
+@@ -1088,7 +1086,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 b845a7c..4bff3e0 100644
--- a/debian/patches/supplibs.patch
+++ b/debian/patches/supplibs.patch
@@ -4,39 +4,23 @@ Description: remove wrong "supplibs" dir handling
paths.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/749178
-Index: grads-2.0.a9/src/Makefile.am
+Index: grads-2.1~a3/src/Makefile.am
===================================================================
---- grads-2.0.a9.orig/src/Makefile.am 2010-07-16 17:20:08.000000000 +0100
-+++ grads-2.0.a9/src/Makefile.am 2011-04-12 13:24:18.000000000 +0100
-@@ -24,18 +24,18 @@
- # Compiler and linker settings
+--- grads-2.1~a3.orig/src/Makefile.am
++++ grads-2.1~a3/src/Makefile.am
+@@ -26,6 +26,7 @@ utils: bufrscan gribscan gribmap stnmap
#
--# Paths to external headers and libraries
--supp_include_dir = $(SUPPLIBS)/include
--supp_lib_dir = $(SUPPLIBS)/lib
-+# Default SUPPLIBS
-+SUPPLIBS=/usr
-+
-+supp_include_dir = $(SUPPLIBS)/include
+ # Paths to external headers and libraries
++SUPPLIBS = /usr
+ supp_include_dir = $(SUPPLIBS)/include
+ supp_lib_dir = $(SUPPLIBS)/lib
- # Settings used for all binaries
--LDADD = -L$(supp_lib_dir)
- INCLUDES = $(readline_inc) $(printim_inc) $(grib2_inc) $(gui_inc) $(nc_inc) \
- $(hdf_inc) $(hdf5_inc) $(geotiff_inc) $(shp_inc) $(gadap_inc) \
- $(X_CFLAGS) $(XAW_CFLAGS) $(GD_CFLAGS) $(HDF4_CFLAGS)
-
- # Settings used for all GrADS binaries
--common_ldadd = $(LDADD) $(X_LIBS) $(host_ldadd) -lX11
-+common_ldadd = $(X_LIBS) $(host_ldadd) -lX11
-
- ######################################################################
- #
-Index: grads-2.0.a9/acinclude.m4
+Index: grads-2.1~a3/acinclude.m4
===================================================================
---- grads-2.0.a9.orig/acinclude.m4 2008-08-07 16:07:41.000000000 +0100
-+++ grads-2.0.a9/acinclude.m4 2011-04-12 12:22:04.000000000 +0100
-@@ -74,14 +74,12 @@
+--- grads-2.1~a3.orig/acinclude.m4
++++ grads-2.1~a3/acinclude.m4
+@@ -92,14 +92,12 @@ AC_DEFUN([GA_SET_CAIRO_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 641d0a2..59c93ab 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.0.a9/src/gasdf.c
+Index: grads-2.1~a3/src/gasdf.c
===================================================================
---- grads-2.0.a9.orig/src/gasdf.c 2011-04-12 14:29:57.000000000 +0100
-+++ grads-2.0.a9/src/gasdf.c 2011-04-12 14:30:17.000000000 +0100
-@@ -816,7 +816,7 @@
+--- grads-2.1~a3.orig/src/gasdf.c
++++ grads-2.1~a3/src/gasdf.c
+@@ -837,7 +837,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 c1ccb36..919766c 100644
--- a/debian/patches/udunits2.patch
+++ b/debian/patches/udunits2.patch
@@ -3,11 +3,11 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2012-09-16
Forwarded: no
-Index: grads-2.0.1/configure.ac
+Index: grads-2.1~a3/configure.ac
===================================================================
---- grads-2.0.1.orig/configure.ac 2012-09-19 18:33:20.000000000 +0100
-+++ grads-2.0.1/configure.ac 2012-09-19 18:34:37.000000000 +0100
-@@ -594,7 +594,7 @@
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -678,7 +678,7 @@ else
# look for udunits
GA_SET_FLAGS([udunits])
AC_CHECK_HEADERS([udunits.h],
@@ -16,7 +16,7 @@ Index: grads-2.0.1/configure.ac
[ have_udunits=yes
])
])
-@@ -614,8 +614,8 @@
+@@ -698,8 +698,8 @@ else
[ AC_CHECK_LIB([dfalt], [main],
[ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
[ use_hdf=yes
@@ -27,7 +27,7 @@ Index: grads-2.0.1/configure.ac
])
])
])
-@@ -712,7 +712,7 @@
+@@ -796,7 +796,7 @@ else
if test "$have_udunits" = "no" ; then
GA_SET_FLAGS([udunits])
AC_CHECK_HEADERS([udunits.h],
@@ -36,7 +36,7 @@ Index: grads-2.0.1/configure.ac
[ have_udunits=yes
])
])
-@@ -727,7 +727,7 @@
+@@ -811,7 +811,7 @@ else
[ AC_CHECK_LIB(curl,main,
[ use_nc4="yes"
GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
@@ -45,7 +45,7 @@ Index: grads-2.0.1/configure.ac
])
])
])
-@@ -779,7 +779,7 @@
+@@ -863,7 +863,7 @@ else
if test "$have_udunits" = "no" ; then
GA_SET_FLAGS([udunits])
AC_CHECK_HEADERS([udunits.h],
@@ -54,7 +54,7 @@ Index: grads-2.0.1/configure.ac
[ have_udunits=yes
])
])
-@@ -791,7 +791,7 @@
+@@ -875,7 +875,7 @@ else
[ AC_CHECK_LIB([netcdf], [main],
[ use_nc="yes"
GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
@@ -63,11 +63,11 @@ Index: grads-2.0.1/configure.ac
])
])
GA_UNSET_FLAGS
-Index: grads-2.0.1/m4/udunits.m4
+Index: grads-2.1~a3/m4/udunits.m4
===================================================================
---- grads-2.0.1.orig/m4/udunits.m4 2008-08-06 13:39:53.000000000 +0100
-+++ grads-2.0.1/m4/udunits.m4 2012-09-19 18:34:05.000000000 +0100
-@@ -5,9 +5,9 @@
+--- grads-2.1~a3.orig/m4/udunits.m4
++++ grads-2.1~a3/m4/udunits.m4
+@@ -5,9 +5,9 @@ AC_DEFUN([GA_CHECK_UDUNITS],
[
ga_use_udunits='no'
AC_CHECK_HEADER([udunits.h],
--
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