[Python-modules-commits] [simpleparse] 05/09: Switch to pybuild

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository simpleparse.

commit 087e956bbdb6bda9de89037998bcbca3bfc7e238
Author: Vincent Bernat <vincent at bernat.im>
Date:   Sun Dec 25 10:49:00 2016 +0100

    Switch to pybuild
---
 debian/changelog                              |  2 ++
 debian/compat                                 |  2 +-
 debian/control                                |  9 ++++-----
 debian/python-simpleparse-mxtexttools.install |  2 +-
 debian/python-simpleparse.install             | 13 ++++++-------
 debian/rules                                  | 20 ++------------------
 6 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 459e56d..5299080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ simpleparse (2.2.0-1) unstable; urgency=medium
   [ Vincent Bernat ]
   * New upstream release.
     - drop "with"-keyword patch
+    - fix FTBFS (Closes: #824738)
+  * Switch to pybuild.
 
  -- Vincent Bernat <bernat at debian.org>  Sun, 25 Dec 2016 10:39:11 +0100
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index aabaa59..3e0b678 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Vincent Bernat <bernat at debian.org>
-Build-Depends: debhelper (>= 7),
-               cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 7.0.50~),
                dh-python,
                python-all-dev (>= 2.6.6-3~),
                python-setuptools (>= 0.6b3),
-               python-egenix-mxdatetime
+               python-egenix-mxdatetime,
+               python-nose
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/simpleparse.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/simpleparse.git
 Standards-Version: 3.9.6
@@ -16,8 +16,7 @@ Homepage: http://simpleparse.sourceforge.net/
 
 Package: python-simpleparse
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Python-Depends: python-simpleparse-mxtexttools (>= ${binary:Version})
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-simpleparse-mxtexttools (>= ${binary:Version})
 Suggests: python-simpleparse-doc
 Description: simple parser generator for Python
  SimpleParse is a BSD-licensed Python package providing a simple parser
diff --git a/debian/python-simpleparse-mxtexttools.install b/debian/python-simpleparse-mxtexttools.install
index 1d709f5..e5593ac 100644
--- a/debian/python-simpleparse-mxtexttools.install
+++ b/debian/python-simpleparse-mxtexttools.install
@@ -1 +1 @@
-usr/lib/python*/site-packages/simpleparse/stt/TextTools/mxTextTools/*
+usr/lib/python*/dist-packages/simpleparse/stt/TextTools/mxTextTools/*
diff --git a/debian/python-simpleparse.install b/debian/python-simpleparse.install
index b3f8c75..b947530 100644
--- a/debian/python-simpleparse.install
+++ b/debian/python-simpleparse.install
@@ -1,7 +1,6 @@
-usr/lib/python*/site-packages/simpleparse/*.py
-usr/lib/python*/site-packages/simpleparse/common/*.py
-usr/lib/python*/site-packages/simpleparse/tests/*.py
-usr/lib/python*/site-packages/simpleparse/stt/*.py
-usr/lib/python*/site-packages/simpleparse/stt/TextTools/*.py
-usr/lib/python*/site-packages/simpleparse/stt/TextTools/Constants/*.py
-usr/lib/python*/site-packages/simpleparse/xml/*.py
+usr/lib/python*/dist-packages/simpleparse/*.py
+usr/lib/python*/dist-packages/simpleparse/common/*.py
+usr/lib/python*/dist-packages/simpleparse/stt/*.py
+usr/lib/python*/dist-packages/simpleparse/stt/TextTools/*.py
+usr/lib/python*/dist-packages/simpleparse/stt/TextTools/Constants/*.py
+usr/lib/python*/dist-packages/simpleparse/xmlparser/*.py
diff --git a/debian/rules b/debian/rules
index a779127..ecd2737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-binary-predeb/python-simpleparse-doc::
-	chmod 0644 $(CURDIR)/debian/python-simpleparse-doc/usr/share/doc/python-simpleparse-doc/examples/*
-
-install/python-simpleparse::
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	ln -s ../test_printers_garbage.py tests/test_printers_garbage.py
-	for PY in $(shell pyversions -r); do \
-			$$PY debian/runtests.py debian/tmp || exit 1 ; \
-	done
-	rm -f tests/test_printers_garbage.py
-endif
-
-clean::
-	rm -f tests/test_printers_garbage.py
-	rm -rf build
+%:
+	dh $@ --with python2 --buildsystem=pybuild

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/simpleparse.git