[cmor] 182/190: Undo python3 for the moment

[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 115837bc1a9c100d51d02721dd8e680e797f3e73
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 31 22:08:02 2014 +0100

    Undo python3 for the moment
---
 debian/control | 11 +----------
 debian/rules   |  7 +++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index c6fde1c..5a9fa4e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,10 @@ Source: cmor
 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-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
 Build-Conflicts: libcmor2, python-cmor, python3-cmor
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.2
 Homepage:  http://www2-pcmdi.llnl.gov/cmor
 
 Package: libcmor2
@@ -49,11 +48,3 @@ Provides: ${python:Provides}
 Description: Python interface to CMOR
  This is a Python interface to CMOR, the Climate Model Output Rewriter.
 
-Package: python3-cmor
-Section: python
-Architecture: any
-Multi-Arch: foreign
-Depends: ${py3deb:Depends}, ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Provides: ${python3:Provides}
-Description: Python3 interface to CMOR
- This is a Python3 interface to CMOR, the Climate Model Output Rewriter.
diff --git a/debian/rules b/debian/rules
index 4a51982..d7e51b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,10 @@ BUILD_ARCH_OS :-= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 
 PYVERS:=$(shell pyversions --supported)
-PY3VERS:=$(shell py3versions --supported)
 DESTDIR:=$(shell pwd)/debian/tmp
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2
 
 override_dh_auto_configure:
 	autoreconf -fiv
@@ -49,14 +48,14 @@ endif
 
 
 # Disabled. Run in piuparts, etc. instead
-#	for p in $(PYVERS) $(PY3VERS) ; do \
+#	for p in $(PYVERS)  ; do \
 		$(MAKE) test_python PYTHONEXEC=$$p DESTDIR=$(DESTDIR)  ; done
 	
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	$(MAKE) install_shlib DESTDIR=$(DESTDIR)
-	for p in $(PYVERS) $(PY3VERS) ; do \
+	for p in $(PYVERS)  ; do \
 		$$p ./setup.py install  --prefix=$(DESTDIR)/usr --install-layout=deb ; \
 		done
 	dh_install -p libcmor2 libcmor.so.2    $(LIBDIR)

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