[cdo] 03/84: new release
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdo.
commit 338d977a7e9fa20d02a194d2ccba997d4a3ad516
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Dec 29 17:14:37 2012 +0000
new release
---
debian/README.dfsg | 6 ++
debian/TODO | 1 +
debian/cdo.docs | 5 +
debian/cdo.install | 1 +
debian/changelog | 229 ++++++++++++++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 37 +++++++
debian/copyright | 15 +++
debian/libcdi-dev.install | 3 +
debian/libcdi0.install | 1 +
debian/patches/fix_typos.patch | 57 ++++++++++
debian/patches/ignore.patch | 43 ++++++++
debian/patches/series | 4 +
debian/patches/x.patch | 175 ++++++++++++++++++++++++++++++
debian/patches/y.patch | 69 ++++++++++++
debian/python-cdo.substvars | 1 +
debian/rules | 67 ++++++++++++
debian/source/format | 1 +
debian/source/lintian-overrides | 1 +
debian/source/options | 1 +
debian/watch.broken | 3 +
21 files changed, 721 insertions(+)
diff --git a/debian/README.dfsg b/debian/README.dfsg
new file mode 100644
index 0000000..7fa4388
--- /dev/null
+++ b/debian/README.dfsg
@@ -0,0 +1,6 @@
+This version of CDO differs from the upstream in that:
+(1) No PDFs are shipped, as per Debian policy - they cannot be recreated from source.
+(2) cfortran.h is not shipped; we use cfortran that ships with Debian instead.
+ (This is currently cfortran 4.4 in Debian vs. 4.3 in the original sources).
+
+- Alastair McKinstry, <mckinstry at debian.org>, 2011-06-18
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..73b8e16
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1 @@
+* Write a man page.
diff --git a/debian/cdo.docs b/debian/cdo.docs
new file mode 100644
index 0000000..9d8120f
--- /dev/null
+++ b/debian/cdo.docs
@@ -0,0 +1,5 @@
+NEWS
+OPERATORS
+AUTHORS
+cdo.spec
+debian/README.dfsg
diff --git a/debian/cdo.install b/debian/cdo.install
new file mode 100644
index 0000000..1df36c6
--- /dev/null
+++ b/debian/cdo.install
@@ -0,0 +1 @@
+usr/bin/*
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4c03c86
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,229 @@
+cdo (1.5.9+dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 29 Dec 2012 17:13:31 +0000
+
+cdo (1.5.6.1+dfsg.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version: 3.9.3
+ * Don't use MPI builds. PIO code not included yet.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 11 Sep 2012 02:39:21 +0100
+
+cdo (1.5.4+dfsg.1-5) unstable; urgency=low
+
+ * Rebuild with netcdf, hdf5 for hdf5 transition.
+ * Call dh_autoreconf rather than do it manually, so dh_clean now
+ works properly after a build. Add dependency on dh_autoreconf.
+ * Add gfortran dependency, build Fortran ISO_C interface to libcdi.
+ * Patch to fix typos lintian found in cdo.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 17 Feb 2012 13:29:42 +0000
+
+cdo (1.5.4+dfsg.1-4) unstable; urgency=low
+
+ * New upstream release.
+ * Add lintian-override for multiarch (debhelper 9 version) warning.
+ * Change to +dfsg name, thanks to Lintian.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 14 Feb 2012 13:57:35 +0000
+
+cdo (1.5.3.dfsg.1-2) unstable; urgency=low
+
+ * Install the contrib/ components for bash, zsh completion.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 27 Nov 2011 10:56:58 +0000
+
+cdo (1.5.3.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 24 Oct 2011 09:45:04 +0100
+
+cdo (1.5.2.dfsg.1-4) unstable; urgency=low
+
+ * CDI needs MPI version of HDF5 to build. Closes: #645545.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 18 Oct 2011 11:15:54 +0100
+
+cdo (1.5.2.dfsg.1-3) unstable; urgency=low
+
+ * Enable and ship CDI library.
+ * Multi-arch.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 15 Oct 2011 17:53:49 +0100
+
+cdo (1.5.2.dfsg.1-2) unstable; urgency=low
+
+ * Build with mpicc when mpi IS set, not the opposite, in rules file.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 12 Sep 2011 10:53:54 +0100
+
+cdo (1.5.2.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add LDFLAGS="-Wl,--as-needed" ; fix --with-hdf6 to --with-hdf5
+ * Add "| libhdf5-dev" and optional code for an MPI version;
+ enable with DEB_BUILD_OPTIONS=mpi
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 10 Sep 2011 10:27:18 +0100
+
+cdo (1.5.1.dfsg.1-2) unstable; urgency=low
+
+ * Remove alternate build-dep "| libhdf5-dev", build only works with
+ libhdf5-serial-dev for the moment.
+ * --disable-cgribex needed to enable GRIB2 support. Closes: #633934.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 15 Jul 2011 23:47:02 +0100
+
+cdo (1.5.1.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 15 Jul 2011 13:10:33 +0100
+
+cdo (1.5.0.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Standards-Version: 3.9.2. No changes required.
+ * Use the Debian version of cfortran, rather than supply a copy.
+ Closes: #631015.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 19 Jun 2011 20:54:03 +0100
+
+cdo (1.4.7.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 27 Jan 2011 09:34:23 +0000
+
+cdo (1.4.6.dfsg.1-4) unstable; urgency=low
+
+ * jasper dependency must be conditional on mips, hppa, sparc.
+ Closes: #597975.
+ * clean rule should also remove .deps that may be left behind on
+ previous builds.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 25 Sep 2010 14:15:53 +0100
+
+cdo (1.4.6.dfsg.1-3) unstable; urgency=low
+
+ * grib-api dependency now requires libjasper to build. Closes: #597921.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 24 Sep 2010 04:02:29 +0100
+
+cdo (1.4.6.dfsg.1-2) unstable; urgency=low
+
+ * Libtool now needed. Closes: #597838.
+ * Standards-Version: 3.9.4
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 23 Sep 2010 05:01:34 +0100
+
+cdo (1.4.6.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 22 Sep 2010 15:58:09 +0100
+
+cdo (1.4.5.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 02 Jul 2010 09:04:06 +0100
+
+cdo (1.4.4.dfsg.1-2) unstable; urgency=low
+
+ * Make build-dep on grib-api conditional so that we build on sparc, hppa
+ and mips, where grib-api doesn't. Closes: #581801.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 16 May 2010 19:18:17 +0100
+
+cdo (1.4.4.dfsg.1-1) unstable; urgency=low
+
+ * Upstream release.
+ * no_sz.patch no longer needed; upstream fix.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 08 May 2010 16:04:20 +0100
+
+cdo (1.4.3.dfsg.1-2) unstable; urgency=low
+
+ * Enable GRIB-API support. Closes: #574955.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 25 Mar 2010 12:20:07 +0000
+
+cdo (1.4.3.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * New CDO Homepage. https://code.zmaw.de/projects/cdo
+ * Patch no_sz.patch: Don't require libsz for HDF5, as it cannot be included
+ in Debian for patent reasons.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 02 Mar 2010 11:07:53 +0000
+
+cdo (1.4.1.dfsg.1-2) unstable; urgency=low
+
+ * Build using ./configure rather than dh_auto_configure ; for some reason
+ the latter is currently failing.
+ * Change priority to extra, as we depend on libproj0, which is extra.
+ * Built with hdf-1.8.4 since -1 (Closes: #568220).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 03 Feb 2010 14:33:35 +0000
+
+cdo (1.4.1.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release, with better netcdf support.
+ * Build netcdf and hdf5-1.8.4
+ * Move to Standards-Version: 3.8.4 , source format 3.0
+ * Move cdbs to debhelper 7 style build
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 03 Feb 2010 13:22:29 +0000
+
+cdo (1.4.0.1~dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 03 Nov 2009 13:30:48 +0000
+
+cdo (1.3.2~dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Move to Standards-Version: 3.8.2. No changes required.
+ * Build with netcdf support. Closes: #538244.
+ * Move to debhelper DH_COMPAT=7.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 24 Jul 2009 12:56:22 +0100
+
+cdo (1.3.1+dfsg-4) unstable; urgency=low
+
+ * Add automake dependency (checked with pbuilder). Closes: 529086.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 18 May 2009 12:38:27 +0100
+
+cdo (1.3.1+dfsg-3) unstable; urgency=low
+
+ * Add autoconf dependency. Closes: #529013.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 17 May 2009 11:46:55 +0100
+
+cdo (1.3.1+dfsg-2) unstable; urgency=low
+
+ * Now use libproj.
+ * Added ${shlibs:Depenbds} for dependencies.
+ * More docs: Add OPERATORS, NEWS, cdo.spec files.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 16 May 2009 16:55:32 +0100
+
+cdo (1.3.1+dfsg-1) unstable; urgency=low
+
+ * New Upstream release; Closes: #522772.
+ * Remove pdf's from source to make it dfsg for release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 10 May 2009 19:52:19 +0100
+
+cdo (1.3.0-1) unstable; urgency=low
+
+ * Initial Debian release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 6 Apr 2009 16:15:52 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0c8de30
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,37 @@
+Source: cdo
+Section: utils
+Priority: extra
+Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Build-Depends: debhelper (>= 8.1.3~), dh-buildinfo, libproj-dev, autoconf, automake, libnetcdf-dev, gfortran, dh-autoreconf,
+ libgrib-api-dev [!mips !sparc !hppa], libtool, libjasper-dev, cfortran, libhdf5-serial-dev
+Standards-Version: 3.9.3
+Homepage: https://code.zmaw.de/projects/cdo
+
+Package: cdo
+Section: utils
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, libcdi0 ( = ${binary:Version})
+Description: Climate Data Operators
+ Climate Data Operators are a collection of command line Operators
+ to manipulate and analyse Climate model Data. Supported data formats are GRIB,
+ netCDF, SERVICE, EXTRA and IEG. There are more than 400 operators available.
+
+Package: libcdi0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Climate Data Interface (cdi) library
+ CDI is a C and Fortran Interface to access Climate model Data.
+ Supported data formats are GRIB, netCDF, SERVICE, EXTRA and IEG.
+
+Package: libcdi-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libcdi0 (= ${binary:Version})
+Multi-Arch: same
+Description: Development files for the climate data interface library
+ CDI is a C and Fortran Interface to access Climate model Data.
+ Supported data formats are GRIB, netCDF, SERVICE, EXTRA and IEG.
+ This package provides development libraries to build against CDI.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f0179dc
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,15 @@
+This package was debianized by Alastair McKinstry <mckinstry at debian.org>, on
+Mon, 6 Apr 2009 16:22:04 +0100. It was downloaded from
+http://www.mpimet.mpg.de/fileadmin/software/cdo/
+
+Upstream authors: Uwe Schulzweida, Uwe.Schulzweida at zmaw.de, is the main author.
+ Luis Kornblueh, Luis.Kornblueh at zmaw.de
+ Ralf Quast, Ralf.Quast at brockmann-consult.de
+
+Copyright (C) 2003--2009 Uwe Schulzweidaa.
+
+Licensed under the GNU General Public License.
+The texts of the license can be found in /usr/share/common-licenses/GPL-2
+
+The Debian packaging is Copyright (C) 2009, Alastair McKinstry <mckinstry at debian.org>,
+is licensed under the terms of the GNU GPL version 2.
diff --git a/debian/libcdi-dev.install b/debian/libcdi-dev.install
new file mode 100644
index 0000000..901736c
--- /dev/null
+++ b/debian/libcdi-dev.install
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/libcdi.a
+usr/lib/*/pkgconfig/*
diff --git a/debian/libcdi0.install b/debian/libcdi0.install
new file mode 100644
index 0000000..8e0b08b
--- /dev/null
+++ b/debian/libcdi0.install
@@ -0,0 +1 @@
+usr/lib/*/libcdi.so.0.0.0
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
new file mode 100644
index 0000000..d45fc67
--- /dev/null
+++ b/debian/patches/fix_typos.patch
@@ -0,0 +1,57 @@
+Index: cdo-1.5.4+dfsg.1/libcdi/src/grid.c
+===================================================================
+--- cdo-1.5.4+dfsg.1.orig/libcdi/src/grid.c 2012-01-26 15:17:52.000000000 +0000
++++ cdo-1.5.4+dfsg.1/libcdi/src/grid.c 2012-02-17 12:31:32.000000000 +0000
+@@ -3603,8 +3603,8 @@
+ @Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
+ @Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
+ @Item lat2 Second latitude at which the secant cone cuts the sphere.
+- @Item xinc X-direction grid lenght in meter.
+- @Item yinc Y-direction grid lenght in meter.
++ @Item xinc X-direction grid length in meter.
++ @Item yinc Y-direction grid length in meter.
+ @Item projflag Projection centre flag.
+ @Item scanflag Scanning mode flag.
+
+@@ -3654,8 +3654,8 @@
+ @Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
+ @Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
+ @Item lat2 Second latitude at which the secant cone cuts the sphere.
+- @Item xinc X-direction grid lenght in meter.
+- @Item yinc Y-direction grid lenght in meter.
++ @Item xinc X-direction grid length in meter.
++ @Item yinc Y-direction grid length in meter.
+ @Item projflag Projection centre flag.
+ @Item scanflag Scanning mode flag.
+
+Index: cdo-1.5.4+dfsg.1/src/operator_help.h
+===================================================================
+--- cdo-1.5.4+dfsg.1.orig/src/operator_help.h 2012-01-30 10:14:04.000000000 +0000
++++ cdo-1.5.4+dfsg.1/src/operator_help.h 2012-02-17 12:32:00.000000000 +0000
+@@ -1334,7 +1334,7 @@
+ "",
+ "DESCRIPTION",
+ " This module computes periods over all timesteps in ifile where a",
+- " certain property is valid. The propery can be chosen by creating a mask from",
++ " certain property is valid. The property can be chosen by creating a mask from",
+ " the original data, which is the expected input format for operators of this",
+ " module. Depending on the operator full information about each period or",
+ " just its length and ending date are computed.",
+@@ -1346,7 +1346,7 @@
+ " multiple periods can be found. Timesteps from the input are preserved. Missing",
+ " values are handled like 0, i.e. finish periods of consecutive timesteps.",
+ " consects Consecutive Timesteps",
+- " In contrast to the operator above consects only computes the lenght of each",
++ " In contrast to the operator above consects only computes the length of each",
+ " period together with its last timestep. To be able to perform statistical",
+ " analysis like min, max or mean, everything else is set to missing value.",
+ NULL
+@@ -3800,7 +3800,7 @@
+ " is the lower bound and the second value the upper bound of the",
+ " first bin. The bounds of the second bin are defined by the",
+ " second and third value, aso.",
+- " Only 2-dimensional input fields are allowed. The ouput file ",
++ " Only 2-dimensional input fields are allowed. The output file ",
+ " contains one vertical level for each of the bins requested.",
+ "",
+ "OPERATORS",
diff --git a/debian/patches/ignore.patch b/debian/patches/ignore.patch
new file mode 100644
index 0000000..c661b5f
--- /dev/null
+++ b/debian/patches/ignore.patch
@@ -0,0 +1,43 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ cdo (1.5.5+dfsg.1-1) unstable; urgency=low
+ .
+ * New upstream release
+ * Standards-Version: 3.9.3
+ * Don't use MPI builds. PIO code not included yet.
+Author: Alastair McKinstry <mckinstry at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: cdo-1.5.6.1/libcdi/src/config.h.in
+===================================================================
+--- cdo-1.5.6.1.orig/libcdi/src/config.h.in 2012-07-19 08:55:06.000000000 +0100
++++ cdo-1.5.6.1/libcdi/src/config.h.in 2012-09-10 21:21:38.000000000 +0100
+@@ -185,6 +185,11 @@
+ /* Version number of package */
+ #undef VERSION
+
++/* Enable large inode numbers on Mac OS X 10.5. */
++#ifndef _DARWIN_USE_64_BIT_INODE
++# define _DARWIN_USE_64_BIT_INODE 1
++#endif
++
+ /* Number of bits in a file offset, on hosts where this is settable. */
+ #undef _FILE_OFFSET_BITS
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5c569eb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+fix_typos.patch
+ignore.patch
+x.patch
+y.patch
diff --git a/debian/patches/x.patch b/debian/patches/x.patch
new file mode 100644
index 0000000..7749135
--- /dev/null
+++ b/debian/patches/x.patch
@@ -0,0 +1,175 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ cdo (1.5.6.1+dfsg.1-1) unstable; urgency=low
+ .
+ * New upstream release
+ * Standards-Version: 3.9.3
+ * Don't use MPI builds. PIO code not included yet.
+Author: Alastair McKinstry <mckinstry at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- cdo-1.5.6.1+dfsg.1.orig/config/default
++++ cdo-1.5.6.1+dfsg.1/config/default
+@@ -17,32 +17,17 @@ fi
+ set -x
+ #
+ case "${HOSTNAME}" in
+- icc)
+- ${CONFPATH}configure --prefix=$HOME/local \
+- --enable-maintainer-mode \
+- --with-jasper=$HOME/local \
+- --with-grib_api=$HOME/local/gribapi-1.9.16cgribex \
+- --with-netcdf=$HOME/local \
+- --with-hdf5=$HOME/local \
+- --with-szlib=$HOME/local \
+- --with-proj=/opt/local \
+- --with-magics=/Users/m214003/local/magics-2.14.9 \
+- CC=icc CFLAGS="-g -D_REENTRANT -Wall -W -O3 -openmp -DHAVE_LIBXML -I/usr/include/libxml2 -I/opt/include" \
+- LIBS="-L/usr/lib -lxml2 -L/opt/local/lib -lopenjpeg"
+- ;;
+ # i386-apple-darwin10
+ bailung*)
+ ${CONFPATH}configure --prefix=$HOME/local \
+ --enable-maintainer-mode \
+ --with-jasper=$HOME/local \
+- --with-grib_api=$HOME/local/gribapi-1.9.16cgribex \
++ --with-grib_api=$HOME/local \
+ --with-netcdf=$HOME/local \
+ --with-hdf5=$HOME/local \
+ --with-szlib=$HOME/local \
+ --with-proj=/opt/local \
+- --with-magics=/Users/m214003/local/magics-2.14.9 \
+- CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -fopenmp -DHAVE_LIBXML -I/usr/include/libxml2 -I/opt/include" \
+- LIBS="-L/usr/lib -lxml2 -L/opt/local/lib -lopenjpeg"
++ CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
+ ;;
+ hama*)
+ ${CONFPATH}configure --prefix=$HOME/local \
+@@ -52,7 +37,7 @@ case "${HOSTNAME}" in
+ --with-netcdf=/opt/local \
+ --with-szlib=$HOME/local \
+ --with-proj=/opt/local \
+- CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -fopenmp"
++ CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
+ ;;
+ # ia64-xxx-linux
+ ds*)
+@@ -70,33 +55,30 @@ case "${HOSTNAME}" in
+ tornado*)
+ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/sles10-x64 \
+ --enable-all-static \
+- --with-netcdf=/sw/sles10-x64/netcdf-4.2-static \
+- --with-hdf5=/sw/sles10-x64/hdf5-1.8.8-static \
++ --with-netcdf=/sw/sles10-x64/netcdf-4.0.1 \
++ --with-hdf5=/sw/sles10-x64/hdf5-1.8.2 \
+ --with-szlib=/sw/sles10-x64/szip-2.1 \
+ CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
+ # CC=suncc CFLAGS="-g -fast -xopenmp"
+ ;;
+-# x86_64-squeeze-x64-linux
+- thunder*)
+- ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/squeeze-x64 \
+- --with-jasper=/sw/squeeze-x64/jasper-1.900.1-static \
+- --with-grib_api=/sw/squeeze-x64/grib_api-1.9.9-static \
+- --with-netcdf=/sw/squeeze-x64/netcdf-4.2-static \
+- --with-hdf5=/sw/squeeze-x64/hdf5-1.8.8-static \
+- --with-szlib=/sw/squeeze-x64/szip-2.1 \
+- --with-proj=/sw/squeeze-x64/proj-4.7.0 \
+- CC=gcc CFLAGS='-g -Wall -O3 -fopenmp'
+- ;;
++# x86_64-etch-x64-linux
++# squall*)
++# ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-x64 \
++# --enable-all-static \
++# --with-netcdf=/sw/etch-x64/netcdf-4.0.1 \
++# --with-hdf5=/sw/etch-x64/hdf5-1.8.2 \
++# --with-szlib=/sw/etch-x64/szip-2.1-static \
++# --with-proj=/sw/etch-x64/proj-4.7.0 \
++# CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
++# ;;
+ # x86_64-lenny-linux-gnu
+ squall*)
+ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/lenny-x64 \
+- --with-jasper=/sw/lenny-x64/jasper-1.900.1-static \
+- --with-grib_api=/sw/lenny-x64/grib_api-1.9.9-static \
+- --with-netcdf=/sw/lenny-x64/netcdf-4.2-static \
+- --with-hdf5=/sw/lenny-x64/hdf5-1.8.8-static \
++ --with-netcdf=/sw/lenny-x64/netcdf-4.0.1-gcc \
++ --with-hdf5=/sw/lenny-x64/hdf5-1.8.4p1-gcc \
+ --with-szlib=/sw/lenny-x64/szip-2.1 \
+ --with-proj=/sw/lenny-x64/proj-4.7.0 \
+- CC=gcc CFLAGS='-g -Wall -O3 -fopenmp'
++ CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
+ ;;
+ # x86_64-archlinux
+ thingol*)
+@@ -121,6 +103,19 @@ case "${HOSTNAME}" in
+ --with-szlib=$HOME/local \
+ CC=colorgcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
+ ;;
++# i686-linux
++ etch-ia32 | gata)
++ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-ia32 \
++ --enable-maintainer-mode \
++ --with-jasper=/sw/etch-ia32/jasper-1.900.1 \
++ --with-grib_api=$HOME/local/etch-ia32/grib_api-1.9.9 \
++ --with-netcdf=/sw/etch-ia32/netcdf-4.1.1-gcc \
++ --with-hdf5=/sw/etch-ia32/hdf5-1.8.4-threadsafe \
++ --with-zlib=/sw/etch-ia32/zlib-1.2.3 \
++ --with-szlib=$HOME/local/etch-ia32 \
++ --with-proj=/sw/etch-ia32/proj-4.6.0 \
++ CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2"
++ ;;
+ # standard workstations at MPI-M x86_64-lenny
+ mpipc* )
+ ${CONFPATH}configure \
+@@ -172,13 +167,13 @@ case "${HOSTNAME}" in
+ ;;
+ # x86_64-unknown-linux-gnu (rhel55)
+ lizard*)
+- LDFLAGS="-lpng"
++ LDFLAGS="-Wl,-rpath=/sw/rhel55-x64/jasper-1.900.1/lib:/sw/rhel55-x64/hdf5-1.8.5-threadsafe/lib:/sw/rhel55-x64/szip-2.1/lib:/sw/rhel55-x64/netcdf-4.1.1/lib -lpng"
+ export LDFLAGS
+ ${CONFPATH}configure --prefix=$HOME/local/rhel55-x64 \
+ --with-jasper=/sw/rhel55-x64/jasper-1.900.1 \
+ --with-grib_api=/sw/rhel55-x64/grib_api-1.9.0 \
+- --with-netcdf=/sw/rhel55-x64/netcdf-4.2 \
+- --with-hdf5=/sw/rhel55-x64/hdf5-1.8.8-threadsafe \
++ --with-netcdf=/sw/rhel55-x64/netcdf-4.1.1 \
++ --with-hdf5=/sw/rhel55-x64/hdf5-1.8.5-threadsafe \
+ --with-szlib=/sw/rhel55-x64/szip-2.1 \
+ --with-zlib=/usr \
+ CC=gcc44 CFLAGS="-g -Wall -O2 -fopenmp"
+@@ -198,10 +193,11 @@ case "${HOSTNAME}" in
+ blizzard*)
+ ${CONFPATH}configure --prefix=$HOME/local \
+ --with-jasper=/sw/aix53/jasper-1.900.1 \
+- --with-grib_api=/sw/aix61/grib_api-1.9.9 \
+- --with-netcdf=/sw/aix61/netcdf-4.2-threadsafe \
+- --with-hdf5=/sw/aix61/hdf5-1.8.8-threadsafe \
+- --with-szlib=/sw/aix61/szip-2.1-threadsafe \
++ --with-grib_api=/sw/aix61/ECMWF \
++ --with-netcdf=/sw/aix61/netcdf-4.1.2-hdf5-threadsafe \
++ --with-hdf5=/sw/aix61/hdf5-1.8.6-threadsafe \
++ --with-zlib=/sw/aix53/zlib-1.2.3 \
++ --with-szlib=/sw/aix53/szip-2.1 \
+ --with-proj=/sw/aix53/proj-4.6.1 \
+ AR="ar -X 64" LDFLAGS="-brtl" \
+ CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
diff --git a/debian/patches/y.patch b/debian/patches/y.patch
new file mode 100644
index 0000000..f9cd23c
--- /dev/null
+++ b/debian/patches/y.patch
@@ -0,0 +1,69 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ cdo (1.5.6.1+dfsg.1-1) unstable; urgency=low
+ .
+ * New upstream release
+ * Standards-Version: 3.9.3
+ * Don't use MPI builds. PIO code not included yet.
+Author: Alastair McKinstry <mckinstry at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- cdo-1.5.6.1+dfsg.1.orig/m4/acx_options.m4
++++ cdo-1.5.6.1+dfsg.1/m4/acx_options.m4
+@@ -339,39 +339,6 @@ AC_ARG_WITH([proj],
+ [AC_MSG_CHECKING([for the PROJ library])
+ AC_MSG_RESULT([suppressed])])
+ # ----------------------------------------------------------------------
+-# Compile application with MAGICS
+-MAGICS_ROOT=''
+-MAGICS_INCLUDE=''
+-MAGICS_LIBS=''
+-AC_ARG_WITH([magics],
+- [AS_HELP_STRING([--with-magics=<yes|no|directory>],[location of magics library (lib and include subdirs)])],
+- [AS_CASE(["$with_magics"],
+- [no],[AC_MSG_CHECKING([for magics library])
+- AC_MSG_RESULT([suppressed])],
+- [yes],[AC_CHECK_HEADERS([magics_api.h])
+- AC_SEARCH_LIBS([mag_open],
+- [MagPlus],
+- [AC_DEFINE([HAVE_LIBMAGICS],[1],[Define to 1 for MAGICS support])],
+- [AC_MSG_ERROR([Could not link to magics library])])
+- AC_SUBST([MAGICS_LIBS],[" -lMagPlus"])],
+- [*],[AS_IF([test -d "$with_magics"],
+- [MAGICS_ROOT=$with_magics
+- LDFLAGS="-L$MAGICS_ROOT/lib $LDFLAGS"
+- CPPFLAGS="-I$MAGICS_ROOT/include/magics $CPPFLAGS"
+- AC_CHECK_HEADERS([magics_api.h])
+- AC_SEARCH_LIBS([mag_open],
+- [MagPlus],
+- [AC_DEFINE([HAVE_LIBMAGICS],[1],[Define to 1 for MAGICS support])],
+- [AC_MSG_ERROR([Could not link to magics library])])
+- MAGICS_LIBS=" -L$MAGICS_ROOT/lib -lMagPlus"
+- MAGICS_INCLUDE=" -I$MAGICS_ROOT/include/magics"],
+- [AC_MSG_NOTICE([$with_magics is not a directory! MAGICS suppressed])])])],
+- [AC_MSG_CHECKING([for MAGICS library])
+- AC_MSG_RESULT([suppressed])])
+-AC_SUBST([MAGICS_ROOT])
+-AC_SUBST([MAGICS_INCLUDE])
+-AC_SUBST([MAGICS_LIBS])
+-# ----------------------------------------------------------------------
+ # How to build CDI into CDO?
+ INTERNAL_CDI_DIR=libcdi
+ # At the moment, there are two possible CDI bindings
diff --git a/debian/python-cdo.substvars b/debian/python-cdo.substvars
new file mode 100644
index 0000000..abd3ebe
--- /dev/null
+++ b/debian/python-cdo.substvars
@@ -0,0 +1 @@
+misc:Depends=
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b02340a
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+
+# The magic debhelper rule
+%:
+ dh $@
+
+DESTDIR:=`pwd`/debian/tmp/
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+CFLAGS += -fPIC
+CPPFLAGS = -DgFortran
+
+ARCH:=$(shell dpkg --print-architecture)
+WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
+WITH_JASPER:= --with-jasper=/usr
+
+# grib-api not available on these arches; jasper is only needed for grib-api
+ifeq ($(ARCH), mips)
+ WITH_GRIB:=
+ WITH_JASPER:=
+endif
+ifeq ($(ARCH), hppa)
+ WITH_GRIB:=
+ WITH_JASPER:=
+endif
+ifeq ($(ARCH), sparc)
+ WITH_GRIB:=
+ WITH_JASPER:=
+endif
+
+override_dh_auto_clean:
+ dh_auto_clean || echo "distclean ok"
+ rm -f Makefile missing config.status config.log libcdi/tests/libcdi.a
+ rm -f config/compile config/mkinstalldirs config/config.guess config/config.sub
+ rm -f src/config.h.in aclocal.m4 config/depcomp config/install-sh config/ltmain.sh config/missing configure INSTALL
+ rm -f libcdi/INSTALL libcdi/aclocal.m4 m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
+ rm -f libcdi/m4/libtool.m4 libcdi/m4/ltoptions.m4 libcdi/m4/ltversion.m4 libcdi/configure
+ rm -f libcdi/config/config.guess libcdi/config/config.sub libcdi/config/depcomp libcdi/config/install-sh
+ rm -f libcdi/config/ltmain.sh libcdi/config/missing libcdi/config/mkinstalldirs
+ find . -name Makefile.in -delete
+ find . -type l -delete
+ rm -rf src/.deps
+
+
+override_dh_auto_configure:
+ ln -sf /usr/include/cfortran.h libcdi/src/cfortran.h
+ dh_autoreconf
+ LDFLAGS="-Wl,--as-needed"
+ ./configure --prefix=/usr --libdir=$(LIBDIR) \
+ --enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr --with-proj=/usr --with-hdf5=/usr \
+ --enable-iso-c-interface \
+ $(WITH_GRIB) $(WITH_JASPER) FC=gfortran LIBS="-Wl,-Bstatic -lpng12 -ljasper -ljpeg -lz -Wl,-Bdynamic -lcurl"
+ rm -f libtool libcdi/libtool
+ ln -sf /usr/bin/libtool libtool
+ ln -sf /usr/bin/libtool libcdi/libtool
+
+override_dh_auto_install:
+ dh_auto_install
+ dh_link -p libcdi0 $(LIBDIR)/libcdi.so.0.0.0 $(LIBDIR)/libcdi.so.0
+ dh_link -p libcdi-dev $(LIBDIR)/libcdi.so.0.0.0 $(LIBDIR)/libcdi.so
+ mkdir -p $(DESTDIR)/etc/bash_completion.d $(DESTDIR)//usr/share/zsh/functions/Completion/Linux
+ cp contrib/cdoCompletion.bash $(DESTDIR)/etc/bash_completion.d/cdo
+ cp contrib/cdoCompletion.zsh $(DESTDIR)//usr/share/zsh/functions/Completion/Linux/_cdo
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..266a073
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1 @@
+cdo source: package-needs-versioned-debhelper-build-depends 9
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..8f04d6d
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+compression = "bzip2"
diff --git a/debian/watch.broken b/debian/watch.broken
new file mode 100644
index 0000000..cceab1a
--- /dev/null
+++ b/debian/watch.broken
@@ -0,0 +1,3 @@
+version=3
+opts=downloadurlmangle=s/prcode/code/ \
+https://code.zmaw.de/projects/cdo/files https://prcode.zmaw.de/attachments/download/[\d]*/cdo-([\d\.]*).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git
More information about the debian-science-commits
mailing list