[instant] 01/01: Enable Python 3 support

[Johannes Ring]

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

johannr-guest pushed a commit to branch master
in repository instant.

commit 291da09c7a555eebff6c72f09658e9383629b317
Author: Johannes Ring <johannr at simula.no>
Date:   Tue Jan 17 13:51:05 2017 +0100

    Enable Python 3 support
---
 debian/changelog                         |  7 ++++
 debian/control                           | 55 +++++++++++++++++++++++++++-----
 debian/python-instant.lintian-overrides  |  2 ++
 debian/python3-instant.lintian-overrides |  2 ++
 debian/rules                             | 17 +++++++++-
 5 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e1ab71..d89ee94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+instant (2016.2.0-2) UNRELEASED; urgency=medium
+
+  * Support Python 3.
+  * d/control: Add python-six to Depends.
+
+ -- Johannes Ring <johannr at simula.no>  Tue, 13 Dec 2016 13:49:00 +0100
+
 instant (2016.2.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 064b74b..e128da1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,58 @@ Section: python
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Johannes Ring <johannr at simula.no>
-Build-Depends: debhelper (>= 9), python-all (>= 2.7)
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python-all (>= 2.7),
+ python3-all (>= 3.4),
+ python-setuptools,
+ python3-setuptools
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.4
 Homepage: http://fenicsproject.org
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/fenics/instant.git
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/fenics/instant.git
 
 Package: python-instant
 Architecture: all
-Depends: pkg-config, swig, python-dev, build-essential, cmake,
- ${python:Depends}, ${misc:Depends}
-Recommends: python-numpy
-Description: simple inlining of C / C++ code in Python
- Instant is a Python module that allows for instant inlining of C and C++ code
- in Python. It is a small Python module built on top of SWIG and Distutils.
- It is part of the FEniCS project (http://fenicsproject.org).
+Depends:
+ build-essential,
+ cmake,
+ swig,
+ pkg-config,
+ python-dev,
+ python-six,
+ python-numpy,
+ ${python:Depends},
+ ${misc:Depends}
+Description: simple inlining of C/C++ code in Python 2
+ Instant is a Python module that allows for instant inlining of C and
+ C++ code in Python. It is a small Python module built on top of SWIG
+ and Distutils.
+ .
+ Instant is part of the FEniCS project <https://fenicsproject.org>.
+ .
+ This package installs the library for Python 2.
+
+Package: python3-instant
+Architecture: all
+Depends:
+ build-essential,
+ cmake,
+ swig,
+ pkg-config,
+ python3-dev,
+ python3-six,
+ python3-numpy,
+ ${python3:Depends},
+ ${misc:Depends}
+Description: simple inlining of C/C++ code in Python 3
+ Instant is a Python module that allows for instant inlining of C and
+ C++ code in Python. It is a small Python module built on top of SWIG
+ and Distutils.
+ .
+ Instant is part of the FEniCS project <https://fenicsproject.org>.
+ .
+ This package installs the library for Python 3.
diff --git a/debian/python-instant.lintian-overrides b/debian/python-instant.lintian-overrides
new file mode 100644
index 0000000..f9a0151
--- /dev/null
+++ b/debian/python-instant.lintian-overrides
@@ -0,0 +1,2 @@
+python-instant: library-package-name-for-application usr/bin/instant-clean usr/bin/instant-showcache
+python-instant: application-in-library-section python usr/bin/instant-clean usr/bin/instant-showcache
diff --git a/debian/python3-instant.lintian-overrides b/debian/python3-instant.lintian-overrides
new file mode 100644
index 0000000..46cae96
--- /dev/null
+++ b/debian/python3-instant.lintian-overrides
@@ -0,0 +1,2 @@
+python3-instant: library-package-name-for-application usr/bin/instant-clean-3 usr/bin/instant-showcache-3
+python3-instant: application-in-library-section python usr/bin/instant-clean-3 usr/bin/instant-showcache-3
diff --git a/debian/rules b/debian/rules
index efded95..27da2c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,24 @@
 #!/usr/bin/make -f
 
+#export DH_VERBOSE=1
+export PYBUILD_NAME=instant
+export PYBUILD_DISABLE=test
+
 USCAN_DESTDIR := $(CURDIR)
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_clean:
+	dh_clean
+	rm -rf *.egg-info
+
+override_dh_install:
+	dh_install
+	mv debian/python3-instant/usr/bin/instant-clean debian/python3-instant/usr/bin/instant-clean-3
+	mv debian/python3-instant/usr/bin/instant-showcache debian/python3-instant/usr/bin/instant-showcache-3
+	mv debian/python3-instant/usr/share/man/man1/instant-clean.1.gz debian/python3-instant/usr/share/man/man1/instant-clean-3.1.gz
+	mv debian/python3-instant/usr/share/man/man1/instant-showcache.1.gz debian/python3-instant/usr/share/man/man1/instant-showcache-3.1.gz
 
 .PHONY: get-orig-source
 get-orig-source:

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