[cmor] 156/190: Conflict with python*-cmor when testing

[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 e601acb63161d9641e4d8097c251f02a11ce480b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 14 15:57:01 2013 +0100

    Conflict with python*-cmor when testing
---
 debian/changelog | 3 ++-
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d620320..2eaf4f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ cmor (2.8.3-1) unstable; urgency=low
   * Enable all the python tests, for all versions of python.
     (long; but desirable given beta nature of python3 port)
   * Standards-Version: 3.9.4
+  * Build-Conflict: on python packages. For correct testing.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Mon, 31 Dec 2012 11:57:20 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 14 Jun 2012 11:57:20 +0100
 
 cmor (2.8.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 56cd2e1..780a87d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev, libudunits2-dev, libnetcdf-dev, uuid-dev, python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), libgfortran3, automake, python-numpy, gfortran, python3-numpy, python3-all-dev, python3-setuptools
-Build-Conflicts: libcmor2
+Build-Conflicts: libcmor2, python-cmor, python3-cmor
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2

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