[pyferret] 35/110: Merge branch 'dev-python3' into debian/experimental/py3

[Alastair McKinstry]

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

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

commit 8e39f421632b816ea456e02ce651fadf08731322
Merge: b6ba197 6bdbae7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Oct 30 14:04:36 2015 +0000

    Merge branch 'dev-python3' into debian/experimental/py3

 debian/bash_completion.d/pyferret |  3 +++
 debian/control                    | 16 +++++++++++++++-
 debian/patches/set-envvars.patch  |  6 +++---
 debian/rules                      | 12 ++++++++----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --cc debian/control
index ecf29d7,a0a2011..31c8b67
--- a/debian/control
+++ b/debian/control
@@@ -7,11 -6,10 +7,11 @@@ Section: scienc
  Priority: optional
  XB-Python-Version: 2.7
  Build-Depends: debhelper (>= 9), gfortran, csh, 
 - libreadline-dev, libcurl4-openssl-dev | libcurl-dev, libncurses-dev, libnetcdf-dev, libxmu-headers, 
 + libreadline-dev, libcurl4-openssl-dev | libcurl-dev, libncurses-dev, 
 + libnetcdf-dev (>= 4.3.0), libnetcdff-dev,
   libxpm-dev, libxt-dev, libcairo2-dev, libpango1.0-dev,
-  python-all-dev, dh-python, python-numpy,
+  python-all-dev, dh-python, python-numpy, python3-all-dev,
 - java-common, openjdk-7-jdk
 + java-common, openjdk-8-jdk, ferret-vis
  
  Package: python-ferret
  Architecture: any
diff --cc debian/rules
index e662057,a49f92c..0963a7e
--- a/debian/rules
+++ b/debian/rules
@@@ -20,18 -23,16 +23,19 @@@ override_dh_auto_build
  	cp site_specific.mk external_functions/ef_utility
  	cp debian/platform_specific.mk.debian .
  	cp debian/ef_utility/platform_specific.mk.debian external_functions/ef_utility/platform_specific.mk.debian
- 	$(MAKE) HOSTTYPE=debian all
  
  override_dh_auto_install:
- 	$(MAKE) HOSTTYPE=debian install
+ 	for p in $(PY2VERS) $(PY3VERS) ; do \
+ 		$(MAKE) HOSTTYPE=debian PYTHON_EXE=$$p clean all install ; \
+ 		done
  	# libpyferret.so needs a link because its linked by externally loaded modules
  	dh_link -p python-ferret /usr/lib/python2.7/dist-packages/pyferret/libpyferret.$(ARCH).so $(LIBDIR)/libpyferret.so
 +	dh_numpy
  
  override_dh_auto_test:
 -	@echo "Tests bypassed for the moment."
 +	# @echo "Tests bypassed for the moment."
 +	# First build necessary files
 +	$(MAKE) -C bench make_stream_file
  	# (cd bench && ./run_all )
  
  override_dh_auto_clean:

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