[cdo] 22/84: Fix broken test cases

[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 8d22b1d07beea0e9f6a84a9b3f272216c8ff6f11
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri May 24 07:39:56 2013 +0100

    Fix broken test cases
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 debian/rules     | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9f26c94..92d8028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cdo (1.6.0+dfsg.1-2) unstable; urgency=low
+
+  * Need to add path explicitly to find cdo in python test case. 
+  * Make cdo Priority: optional to match override.
+  * release fixed FTBFS on amd64; Closes: #707366.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 24 May 2013 06:59:54 +0100
+
 cdo (1.6.0+dfsg.1-1) unstable; urgency=low
 
   * Don't use -fPIE on amd64, arm*. FTBFS then. 
diff --git a/debian/control b/debian/control
index b90edf8..2884d36 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: cdo
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake, libnetcdf-dev, gfortran, dh-autoreconf,
  libgrib-api-dev [!mips !sparc !hppa], libtool, libjasper-dev, cfortran,  libhdf5-serial-dev, libmagics++-dev,
diff --git a/debian/rules b/debian/rules
index 1fa146e..eb14bb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+TOPDIR=:=`pwd`
 
 # To enable all, uncomment following line
 DEB_BUILD_MAINT_OPTIONS:= hardening=+all
@@ -81,3 +82,6 @@ override_dh_auto_install:
 	cp contrib/cdoCompletion.bash $(DESTDIR)/etc/bash_completion.d/cdo
 	cp contrib/cdoCompletion.zsh $(DESTDIR)//usr/share/zsh/functions/Completion/Linux/_cdo
 
+override_dh_auto_test:
+	# Need to define path to 'cdo' for python tests
+	export PATH=$(PATH):$(TOPDIR)/src make check

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