[cdo] 42/84: Refresh patches

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdo.

commit 8f80b5446397cc77a68ca75d8489eac9c8dc7e2e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 15 10:44:39 2013 +0000

    Refresh patches
---
 debian/patches/fix_typos.patch | 24 ++++++++++++------------
 debian/patches/series          |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index d45fc67..88d0c22 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -1,8 +1,8 @@
-Index: cdo-1.5.4+dfsg.1/libcdi/src/grid.c
+Index: cdo-1.6.2+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 @@
+--- cdo-1.6.2+dfsg.1.orig/libcdi/src/grid.c	2013-11-15 10:42:27.000000000 +0000
++++ cdo-1.6.2+dfsg.1/libcdi/src/grid.c	2013-11-15 10:42:57.000000000 +0000
+@@ -3896,8 +3896,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.
@@ -12,8 +12,8 @@ Index: cdo-1.5.4+dfsg.1/libcdi/src/grid.c
 +    @Item  yinc      Y-direction grid length in meter.
      @Item  projflag  Projection centre flag.
      @Item  scanflag  Scanning mode flag.
-  
-@@ -3654,8 +3654,8 @@
+ 
+@@ -3952,8 +3952,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.
@@ -24,11 +24,11 @@ Index: cdo-1.5.4+dfsg.1/libcdi/src/grid.c
      @Item  projflag  Projection centre flag.
      @Item  scanflag  Scanning mode flag.
   
-Index: cdo-1.5.4+dfsg.1/src/operator_help.h
+Index: cdo-1.6.2+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 @@
+--- cdo-1.6.2+dfsg.1.orig/src/operator_help.h	2013-11-15 10:42:27.000000000 +0000
++++ cdo-1.6.2+dfsg.1/src/operator_help.h	2013-11-15 10:42:27.000000000 +0000
+@@ -1443,7 +1443,7 @@
      "",
      "DESCRIPTION",
      "    This module computes periods over all timesteps in ifile where a",
@@ -37,7 +37,7 @@ Index: cdo-1.5.4+dfsg.1/src/operator_help.h
      "    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 @@
+@@ -1455,7 +1455,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",
@@ -46,7 +46,7 @@ Index: cdo-1.5.4+dfsg.1/src/operator_help.h
      "               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 @@
+@@ -4121,7 +4121,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.",
diff --git a/debian/patches/series b/debian/patches/series
index 0179dea..19b5faa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 fix_typos.patch
 ignore.patch
 build-fixes.patch
-disable-tests.patch
+# disable-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git