[cmor] 126/190: Had the wrong conditional for check on validity for all axes except lon bounds, fixe dnow

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit 72835d249f906660eccc714b13f6c45e38a5dbbb
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Mon Feb 25 16:38:04 2013 -0800

    Had the wrong conditional for check on validity for all axes except lon bounds, fixe dnow
---
 Src/cmor_axes.c |  2 +-
 configure       | 18 +++++++++---------
 configure.ac    |  2 +-
 include/cmor.h  |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Src/cmor_axes.c b/Src/cmor_axes.c
index ac0e1e3..4dfde5a 100644
--- a/Src/cmor_axes.c
+++ b/Src/cmor_axes.c
@@ -809,7 +809,7 @@ int cmor_treat_axis_values(int axis_id, double *values, int length, int n_reques
 
 
   /* now check for valid_min/max things except for longitude bounds */
-  if ((isbounds==0) || (treatlon==0)) {
+  if (((isbounds==1) && (refaxis->axis=='X'))==0) {
     if (refaxis->valid_min!=1.e20) for (i=0;i<length;i++) if (values[i]<refaxis->valid_min) { 
       if (refaxis->axis=='X') {
 	treatlon = 1;
diff --git a/configure b/configure
index 4fe81e9..9973ff9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for cmor 2.8.1.
+# Generated by GNU Autoconf 2.61 for cmor 2.8.3.
 #
 # Report bugs to <doutriaux1 at llnl.gov>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='cmor'
 PACKAGE_TARNAME='cmor'
-PACKAGE_VERSION='2.8.1'
-PACKAGE_STRING='cmor 2.8.1'
+PACKAGE_VERSION='2.8.3'
+PACKAGE_STRING='cmor 2.8.3'
 PACKAGE_BUGREPORT='doutriaux1 at llnl.gov'
 
 ac_default_prefix=/usr/local/cmor
@@ -1188,7 +1188,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cmor 2.8.1 to adapt to many kinds of systems.
+\`configure' configures cmor 2.8.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1254,7 +1254,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cmor 2.8.1:";;
+     short | recursive ) echo "Configuration of cmor 2.8.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1353,7 +1353,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cmor configure 2.8.1
+cmor configure 2.8.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1367,7 +1367,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cmor $as_me 2.8.1, which was
+It was created by cmor $as_me 2.8.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -5000,7 +5000,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cmor $as_me 2.8.1, which was
+This file was extended by cmor $as_me 2.8.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5043,7 +5043,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-cmor config.status 2.8.1
+cmor config.status 2.8.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index ff2759b..b235a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl                                                -*- Autoconf -*-
 dnl  Process this file with autoconf to produce a configure script.
 
 dnl AC_PREREQ(2.59)
-AC_INIT(cmor, 2.8.2, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.8.3, doutriaux1 at llnl.gov)
 
 GIT_TAG=`./get_git_version.sh`
 
diff --git a/include/cmor.h b/include/cmor.h
index 95d8c20..d5fb492 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -3,7 +3,7 @@
 
 #define CMOR_VERSION_MAJOR 2
 #define CMOR_VERSION_MINOR 8
-#define CMOR_VERSION_PATCH 2
+#define CMOR_VERSION_PATCH 3
 
 #define CMOR_CF_VERSION_MAJOR 1
 #define CMOR_CF_VERSION_MINOR 4

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