[DebianGIS-dev] r2826 - in packages/netcdf/branches/4.1/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Wed Apr 14 13:54:59 UTC 2010
Author: frankie
Date: 2010-04-14 13:54:57 +0000 (Wed, 14 Apr 2010)
New Revision: 2826
Modified:
packages/netcdf/branches/4.1/debian/changelog
packages/netcdf/branches/4.1/debian/control
packages/netcdf/branches/4.1/debian/patches/la_libadd_fix
packages/netcdf/branches/4.1/debian/rules
Log:
Modified: packages/netcdf/branches/4.1/debian/changelog
===================================================================
--- packages/netcdf/branches/4.1/debian/changelog 2010-04-12 20:22:08 UTC (rev 2825)
+++ packages/netcdf/branches/4.1/debian/changelog 2010-04-14 13:54:57 UTC (rev 2826)
@@ -3,8 +3,10 @@
* Added la_libadd_fix patch to re-add la_libadd entry for HDF5 libraries into
libsrc4/Makefile.am. Patch is the results of autotools after that.
* Removed previous trick.
+ * Added texlive-base and texlive-latex-base as build-dep, which are required
+ for a workig texi2dvi.
- -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 12 Apr 2010 15:35:44 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org> Wed, 14 Apr 2010 15:54:02 +0200
netcdf (1:4.1.1-2) experimental; urgency=low
Modified: packages/netcdf/branches/4.1/debian/control
===================================================================
--- packages/netcdf/branches/4.1/debian/control 2010-04-12 20:22:08 UTC (rev 2825)
+++ packages/netcdf/branches/4.1/debian/control 2010-04-14 13:54:57 UTC (rev 2826)
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, gfortran, texinfo, quilt, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev
+Build-Depends: debhelper (>= 7), cdbs, gfortran, texinfo, quilt, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev,
+ texlive-base, texlive-latex-base
Standards-Version: 3.8.4
Homepage: http://www.unidata.ucar.edu/software/netcdf/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/netcdf/
Modified: packages/netcdf/branches/4.1/debian/patches/la_libadd_fix
===================================================================
--- packages/netcdf/branches/4.1/debian/patches/la_libadd_fix 2010-04-12 20:22:08 UTC (rev 2825)
+++ packages/netcdf/branches/4.1/debian/patches/la_libadd_fix 2010-04-14 13:54:57 UTC (rev 2826)
@@ -1,6 +1,6 @@
diff -urN netcdf-4.1.1.orig/aclocal.m4 netcdf-4.1.1/aclocal.m4
--- netcdf-4.1.1.orig/aclocal.m4 2010-04-08 15:39:38.000000000 +0200
-+++ netcdf-4.1.1/aclocal.m4 2010-04-12 14:24:42.000000000 +0200
++++ netcdf-4.1.1/aclocal.m4 2010-04-14 14:53:34.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -6673,7 +6673,7 @@
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN netcdf-4.1.1.orig/compile netcdf-4.1.1/compile
--- netcdf-4.1.1.orig/compile 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/compile 2010-04-12 14:24:47.000000000 +0200
++++ netcdf-4.1.1/compile 2010-04-14 14:53:39.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
@@ -6697,7 +6697,7 @@
rmdir "$lockdir"
diff -urN netcdf-4.1.1.orig/configure netcdf-4.1.1/configure
--- netcdf-4.1.1.orig/configure 2010-04-08 15:39:40.000000000 +0200
-+++ netcdf-4.1.1/configure 2010-04-12 14:24:44.000000000 +0200
++++ netcdf-4.1.1/configure 2010-04-14 14:53:37.000000000 +0200
@@ -826,6 +826,7 @@
lt_ECHO
RANLIB
@@ -8090,7 +8090,7 @@
diff -urN netcdf-4.1.1.orig/cxx/Makefile.in netcdf-4.1.1/cxx/Makefile.in
--- netcdf-4.1.1.orig/cxx/Makefile.in 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/cxx/Makefile.in 2010-04-12 14:24:47.000000000 +0200
++++ netcdf-4.1.1/cxx/Makefile.in 2010-04-14 14:53:39.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8107,7 +8107,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/cxx4/Makefile.in netcdf-4.1.1/cxx4/Makefile.in
--- netcdf-4.1.1.orig/cxx4/Makefile.in 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/cxx4/Makefile.in 2010-04-12 14:24:47.000000000 +0200
++++ netcdf-4.1.1/cxx4/Makefile.in 2010-04-14 14:53:39.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8124,7 +8124,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/C/Makefile.in netcdf-4.1.1/examples/C/Makefile.in
--- netcdf-4.1.1.orig/examples/C/Makefile.in 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/examples/C/Makefile.in 2010-04-12 14:24:47.000000000 +0200
++++ netcdf-4.1.1/examples/C/Makefile.in 2010-04-14 14:53:39.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8141,7 +8141,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/CDL/Makefile.in netcdf-4.1.1/examples/CDL/Makefile.in
--- netcdf-4.1.1.orig/examples/CDL/Makefile.in 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/examples/CDL/Makefile.in 2010-04-12 14:24:47.000000000 +0200
++++ netcdf-4.1.1/examples/CDL/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8158,7 +8158,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/CXX/Makefile.in netcdf-4.1.1/examples/CXX/Makefile.in
--- netcdf-4.1.1.orig/examples/CXX/Makefile.in 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/examples/CXX/Makefile.in 2010-04-12 14:24:47.000000000 +0200
++++ netcdf-4.1.1/examples/CXX/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8175,7 +8175,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/CXX4/Makefile.in netcdf-4.1.1/examples/CXX4/Makefile.in
--- netcdf-4.1.1.orig/examples/CXX4/Makefile.in 2010-04-08 15:39:41.000000000 +0200
-+++ netcdf-4.1.1/examples/CXX4/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/examples/CXX4/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8192,7 +8192,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/F77/Makefile.in netcdf-4.1.1/examples/F77/Makefile.in
--- netcdf-4.1.1.orig/examples/F77/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/examples/F77/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/examples/F77/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8209,7 +8209,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/F90/Makefile.in netcdf-4.1.1/examples/F90/Makefile.in
--- netcdf-4.1.1.orig/examples/F90/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/examples/F90/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/examples/F90/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8226,7 +8226,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/examples/Makefile.in netcdf-4.1.1/examples/Makefile.in
--- netcdf-4.1.1.orig/examples/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/examples/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/examples/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8261,7 +8261,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/f90/Makefile.in netcdf-4.1.1/f90/Makefile.in
--- netcdf-4.1.1.orig/f90/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/f90/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/f90/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8278,7 +8278,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/fortran/Makefile.in netcdf-4.1.1/fortran/Makefile.in
--- netcdf-4.1.1.orig/fortran/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/fortran/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/fortran/Makefile.in 2010-04-14 14:53:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -8295,7 +8295,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/libcf/aclocal.m4 netcdf-4.1.1/libcf/aclocal.m4
--- netcdf-4.1.1.orig/libcf/aclocal.m4 2010-04-08 15:39:31.000000000 +0200
-+++ netcdf-4.1.1/libcf/aclocal.m4 2010-04-12 14:24:32.000000000 +0200
++++ netcdf-4.1.1/libcf/aclocal.m4 2010-04-14 14:53:24.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -14968,7 +14968,7 @@
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN netcdf-4.1.1.orig/libcf/cfcheck/Makefile.in netcdf-4.1.1/libcf/cfcheck/Makefile.in
--- netcdf-4.1.1.orig/libcf/cfcheck/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/cfcheck/Makefile.in 2010-04-12 14:24:35.000000000 +0200
++++ netcdf-4.1.1/libcf/cfcheck/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -14977,7 +14977,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/compile netcdf-4.1.1/libcf/compile
--- netcdf-4.1.1.orig/libcf/compile 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/compile 2010-04-12 14:24:35.000000000 +0200
++++ netcdf-4.1.1/libcf/compile 2010-04-14 14:53:28.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
@@ -15001,7 +15001,7 @@
rmdir "$lockdir"
diff -urN netcdf-4.1.1.orig/libcf/configure netcdf-4.1.1/libcf/configure
--- netcdf-4.1.1.orig/libcf/configure 2010-04-08 15:39:32.000000000 +0200
-+++ netcdf-4.1.1/libcf/configure 2010-04-12 14:24:34.000000000 +0200
++++ netcdf-4.1.1/libcf/configure 2010-04-14 14:53:26.000000000 +0200
@@ -5593,7 +5593,7 @@
enable_win32_dll=yes
@@ -16128,7 +16128,7 @@
hardcode_into_libs=yes
diff -urN netcdf-4.1.1.orig/libcf/doc/Makefile.in netcdf-4.1.1/libcf/doc/Makefile.in
--- netcdf-4.1.1.orig/libcf/doc/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/doc/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/doc/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16137,7 +16137,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/doc/texinfo.tex netcdf-4.1.1/libcf/doc/texinfo.tex
--- netcdf-4.1.1.orig/libcf/doc/texinfo.tex 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/doc/texinfo.tex 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/doc/texinfo.tex 2010-04-14 14:53:28.000000000 +0200
@@ -1,9 +1,9 @@
% texinfo.tex -- TeX macros to handle Texinfo files.
-%
@@ -16214,7 +16214,7 @@
@c time-stamp-format: "%:y-%02m-%02d.%02H"
diff -urN netcdf-4.1.1.orig/libcf/gridspec/Makefile.in netcdf-4.1.1/libcf/gridspec/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16241,7 +16241,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/libcf/gridspec/shared/Makefile.in netcdf-4.1.1/libcf/gridspec/shared/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/shared/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/shared/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/shared/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16268,7 +16268,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/libcf/gridspec/shared/mosaic/Makefile.in netcdf-4.1.1/libcf/gridspec/shared/mosaic/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/shared/mosaic/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/shared/mosaic/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/shared/mosaic/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16277,7 +16277,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/fregrid/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/fregrid/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/fregrid/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/fregrid/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/fregrid/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16286,7 +16286,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/make_coupler_mosaic/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/make_coupler_mosaic/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/make_coupler_mosaic/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/make_coupler_mosaic/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/make_coupler_mosaic/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16295,7 +16295,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/Makefile.in 2010-04-14 14:53:28.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16322,7 +16322,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/make_hgrid/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/make_hgrid/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/make_hgrid/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/make_hgrid/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/make_hgrid/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16331,7 +16331,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/make_solo_mosaic/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/make_solo_mosaic/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/make_solo_mosaic/Makefile.in 2010-04-08 15:39:33.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/make_solo_mosaic/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/make_solo_mosaic/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16340,7 +16340,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/make_topog/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/make_topog/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/make_topog/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/make_topog/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/make_topog/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16349,7 +16349,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/make_vgrid/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/make_vgrid/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/make_vgrid/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/make_vgrid/Makefile.in 2010-04-12 14:24:36.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/make_vgrid/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16358,7 +16358,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/river_regrid/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/river_regrid/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/river_regrid/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/river_regrid/Makefile.in 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/river_regrid/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16367,7 +16367,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/shared/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/shared/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/shared/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/shared/Makefile.in 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/shared/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16376,7 +16376,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/gridspec/tools/transfer_to_mosaic_grid/Makefile.in netcdf-4.1.1/libcf/gridspec/tools/transfer_to_mosaic_grid/Makefile.in
--- netcdf-4.1.1.orig/libcf/gridspec/tools/transfer_to_mosaic_grid/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/gridspec/tools/transfer_to_mosaic_grid/Makefile.in 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/libcf/gridspec/tools/transfer_to_mosaic_grid/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16385,7 +16385,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libcf/ltmain.sh netcdf-4.1.1/libcf/ltmain.sh
--- netcdf-4.1.1.orig/libcf/ltmain.sh 2010-04-08 15:39:27.000000000 +0200
-+++ netcdf-4.1.1/libcf/ltmain.sh 2010-04-12 14:24:28.000000000 +0200
++++ netcdf-4.1.1/libcf/ltmain.sh 2010-04-14 14:53:20.000000000 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -17589,7 +17589,7 @@
# $outputname - a libtool library file
diff -urN netcdf-4.1.1.orig/libcf/m4/libtool.m4 netcdf-4.1.1/libcf/m4/libtool.m4
--- netcdf-4.1.1.orig/libcf/m4/libtool.m4 2010-04-08 15:39:27.000000000 +0200
-+++ netcdf-4.1.1/libcf/m4/libtool.m4 2010-04-12 14:24:28.000000000 +0200
++++ netcdf-4.1.1/libcf/m4/libtool.m4 2010-04-14 14:53:20.000000000 +0200
@@ -380,12 +380,12 @@
# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
# ---------------------------------------------------
@@ -18091,7 +18091,7 @@
# Check for a fully-functional sed program, that truncates
diff -urN netcdf-4.1.1.orig/libcf/m4/ltoptions.m4 netcdf-4.1.1/libcf/m4/ltoptions.m4
--- netcdf-4.1.1.orig/libcf/m4/ltoptions.m4 2010-04-08 15:39:27.000000000 +0200
-+++ netcdf-4.1.1/libcf/m4/ltoptions.m4 2010-04-12 14:24:28.000000000 +0200
++++ netcdf-4.1.1/libcf/m4/ltoptions.m4 2010-04-14 14:53:20.000000000 +0200
@@ -125,7 +125,7 @@
[enable_win32_dll=yes
@@ -18103,7 +18103,7 @@
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff -urN netcdf-4.1.1.orig/libcf/m4/ltsugar.m4 netcdf-4.1.1/libcf/m4/ltsugar.m4
--- netcdf-4.1.1.orig/libcf/m4/ltsugar.m4 2010-04-08 15:39:28.000000000 +0200
-+++ netcdf-4.1.1/libcf/m4/ltsugar.m4 2010-04-12 14:24:28.000000000 +0200
++++ netcdf-4.1.1/libcf/m4/ltsugar.m4 2010-04-14 14:53:20.000000000 +0200
@@ -1,13 +1,13 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
@@ -18145,7 +18145,7 @@
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
diff -urN netcdf-4.1.1.orig/libcf/m4/ltversion.m4 netcdf-4.1.1/libcf/m4/ltversion.m4
--- netcdf-4.1.1.orig/libcf/m4/ltversion.m4 2010-04-08 15:39:28.000000000 +0200
-+++ netcdf-4.1.1/libcf/m4/ltversion.m4 2010-04-12 14:24:28.000000000 +0200
++++ netcdf-4.1.1/libcf/m4/ltversion.m4 2010-04-14 14:53:21.000000000 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -18169,7 +18169,7 @@
])
diff -urN netcdf-4.1.1.orig/libcf/Makefile.in netcdf-4.1.1/libcf/Makefile.in
--- netcdf-4.1.1.orig/libcf/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/Makefile.in 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/libcf/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18228,7 +18228,7 @@
esac
diff -urN netcdf-4.1.1.orig/libcf/src/Makefile.in netcdf-4.1.1/libcf/src/Makefile.in
--- netcdf-4.1.1.orig/libcf/src/Makefile.in 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/libcf/src/Makefile.in 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/libcf/src/Makefile.in 2010-04-14 14:53:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18237,7 +18237,7 @@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -urN netcdf-4.1.1.orig/libncdap3/Makefile.in netcdf-4.1.1/libncdap3/Makefile.in
--- netcdf-4.1.1.orig/libncdap3/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/libncdap3/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/libncdap3/Makefile.in 2010-04-14 14:53:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18272,7 +18272,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/libncdap3/oc/Makefile.in netcdf-4.1.1/libncdap3/oc/Makefile.in
--- netcdf-4.1.1.orig/libncdap3/oc/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/libncdap3/oc/Makefile.in 2010-04-12 14:24:48.000000000 +0200
++++ netcdf-4.1.1/libncdap3/oc/Makefile.in 2010-04-14 14:53:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18289,7 +18289,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/libncdap4/Makefile.in netcdf-4.1.1/libncdap4/Makefile.in
--- netcdf-4.1.1.orig/libncdap4/Makefile.in 2010-04-08 15:39:42.000000000 +0200
-+++ netcdf-4.1.1/libncdap4/Makefile.in 2010-04-12 14:24:49.000000000 +0200
++++ netcdf-4.1.1/libncdap4/Makefile.in 2010-04-14 14:53:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18306,7 +18306,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/libsrc/Makefile.in netcdf-4.1.1/libsrc/Makefile.in
--- netcdf-4.1.1.orig/libsrc/Makefile.in 2010-04-08 15:39:43.000000000 +0200
-+++ netcdf-4.1.1/libsrc/Makefile.in 2010-04-12 14:24:49.000000000 +0200
++++ netcdf-4.1.1/libsrc/Makefile.in 2010-04-14 14:53:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18323,7 +18323,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/libsrc4/Makefile.am netcdf-4.1.1/libsrc4/Makefile.am
--- netcdf-4.1.1.orig/libsrc4/Makefile.am 2010-04-01 16:05:36.000000000 +0200
-+++ netcdf-4.1.1/libsrc4/Makefile.am 2010-04-12 14:18:18.000000000 +0200
++++ netcdf-4.1.1/libsrc4/Makefile.am 2010-04-14 14:52:51.000000000 +0200
@@ -159,7 +159,7 @@
endif
@@ -18335,7 +18335,7 @@
noinst_HEADERS = nc_tests.h
diff -urN netcdf-4.1.1.orig/libsrc4/Makefile.in netcdf-4.1.1/libsrc4/Makefile.in
--- netcdf-4.1.1.orig/libsrc4/Makefile.in 2010-04-08 15:39:43.000000000 +0200
-+++ netcdf-4.1.1/libsrc4/Makefile.in 2010-04-12 14:24:49.000000000 +0200
++++ netcdf-4.1.1/libsrc4/Makefile.in 2010-04-14 14:53:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18375,7 +18375,7 @@
diff -urN netcdf-4.1.1.orig/ltmain.sh netcdf-4.1.1/ltmain.sh
--- netcdf-4.1.1.orig/ltmain.sh 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/ltmain.sh 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/ltmain.sh 2010-04-14 14:53:29.000000000 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -19579,7 +19579,7 @@
# $outputname - a libtool library file
diff -urN netcdf-4.1.1.orig/m4/libtool.m4 netcdf-4.1.1/m4/libtool.m4
--- netcdf-4.1.1.orig/m4/libtool.m4 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/m4/libtool.m4 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/m4/libtool.m4 2010-04-14 14:53:29.000000000 +0200
@@ -380,12 +380,12 @@
# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
# ---------------------------------------------------
@@ -20081,7 +20081,7 @@
# Check for a fully-functional sed program, that truncates
diff -urN netcdf-4.1.1.orig/m4/ltoptions.m4 netcdf-4.1.1/m4/ltoptions.m4
--- netcdf-4.1.1.orig/m4/ltoptions.m4 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/m4/ltoptions.m4 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/m4/ltoptions.m4 2010-04-14 14:53:29.000000000 +0200
@@ -125,7 +125,7 @@
[enable_win32_dll=yes
@@ -20093,7 +20093,7 @@
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff -urN netcdf-4.1.1.orig/m4/ltsugar.m4 netcdf-4.1.1/m4/ltsugar.m4
--- netcdf-4.1.1.orig/m4/ltsugar.m4 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/m4/ltsugar.m4 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/m4/ltsugar.m4 2010-04-14 14:53:29.000000000 +0200
@@ -1,13 +1,13 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
@@ -20135,7 +20135,7 @@
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
diff -urN netcdf-4.1.1.orig/m4/ltversion.m4 netcdf-4.1.1/m4/ltversion.m4
--- netcdf-4.1.1.orig/m4/ltversion.m4 2010-04-08 15:39:34.000000000 +0200
-+++ netcdf-4.1.1/m4/ltversion.m4 2010-04-12 14:24:37.000000000 +0200
++++ netcdf-4.1.1/m4/ltversion.m4 2010-04-14 14:53:29.000000000 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -20159,7 +20159,7 @@
])
diff -urN netcdf-4.1.1.orig/Makefile.in netcdf-4.1.1/Makefile.in
--- netcdf-4.1.1.orig/Makefile.in 2010-04-08 15:39:45.000000000 +0200
-+++ netcdf-4.1.1/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/Makefile.in 2010-04-14 14:53:44.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20226,7 +20226,7 @@
esac
diff -urN netcdf-4.1.1.orig/man4/Makefile.in netcdf-4.1.1/man4/Makefile.in
--- netcdf-4.1.1.orig/man4/Makefile.in 2010-04-08 15:39:43.000000000 +0200
-+++ netcdf-4.1.1/man4/Makefile.in 2010-04-12 14:24:49.000000000 +0200
++++ netcdf-4.1.1/man4/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20243,7 +20243,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/man4/texinfo.tex netcdf-4.1.1/man4/texinfo.tex
--- netcdf-4.1.1.orig/man4/texinfo.tex 2010-04-08 15:39:43.000000000 +0200
-+++ netcdf-4.1.1/man4/texinfo.tex 2010-04-12 14:24:49.000000000 +0200
++++ netcdf-4.1.1/man4/texinfo.tex 2010-04-14 14:53:42.000000000 +0200
@@ -1,9 +1,9 @@
% texinfo.tex -- TeX macros to handle Texinfo files.
-%
@@ -20320,7 +20320,7 @@
@c time-stamp-format: "%:y-%02m-%02d.%02H"
diff -urN netcdf-4.1.1.orig/ncdap_test/expected3/Makefile.in netcdf-4.1.1/ncdap_test/expected3/Makefile.in
--- netcdf-4.1.1.orig/ncdap_test/expected3/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdap_test/expected3/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdap_test/expected3/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20337,7 +20337,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdap_test/expected4/Makefile.in netcdf-4.1.1/ncdap_test/expected4/Makefile.in
--- netcdf-4.1.1.orig/ncdap_test/expected4/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdap_test/expected4/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdap_test/expected4/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20354,7 +20354,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdap_test/expectremote3/Makefile.in netcdf-4.1.1/ncdap_test/expectremote3/Makefile.in
--- netcdf-4.1.1.orig/ncdap_test/expectremote3/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdap_test/expectremote3/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdap_test/expectremote3/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20371,7 +20371,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdap_test/expectremote4/Makefile.in netcdf-4.1.1/ncdap_test/expectremote4/Makefile.in
--- netcdf-4.1.1.orig/ncdap_test/expectremote4/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdap_test/expectremote4/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdap_test/expectremote4/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20388,7 +20388,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdap_test/Makefile.in netcdf-4.1.1/ncdap_test/Makefile.in
--- netcdf-4.1.1.orig/ncdap_test/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdap_test/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdap_test/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20423,7 +20423,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/ncdap_test/testdata3/Makefile.in netcdf-4.1.1/ncdap_test/testdata3/Makefile.in
--- netcdf-4.1.1.orig/ncdap_test/testdata3/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdap_test/testdata3/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdap_test/testdata3/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20440,7 +20440,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdump/cdl4/Makefile.in netcdf-4.1.1/ncdump/cdl4/Makefile.in
--- netcdf-4.1.1.orig/ncdump/cdl4/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdump/cdl4/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/ncdump/cdl4/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20457,7 +20457,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdump/expected4/Makefile.in netcdf-4.1.1/ncdump/expected4/Makefile.in
--- netcdf-4.1.1.orig/ncdump/expected4/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdump/expected4/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/ncdump/expected4/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20474,7 +20474,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncdump/Makefile.in netcdf-4.1.1/ncdump/Makefile.in
--- netcdf-4.1.1.orig/ncdump/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncdump/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/ncdump/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20509,7 +20509,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/ncgen/Makefile.in netcdf-4.1.1/ncgen/Makefile.in
--- netcdf-4.1.1.orig/ncgen/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncgen/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/ncgen/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20526,7 +20526,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/ncgen3/Makefile.in netcdf-4.1.1/ncgen3/Makefile.in
--- netcdf-4.1.1.orig/ncgen3/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/ncgen3/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/ncgen3/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20543,7 +20543,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/nctest/Makefile.in netcdf-4.1.1/nctest/Makefile.in
--- netcdf-4.1.1.orig/nctest/Makefile.in 2010-04-08 15:39:44.000000000 +0200
-+++ netcdf-4.1.1/nctest/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/nctest/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20560,7 +20560,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/nc_test/Makefile.in netcdf-4.1.1/nc_test/Makefile.in
--- netcdf-4.1.1.orig/nc_test/Makefile.in 2010-04-08 15:39:43.000000000 +0200
-+++ netcdf-4.1.1/nc_test/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/nc_test/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20577,7 +20577,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/nc_test4/Makefile.in netcdf-4.1.1/nc_test4/Makefile.in
--- netcdf-4.1.1.orig/nc_test4/Makefile.in 2010-04-08 15:39:43.000000000 +0200
-+++ netcdf-4.1.1/nc_test4/Makefile.in 2010-04-12 14:24:50.000000000 +0200
++++ netcdf-4.1.1/nc_test4/Makefile.in 2010-04-14 14:53:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20594,7 +20594,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/nf_test/Makefile.in netcdf-4.1.1/nf_test/Makefile.in
--- netcdf-4.1.1.orig/nf_test/Makefile.in 2010-04-08 15:39:45.000000000 +0200
-+++ netcdf-4.1.1/nf_test/Makefile.in 2010-04-12 14:24:51.000000000 +0200
++++ netcdf-4.1.1/nf_test/Makefile.in 2010-04-14 14:53:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -20611,7 +20611,7 @@
OCLIB_LIBS = @OCLIB_LIBS@
diff -urN netcdf-4.1.1.orig/udunits/aclocal.m4 netcdf-4.1.1/udunits/aclocal.m4
--- netcdf-4.1.1.orig/udunits/aclocal.m4 2010-04-08 15:39:21.000000000 +0200
-+++ netcdf-4.1.1/udunits/aclocal.m4 2010-04-12 14:24:18.000000000 +0200
++++ netcdf-4.1.1/udunits/aclocal.m4 2010-04-14 14:53:11.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -27284,7 +27284,7 @@
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN netcdf-4.1.1.orig/udunits/compile netcdf-4.1.1/udunits/compile
--- netcdf-4.1.1.orig/udunits/compile 2010-04-08 15:39:23.000000000 +0200
-+++ netcdf-4.1.1/udunits/compile 2010-04-12 14:24:21.000000000 +0200
++++ netcdf-4.1.1/udunits/compile 2010-04-14 14:53:14.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
@@ -27308,7 +27308,7 @@
rmdir "$lockdir"
diff -urN netcdf-4.1.1.orig/udunits/configure netcdf-4.1.1/udunits/configure
--- netcdf-4.1.1.orig/udunits/configure 2010-04-08 15:39:22.000000000 +0200
-+++ netcdf-4.1.1/udunits/configure 2010-04-12 14:24:20.000000000 +0200
++++ netcdf-4.1.1/udunits/configure 2010-04-14 14:53:12.000000000 +0200
@@ -755,6 +755,7 @@
lt_ECHO
RANLIB
@@ -27904,7 +27904,7 @@
diff -urN netcdf-4.1.1.orig/udunits/expat/Makefile.in netcdf-4.1.1/udunits/expat/Makefile.in
--- netcdf-4.1.1.orig/udunits/expat/Makefile.in 2010-04-08 15:39:23.000000000 +0200
-+++ netcdf-4.1.1/udunits/expat/Makefile.in 2010-04-12 14:24:21.000000000 +0200
++++ netcdf-4.1.1/udunits/expat/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -27921,7 +27921,7 @@
OTOOL64 = @OTOOL64@
diff -urN netcdf-4.1.1.orig/udunits/lib/Makefile.in netcdf-4.1.1/udunits/lib/Makefile.in
--- netcdf-4.1.1.orig/udunits/lib/Makefile.in 2010-04-08 15:39:23.000000000 +0200
-+++ netcdf-4.1.1/udunits/lib/Makefile.in 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/lib/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -27956,7 +27956,7 @@
*=* | --[!k]*);; \
diff -urN netcdf-4.1.1.orig/udunits/lib/xmlFailures/Makefile.in netcdf-4.1.1/udunits/lib/xmlFailures/Makefile.in
--- netcdf-4.1.1.orig/udunits/lib/xmlFailures/Makefile.in 2010-04-08 15:39:23.000000000 +0200
-+++ netcdf-4.1.1/udunits/lib/xmlFailures/Makefile.in 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/lib/xmlFailures/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -27973,7 +27973,7 @@
OTOOL64 = @OTOOL64@
diff -urN netcdf-4.1.1.orig/udunits/lib/xmlSuccesses/Makefile.in netcdf-4.1.1/udunits/lib/xmlSuccesses/Makefile.in
--- netcdf-4.1.1.orig/udunits/lib/xmlSuccesses/Makefile.in 2010-04-08 15:39:24.000000000 +0200
-+++ netcdf-4.1.1/udunits/lib/xmlSuccesses/Makefile.in 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/lib/xmlSuccesses/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -27990,7 +27990,7 @@
OTOOL64 = @OTOOL64@
diff -urN netcdf-4.1.1.orig/udunits/ltmain.sh netcdf-4.1.1/udunits/ltmain.sh
--- netcdf-4.1.1.orig/udunits/ltmain.sh 2010-04-08 15:39:18.000000000 +0200
-+++ netcdf-4.1.1/udunits/ltmain.sh 2010-04-12 14:24:15.000000000 +0200
++++ netcdf-4.1.1/udunits/ltmain.sh 2010-04-14 14:53:08.000000000 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -29194,7 +29194,7 @@
# $outputname - a libtool library file
diff -urN netcdf-4.1.1.orig/udunits/m4/libtool.m4 netcdf-4.1.1/udunits/m4/libtool.m4
--- netcdf-4.1.1.orig/udunits/m4/libtool.m4 2010-04-08 15:39:18.000000000 +0200
-+++ netcdf-4.1.1/udunits/m4/libtool.m4 2010-04-12 14:24:15.000000000 +0200
++++ netcdf-4.1.1/udunits/m4/libtool.m4 2010-04-14 14:53:08.000000000 +0200
@@ -380,12 +380,12 @@
# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
# ---------------------------------------------------
@@ -29696,7 +29696,7 @@
# Check for a fully-functional sed program, that truncates
diff -urN netcdf-4.1.1.orig/udunits/m4/ltoptions.m4 netcdf-4.1.1/udunits/m4/ltoptions.m4
--- netcdf-4.1.1.orig/udunits/m4/ltoptions.m4 2010-04-08 15:39:18.000000000 +0200
-+++ netcdf-4.1.1/udunits/m4/ltoptions.m4 2010-04-12 14:24:15.000000000 +0200
++++ netcdf-4.1.1/udunits/m4/ltoptions.m4 2010-04-14 14:53:08.000000000 +0200
@@ -125,7 +125,7 @@
[enable_win32_dll=yes
@@ -29708,7 +29708,7 @@
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff -urN netcdf-4.1.1.orig/udunits/m4/ltsugar.m4 netcdf-4.1.1/udunits/m4/ltsugar.m4
--- netcdf-4.1.1.orig/udunits/m4/ltsugar.m4 2010-04-08 15:39:19.000000000 +0200
-+++ netcdf-4.1.1/udunits/m4/ltsugar.m4 2010-04-12 14:24:15.000000000 +0200
++++ netcdf-4.1.1/udunits/m4/ltsugar.m4 2010-04-14 14:53:08.000000000 +0200
@@ -1,13 +1,13 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
@@ -29750,7 +29750,7 @@
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
diff -urN netcdf-4.1.1.orig/udunits/m4/ltversion.m4 netcdf-4.1.1/udunits/m4/ltversion.m4
--- netcdf-4.1.1.orig/udunits/m4/ltversion.m4 2010-04-08 15:39:19.000000000 +0200
-+++ netcdf-4.1.1/udunits/m4/ltversion.m4 2010-04-12 14:24:15.000000000 +0200
++++ netcdf-4.1.1/udunits/m4/ltversion.m4 2010-04-14 14:53:08.000000000 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -29774,7 +29774,7 @@
])
diff -urN netcdf-4.1.1.orig/udunits/Makefile.in netcdf-4.1.1/udunits/Makefile.in
--- netcdf-4.1.1.orig/udunits/Makefile.in 2010-04-08 15:39:24.000000000 +0200
-+++ netcdf-4.1.1/udunits/Makefile.in 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -29841,7 +29841,7 @@
esac
diff -urN netcdf-4.1.1.orig/udunits/prog/Makefile.in netcdf-4.1.1/udunits/prog/Makefile.in
--- netcdf-4.1.1.orig/udunits/prog/Makefile.in 2010-04-08 15:39:24.000000000 +0200
-+++ netcdf-4.1.1/udunits/prog/Makefile.in 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/prog/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -29858,7 +29858,7 @@
OTOOL64 = @OTOOL64@
diff -urN netcdf-4.1.1.orig/udunits/test/Makefile.in netcdf-4.1.1/udunits/test/Makefile.in
--- netcdf-4.1.1.orig/udunits/test/Makefile.in 2010-04-08 15:39:24.000000000 +0200
-+++ netcdf-4.1.1/udunits/test/Makefile.in 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/test/Makefile.in 2010-04-14 14:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -29875,7 +29875,7 @@
OTOOL64 = @OTOOL64@
diff -urN netcdf-4.1.1.orig/udunits/texinfo.tex netcdf-4.1.1/udunits/texinfo.tex
--- netcdf-4.1.1.orig/udunits/texinfo.tex 2009-08-13 20:49:45.000000000 +0200
-+++ netcdf-4.1.1/udunits/texinfo.tex 2010-04-12 14:24:22.000000000 +0200
++++ netcdf-4.1.1/udunits/texinfo.tex 2010-04-14 14:53:14.000000000 +0200
@@ -1,9 +1,9 @@
% texinfo.tex -- TeX macros to handle Texinfo files.
-%
Modified: packages/netcdf/branches/4.1/debian/rules
===================================================================
--- packages/netcdf/branches/4.1/debian/rules 2010-04-12 20:22:08 UTC (rev 2825)
+++ packages/netcdf/branches/4.1/debian/rules 2010-04-14 13:54:57 UTC (rev 2826)
@@ -14,7 +14,9 @@
# Note that hdf5 dir has to be specified due to a bug into fortran/Makefile.am which causes
# skipping of fort-nc4.c without that.
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4 --with-hdf5=/usr --with-libcf --enable-dap
+#
+# Remote sites could be not available at check time, so disabling some tests...
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4 --with-hdf5=/usr --with-libcf --enable-dap --disable-dap-remote-tests
DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran"
DEB_CONFIGURE_SCRIPT_ENV += CXX="g++"
DEB_CONFIGURE_SCRIPT_ENV += CC="gcc"
More information about the Pkg-grass-devel
mailing list