[cmor] 04/22: * Add experimental python3 support * Add libsz support via libaec-dev * Add Heimdall-gssapi support

[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 aa841e1ca29e308463a6c692a979ff2367a63b04
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 8 16:51:42 2016 +0100

    * Add experimental python3 support
    * Add libsz support via libaec-dev
    * Add Heimdall-gssapi support
---
 debian/changelog |  8 ++++++++
 debian/control   |  2 ++
 debian/rules     | 11 ++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4202a82..0062f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ cmor (3.1.2-1) UNRELEASED; urgency=medium
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 17 Jun 2016 16:16:11 +0100
 
+cmor (2.9.3-2) experimental; urgency=medium
+
+  * Add experimental python3 support
+  * Add libsz support via libaec-dev
+  * Add Heimdall-gssapi support	
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 08 Aug 2016 16:45:37 +0100
+
 cmor (2.9.3-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c45ec86..6ab5014 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev,
  python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), python-numpy,
  libgfortran3, automake, gfortran, pkg-config,
  libhdf5-serial-dev | libhdf5-dev,
+ libaec-dev,
+ heimdal-multidev
 Build-Conflicts: libcmor2, python-cmor, python3-cmor
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.6
diff --git a/debian/rules b/debian/rules
index c247cf5..f48347e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 NETCDF_LIBS := $(shell pkg-config --libs heimdal-gssapi netcdf libffi)
 
 PYVERS:=$(shell pyversions --supported)
+PY3VERS:=$(shell py3versions --supported)
 DESTDIR:=$(shell pwd)/debian/tmp
 
 export CFLAGS:=-I/usr/include/ossp  -fstack-protector \
@@ -37,12 +38,12 @@ override_dh_auto_configure:
 	autoreconf -fiv
 	ln -sf  /usr/share/misc/config.sub 
 	dh_auto_configure -- --disable-color --enable-verbose-test  --with-uuid --without-python \
-		UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" SZLIBFLAGS=nosz \
-		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+		UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" SZLIBFLAGS=" -lsz"
 
 override_dh_auto_clean:
 	rm -rf config.sub config.log config.status libcmor.a libcmor.so.2 build test_grid configure CMIP5
-	rm -f ipcc_test_code Makefile setup.py *.mod compile_line.txt include/cmor_locale.h cmor.pc
+	rm -f ipcc_test_code Makefile setup.py *.mod compile_line.txt include/cmor_locale.h cmor.pc test_unit_cat_unique
 	find . -name '*.nc' -delete
 	find . -name '*.o' -delete
 	find .  -name '*.pic_o' -delete
@@ -67,7 +68,7 @@ endif
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	$(MAKE) install_shlib DESTDIR=$(DESTDIR)
-	for p in $(PYVERS)  ; do \
+	for p in $(PYVERS) $(PY3VERS)  ; do \
 		$$p ./setup.py install  --prefix=$(DESTDIR)/usr --install-layout=deb ; \
 		done
 	dh_install -p libcmor2 libcmor.so.2    $(LIBDIR)
@@ -75,4 +76,4 @@ override_dh_auto_install:
 	dh_install -p libcmor-dev cmor.pc  $(LIBDIR)/pkgconfig
 	dh_link -p libcmor-dev $(LIBDIR)/libcmor.so.2   $(LIBDIR)/libcmor.so
 	dh_numpy
-	# dh_numpy3
+	dh_numpy3

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