[med-svn] [python-pbh5tools] 01/06: Use pybuild on setup.py instead of hacking the upstream Makefile

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository python-pbh5tools.

commit b4b5a89a48724322e89273685211517221bbca8e
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Wed Aug 12 23:44:00 2015 -0700

    Use pybuild on setup.py instead of hacking the upstream Makefile
---
 debian/control                   |  3 +++
 debian/patches/remove-cram.patch | 11 -----------
 debian/patches/series            |  2 --
 debian/patches/setup.patch       | 11 -----------
 debian/rules                     |  5 ++---
 5 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 7c3edae..3ab6af2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,10 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Afif Elghraoui <afif at ghraoui.name>
 Build-Depends: debhelper (>= 9),
+	       dh-python,
+	       python,
 	       python-setuptools,
+	       python-pbcore,
 	       python-sphinx,
 	       python-nose,
 	       pandoc
diff --git a/debian/patches/remove-cram.patch b/debian/patches/remove-cram.patch
deleted file mode 100644
index 1bc2542..0000000
--- a/debian/patches/remove-cram.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python-pbh5tools.orig/Makefile
-+++ python-pbh5tools/Makefile
-@@ -23,7 +23,7 @@
- 	sphinx-apidoc -T -f -o doc src/ && cd doc && make html
- 
- examples:
--	cram doc/examples.t
-+#	cram doc/examples.t
- 	sed 's/^  /    /' doc/examples.t > doc/examples.md
- 
- example-rendered: examples
diff --git a/debian/patches/series b/debian/patches/series
index 38524b7..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-setup.patch
-remove-cram.patch
diff --git a/debian/patches/setup.patch b/debian/patches/setup.patch
deleted file mode 100644
index b678e19..0000000
--- a/debian/patches/setup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python-pbh5tools.orig/Makefile
-+++ python-pbh5tools/Makefile
-@@ -11,7 +11,7 @@
- 	python setup.py bdist --formats=egg
- 
- install:
--	python setup.py install
-+	python setup.py install --root=$(DESTDIR) --install-layout=deb
- 
- develop:
- 	python setup.py develop
diff --git a/debian/rules b/debian/rules
index 0422a71..8af6c55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,10 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-DESTDIR=`pwd`/debian/tmp/
-export DESTDIR
+export PYBUILD_NAME = pbh5tools
 
 %:
-	dh $@ --with python2
+	LC_ALL=C.UTF-8 dh $@ --with python2 --buildsystem=pybuild
 
 # cram is not in Debian, but required to run the tests.
 # This override skips building the tests to allow full package build in

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