Commit 197fedff authored by Alastair McKinstry's avatar Alastair McKinstry

Add 2.0.2.-3 to debian/master

parent d7732c72
This package includes patches that are managed under 'quilt', so 'dpkg-source -x' is not sufficient to get a complete
build. To get the actual source, do:
$ dpkg-source -x
$ ./debian/rules patch
Patches:
(1) udunits2.patch
Under Debian, the udunits library is libudunits2.a, not libudunits.a. This patch fixes this.
(2) libsx.patch
Add the correct path for this library (/usr/lib).
(3) as-needed.patch
Ass the --as-needed flag to limit linking if possible.
Regards
Alastair McKinstry, 2009-09-13
grads (2:2.0.2-3) unstable; urgency=low
[ Gilles Filippini ]
* Support hdf5 1.8.13 new packaging layout. Closes: #756666.
-- Alastair McKinstry <mckinstry@debian.org> Fri, 01 Aug 2014 16:36:33 +0100
grads (2:2.0.2-2) unstable; urgency=medium
* Remove hard-coded references to 2.0.1 files.
-- Alastair McKinstry <mckinstry@debian.org> Tue, 17 Jun 2014 09:43:48 +0100
grads (2:2.0.2-1) unstable; urgency=medium
* New upstream release.
-- Alastair McKinstry <mckinstry@debian.org> Tue, 17 Jun 2014 07:39:22 +0100
grads (2:2.0.1-2) unstable; urgency=medium
* Move to debhelper 9
* Now at Standards-Version: 3.9.5
* Change to Priority: extra because we depend on hdf4-alt, etc.
-- Alastair McKinstry <mckinstry@debian.org> Wed, 26 Feb 2014 09:30:59 +0000
grads (2:2.0.1-1) unstable; urgency=low
* New upstream build.
* Build against libhdf4-alt-dev. Closes: #655869.
* Now use gadap for in-situ data.
* Now at Standards-Version: 3.9.3
* New epoch needed as 2.0.1 < 2.0.a9.
-- Alastair McKinstry <mckinstry@debian.org> Wed, 19 Sep 2012 15:25:13 +0100
grads (2.0.a9-4) unstable; urgency=low
* B-D on dh-autoreconf; use dh -- with autoreconf
-- Alastair McKinstry <mckinstry@debian.org> Sun, 23 Oct 2011 21:53:28 +0100
grads (2.0.a9-3) unstable; urgency=low
* B-D on netcdf-bin for nc-config, or ./configure may behave differently.
* Enable --enable-dyn-supplibs for dynamic linking.
* Enable --with-hdf4-include to find HDF4 ; patch needed to compile.
* Patch for format-security error. Closes: #646268.
* Autogenerated gunk breaks building from source. Fix. Closes: #643144.
* Remove debian-changes-* patches;
-- Alastair McKinstry <mckinstry@debian.org> Sun, 23 Oct 2011 17:54:31 +0100
grads (2.0.a9-2) unstable; urgency=low
* Build with libhdf5-dev | libhdf5-serial-dev. Closes: #634524.
* Build MPI version if DEB_BUILD_OPTIONS=mpi
* Add --with-dap as libdap is now in Debian.
-- Alastair McKinstry <mckinstry@debian.org> Sat, 10 Sep 2011 11:53:29 +0100
grads (2.0.a9-1) unstable; urgency=low
* New upstream release.
* Now at Standards-Version: 3.9.2.
* Fix by Steve Langasek to avoid hard-coded /usr/lib paths;
for multilib. Closes: #622320.
* Include libshp-dev for shapefile support in new version.
* Include patch from Nicolai Strange fixing netcdf time units parse bug.
Closes: #587496.
-- Alastair McKinstry <mckinstry@debian.org> Tue, 12 Apr 2011 14:31:38 +0100
grads (2.0.a8-2) unstable; urgency=low
* Add libgd2-xpm-dev to Build-Depends to build the grib2scan and gxtran
binaries (Closes: #608584). Thanks to Salvatore Bonaccorso.
* Move to Standards-Version: 3.9.1. No changes required.
-- Alastair McKinstry <mckinstry@debian.org> Sun, 02 Jan 2011 02:16:47 +0000
grads (2.0.a8-1) unstable; urgency=low
* New upstream release.
* Add SUPPLIBS to environment to add netcdf, geotiff properly.
* Enabled HDF5, netCDF-4, geotiff properly; disabled netCDF-4
Closes: #571048.
-- Alastair McKinstry <mckinstry@debian.org> Sun, 09 May 2010 14:11:05 +0100
grads (2.0.a7.1-4) unstable; urgency=low
* Move to Source format 3.0. Remove dep. on quilt.
* Standards-Version: 3.8.4. No changes required.
* Add DEP-3 tags to patches.
-- Alastair McKinstry <mckinstry@debian.org> Fri, 26 Feb 2010 16:47:44 +0000
grads (2.0.a7.1-3) unstable; urgency=low
* Add Build-Depends: linxmu-headers. Closes: #551446.
* Change section to Science.
-- Alastair McKinstry <mckinstry@debian.org> Mon, 19 Oct 2009 17:40:59 +0100
grads (2.0.a7.1-2) unstable; urgency=low
* Add Build-Depends: libx11-dev. Closes: #550307.
-- Alastair McKinstry <mckinstry@debian.org> Tue, 13 Oct 2009 15:48:08 +0100
grads (2.0.a7.1-1) unstable; urgency=low
* Initial release. (Closes: #540545)
-- Alastair McKinstry <mckinstry@debian.org> Sun, 04 Oct 2009 12:38:20 +0100
Source: grads
Section: science
Priority: extra
Maintainer: Alastair McKinstry <mckinstry@debian.org>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), pkg-config, libreadline-dev, libgeotiff-dev, libgrib2c-dev, libnetcdf-dev, libjasper-dev, zlib1g-dev, libudunits2-dev, libhdf5-serial-dev | libhdf5-dev, libdap-dev, libsx-dev, automake, autoconf, libx11-dev, libxmu-headers, libgd2-xpm-dev, libshp-dev, libdap-dev, netcdf-bin, libhdf4-alt-dev, dh-autoreconf, libgadap-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.5
Homepage: http://www.iges.org/grads/
Package: grads
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Grid Analysis and Display System for earth science data
The Grid Analysis and Display System (GrADS) is an interactive desktop tool
that is used for easy access, manipulation, and visualization of earth
science data. The format of the data may be either binary, GRIB, NetCDF, or
HDF-SDS (Scientific Data Sets). GrADS has been implemented worldwide on
a variety of commonly used operating systems and is freely distributed
over the Internet.
.
GrADS uses a 4-Dimensional data environment: longitude, latitude,
vertical level, and time. Data sets are placed within the 4-D space
by use of a data descriptor file. GrADS interprets station data as well as
gridded data, and the grids may be regular, non-linearly spaced, gaussian, or
of variable resolution. Data from different data sets may be graphically
overlaid, with correct spatial and time registration. Operations are executed
interactively by entering FORTRAN-like expressions at the command line.
A rich set of built-in functions are provided, but users may also add their
own functions as external routines written in any programming language.
.
Data may be displayed using a variety of graphical techniques: line and
bar graphs, scatter plots, smoothed contours, shaded contours, streamlines,
wind vectors, grid boxes, shaded grid boxes, and station model plots.
Graphics may be output in PostScript or image formats. GrADS provides
geophysically intuitive defaults, but the user has the option to control
all aspects of graphics output.
.
GrADS has a programmable interface (scripting language) that allows for
sophisticated analysis and display applications. Use scripts to display
buttons and dropmenus as well as graphics, and then take action based on user
point-and-clicks. GrADS can be run in batch mode, and the scripting language
facilitates using GrADS to do long overnight batch jobs.
GrADS was packaged for Debian by Alastair McKinstry <mckinstry@debian.org> on 2009-08-09.
It was downloaded from: http://www.iges.org/grads/
The Grid Analysis and Display System (GrADS) Version 1.9
Copyright (C) 1988-2005 by Brian Doty and the Institute
of Global Environment and Society (IGES).
The Center for Ocean-Land-Atmosphere Studies (COLA) is the center
within IGES where GrADS is developed and maintained.
The copyright holders cann be contacted at:
COLA/IGES
4041 Powder Mill Rd. Suite 302
Calverton, MD 20705
Phone: 301 595 7000
GrADS is licensed under the GNU General Public License, version 2.
A copy of this license can be found at /usr/share/common-licenses/GPL-2.
/usr/share/grads
/usr/share/grads/tables
doc/sample.ncdump
doc/sample_sfc.ctl
doc/sample_tau.ctl
doc/sample_temp.ctl
doc/sample_uv.ctl
doc/sample_w.ctl
doc/wrfgrid.ctl
doc/wrf.ncdump
doc/wrfvars.ctl
doc/xdfsample1.txt
doc/xdfsample2.txt
doc/model.dat
doc/model.ctl
doc/sample
data/font0.dat /usr/share/grads
data/font1.dat /usr/share/grads
data/font2.dat /usr/share/grads
data/font3.dat /usr/share/grads
data/font4.dat /usr/share/grads
data/font5.dat /usr/share/grads
data/hires /usr/share/grads
data/lowres /usr/share/grads
data/mres /usr/share/grads
data/tables/* /usr/share/grads/tables
doc/*.html /usr/share/doc/grads/html
doc/*.css /usr/share/doc/grads/html
doc/images/* /usr/share/doc/grads/html/images
Descripion: Use --as-needed to remove unnecesary linking.
Author: Alastair McKinstry <mckinstry@debian.org>
Forwared: no
Index: grads-2.0.1/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 @@
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
===================================================================
--- 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 @@
mkdir -p src
echo "static char *buildinfo = \"${build_info}\";" > src/buildinfo.h
+LINK_AS_NEEDED
+
AC_CONFIG_FILES([Makefile src/Makefile])
AC_OUTPUT
Index: grads-2.0.1/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
@@ -0,0 +1,67 @@
+dnl ./configure support for linking with option --as-needed
+dnl Copyright (C) 2008 Werner Pantke <wpantke@punk-ass-bitch.org>
+dnl
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
+dnl
+
+
+# --------------------------------------------------------------------------
+# Check whether the C++ compiler accepts a certain flag,
+# if it does, the flag is added to LDFLAGS.
+# Usage:
+# LF_CHECK_LD_FLAG([-flag1 -flag2 -flag3 ...])
+# -------------------------------------------------------------------------
+
+AC_DEFUN([LF_CHECK_LD_FLAG],[
+ echo 'int main(int argc, char **argv){return 0;}' > conftest.temp.cc
+ for i in $1
+ do
+ AC_MSG_CHECKING([whether $CXX accepts $i])
+ if test -z "`${CXX} -c conftest.temp.cc 2>&1`" \
+ && test -z "`${CXX} $i -o conftest.temp conftest.temp.o 2>&1`"
+ then
+ LDFLAGS="${LDFLAGS} $i"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+ rm -f conftest.temp.cc conftest.temp.o conftest.temp
+])
+
+
+# ----------------------------------------------------------------------
+# Provide the configure script with an --enable/disable-link-as-needed option
+# that turns the --as-needed linking flag on/off. Default is: enabled.
+# Call this command AFTER you have configured ALL your compilers.
+# ----------------------------------------------------------------------
+
+AC_DEFUN([LINK_AS_NEEDED],[
+ dnl Check for --with-link-as-needed
+ AC_MSG_CHECKING([whether user wants to link with --as-needed])
+ AC_ARG_ENABLE(link-as-needed,
+ [AC_HELP_STRING([--disable-link-as-needed],
+ [Turn off linker flag --as-needed]) ],
+ [link_as_needed=$enableval], [link_as_needed=yes])
+ AC_MSG_RESULT($link_as_needed)
+
+ if test $link_as_needed = yes
+ then
+ if test -n "${CXX}"
+ then
+ LF_CHECK_LD_FLAG([-Wl,--as-needed])
+ fi
+ fi
+])
+
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Fix format-security error.
Last-Updated: 2011-10-23
Forwarded: no
Index: grads-2.0.1/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 @@
else {
len = strlen(pcm->shpfname);
fnroot = (char *)galloc(len+1,"shpfn");
- snprintf(fnroot,len+1,pcm->shpfname);
+ snprintf(fnroot,len+1,"%s",pcm->shpfname);
}
if ((dbfid = DBFCreate(fnroot))==NULL) {
gaprnt(0,"Error in gashpwrt: Unable to create data base file\n");
@@ -4910,11 +4910,11 @@
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);
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);
gaprnt (2,pout);
}
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Fixes build failure on building netcdf-4 but not hdf-4
Last-Updated: 2010-05-09
Forwareded: no
Index: grads-2.0.a8/src/gasdf.c
===================================================================
--- grads-2.0.a8.orig/src/gasdf.c 2010-05-09 18:30:55.000000000 +0100
+++ grads-2.0.a8/src/gasdf.c 2010-05-09 18:31:44.000000000 +0100
@@ -2172,6 +2172,9 @@
char sdsname[H4_MAX_NC_NAME+1];
char name[H4_MAX_NC_NAME+1],dimname[H4_MAX_NC_NAME+1];
#endif
+#if (USENETCDF==1) && !(USEHDF ==1)
+char name[MAX_NC_NAME+1];
+#endif
if ((pfi->name == NULL) || (strlen (pfi->name) == 0)) return Failure;
Description: Build against HDF4ALT on Debian.
Origin: http://bugs.debian.orf/655869
Forwarded: not-needed
Last-UpdatedL: 2012-09-19
Index: grads-2.0.1/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 @@
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])
])
])
])
Index: grads-2.0.1/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 @@
ac_hdf4_lib='no'
AC_CHECK_LIB_NOCACHE_HDF4([z],[deflate],
[ AC_CHECK_LIB_NOCACHE_HDF4([jpeg],[jpeg_start_compress],
- [ AC_CHECK_LIB_NOCACHE_HDF4([df],[Hopen],
- [ AC_CHECK_LIB_NOCACHE_HDF4([mfhdf],[SDstart],
+ [ AC_CHECK_LIB_NOCACHE_HDF4([dfalt],[Hopen],
+ [ AC_CHECK_LIB_NOCACHE_HDF4([mfhdfalt],[SDstart],
[ ac_hdf4_lib="yes"
- HDF4_LIBS="-lmfhdf -ldf -ljpeg -lz $HDF4_LIBS"
- ],[],[-ldf -ljpeg -lz])
+ HDF4_LIBS="-lmfhdfalt -ldfalt -ljpeg -lz $HDF4_LIBS"
+ ],[],[-ldfalt -ljpeg -lz])
],[],[-ljpeg -lz])
])
])
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Enable HDF4 and NETCDF4 simultaneously.
This is a nasty hack to avoid <hdf/netcdf.h> being read.
Last-Updated: 2011-10-23
Forwarded: no
Index: grads-2.0.a9/src/gaio.c
===================================================================
--- grads-2.0.a9.orig/src/gaio.c 2010-09-02 15:00:51.000000000 +0100
+++ grads-2.0.a9/src/gaio.c 2011-10-23 19:34:29.000000000 +0100
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
#if USENETCDF == 1
-#include "netcdf.h"
+#include "/usr/include/netcdf.h"
#endif
#if USEHDF ==1
#include "mfhdf.h"
Index: grads-2.0.a9/src/gauser.c
===================================================================
--- grads-2.0.a9.orig/src/gauser.c 2010-09-02 15:00:51.000000000 +0100
+++ grads-2.0.a9/src/gauser.c 2011-10-23 19:34:14.000000000 +0100
@@ -19,7 +19,7 @@
#endif
#if USENETCDF == 1
-#include "netcdf.h"
+#include "/usr/include/netcdf.h"
#endif
#if USEHDF == 1
Author: Alastair McKinstry <mckinstry@debian.org>
Description: When building HDF5 on Debian, hdf5 is needed to link hdf5_hl
(A better fix may be to explicitly have hdf5 as an ELF dependency in hdf5_hl)
Last-Updated: 2010-05-09
Forwarded: no
Index: grads-2.0.a8/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 @@
GA_SET_INCLUDE_VAR(nc_inc, [udunits netcdf])
GA_SET_LIB_VAR(nc_libs, [udunits2 netcdf hdf5_hl hdf5 z sz curl])
])
- ])
+ ],[],[-lhdf5])
])
])
GA_UNSET_FLAGS
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Allow HDF5 to be used even if libsz is not present.
(libsz cannot be shipped with Debian)
Last-Updated: 2012-09-19
Forwarded: no
Index: grads-2.0.1/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 @@
fi
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_HEADER([mfhdf.h],
[ AC_CHECK_LIB([dfalt], [main],
[ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
[ use_hdf=yes
GA_SET_INCLUDE_VAR([hdf_inc], [hdf udunits2])
- GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits2 sz jpeg z])
+ GA_SET_LIB_VAR([hdf_libs], [mfhdfalt dfalt udunits2 jpeg z])
])
- ])
])
])
GA_UNSET_FLAGS
@@ -671,14 +669,12 @@
fi
if test "$have_zlib" = "yes" -a "$have_jpeg" = "yes" ; then
GA_SET_FLAGS([hdf5])
- AC_CHECK_LIB([sz], [main],
- [ AC_CHECK_HEADER([hdf5.h],
+ AC_CHECK_HEADER([hdf5.h],
[ AC_CHECK_LIB([hdf5], [main],
[ use_hdf5=yes
GA_SET_INCLUDE_VAR([hdf5_inc], [hdf5])
- GA_SET_LIB_VAR([hdf5_libs], [hdf5 sz z])
+ GA_SET_LIB_VAR([hdf5_libs], [hdf5 z])
])
- ])
])
GA_UNSET_FLAGS
fi
@@ -727,7 +723,7 @@
[ AC_CHECK_LIB(curl,main,
[ use_nc4="yes"
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])
])
Description: Use FHS paths for data directory.
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2010-05-09
Forwarded: no
Index: grads/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 @@
/* 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 gaint lwflg; /* Reduce lw due vpage*/
Index: grads-2.0.a8/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 @@
#
# Paths to external headers and libraries
-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)
# hdf4-netcdf.patch
hdf4-alt.patch
supplibs.patch
paths.patch
udunits2.patch
hdf5_hl.patch
asneeded.patch
libsz_notpresent.patch
timeunits_parse.patch
format-security.patch
Author: Steve Langasek <steve.langasek@linaro.org>
Description: remove wrong "supplibs" dir handling
pass libraries as -l arguments, instead of guessing and passing absolute
paths.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/749178
Index: grads-2.0.a9/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
#
-# 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
# 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
===================================================================
--- 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 @@
])
dnl GA_SET_LIB_VAR : Puts necessary linker options to link with libraries given into
-dnl a shell variable. They will have the form 'supplib_dir/libname.a'.
+dnl a shell variable.
dnl args: : shell-variable-name, list-of-libraries (e.g. [readline termcap])
AC_DEFUN([GA_SET_LIB_VAR],
[
- ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
for ga_lib_name in $2 ; do
- $1="$$1 ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+ $1="$$1 -l${ga_lib_name}"
done
])
Description: Fix bug reading time units in netcdf files.
Author: Nicolai Stange <nicolai.stange@zmaw.de>
Last-Updated: 2011-01-07
Bug-Debian: #587496.
Forwarded: no
Index: grads-2.0.a9/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 @@
if (!temp_str) {
trunc_point = strlen(time_units) ;
} else {
- trunc_point = strlen(time_units)-strlen(temp_str)+1;
+ trunc_point = strlen(time_units)-strlen(temp_str);
}
sz = trunc_point+1;
trunc_units = (char *) galloc(sz,"trunc_units");
Description: On Debian, library is called udunits2 not udunits.
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2012-09-16
Forwarded: no
Index: grads-2.0.1/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 @@
# 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
])
])
@@ -614,8 +614,8 @@
[ 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])
])
])
])
@@ -712,7 +712,7 @@
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
])
])
@@ -727,7 +727,7 @@
[ 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])
])
])
])
@@ -779,7 +779,7 @@
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
])
])
@@ -791,7 +791,7 @@
[ 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-2.0.1/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 @@
[
ga_use_udunits='no'
AC_CHECK_HEADER([udunits.h],
- [ AC_CHECK_LIB([udunits],[utInit],
+ [ AC_CHECK_LIB([udunits2],[utInit],
[ ga_use_udunits='yes'
- UDUNITS_LIBS='-ludunits'
+ UDUNITS_LIBS='-ludunits2'
])
])
#!/usr/bin/make -f
# The magic debhelper rule:
%:
dh $@ # --with autoreconf
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
# Build MPI version
ifneq (,$(findstring mpi,$(DEB_BUILD_OPTIONS)))
COND_CC:= "CC=mpicc"
else
COND_CC:=
endif
export SUPPLIBS=/usr
ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)