[med-svn] [khmer] 01/01: Remove python2 hack, use dh pybuild py3 statement

[Kevin Murray]

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

daube-guest pushed a commit to branch big-rebase
in repository khmer.

commit 08dfc9e1571eb9596400fe86532f466b5fe20f3a
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Mon Jul 13 00:09:28 2015 +1000

    Remove python2 hack, use dh pybuild py3 statement
---
 debian/rules | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3c0ace2..e995536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,23 +3,15 @@ export DH_VERBOSE=1
 export PYBUILD_NAME=khmer
 export PYBUILD_SYSTEM=distutils
 export PYBUILD_INSTALL_ARGS='--install-scripts=/usr/lib/khmer/bin'
+
+# Force C++ library build to use Debian zlib1g-dev/libbz2-dev
 export USE_SYSTEM_ZLIB=true
 export USE_SYSTEM_LIBBZ2=true
 
-# dh_python2 renames compiled extensions to include a multiarch triplet
-# ex: _khmermodule.so -> _khmermodule.x86_64-linux-gnu.so
-# While Python can handle the multiarch triplet it can't do so in combination
-# with the 'module' infix. So we remove the 'module' infix before dh_python2
-# runs
-# See https://lists.debian.org/debian-python/2015/02/msg00047.html
-export PYBUILD_AFTER_INSTALL := \
-	mv {destdir}{install_dir}/khmer/_khmermodule.so \
-		{destdir}{install_dir}/khmer/_khmer.so
-
 export PACKAGE_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 
 %:
-	dh $@ --with python2,sphinxdoc --buildsystem=pybuild --parallel
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild --parallel
 
 override_dh_auto_build:
 	dh_auto_build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/khmer.git