debian: Abandon CDBS in favour of plain Debhelper.

diff --git a/MANIFEST.in b/MANIFEST.in
index ddfe10a..2de4ec3 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -35,4 +35,5 @@ include report.pyx
 include str.pyx
 
 ## Debian.
-include debian/rules debian/control debian/changelog debian/copyright
+include debian/rules debian/control debian/changelog
+include debian/copyright debian/compat

diff --git a/debian/.gitignore b/debian/.gitignore
index 7905076..19ca0da 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -4,6 +4,4 @@ substvars
 *.substvars
 *.debhelper
 *.log
-compat
-pycompat
 python-mlib

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9

diff --git a/debian/control b/debian/control
index 4d999f4..1e98292 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: mlib-python
 Section: python
 Priority: extra
 XS-Python-Version: >= 2.6, << 2.8
-Build-Depends: mlib-dev, python, python-pyrex, python2.6-dev, python2.7-dev
+Build-Depends: debhelper (>= 9), mlib-dev,
+       python, python-pyrex, python2.6-dev, python2.7-dev
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.8.0
 

diff --git a/debian/rules b/debian/rules
index 6ebce3c..c224393 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,2 @@
 #! /usr/bin/make -f
-
-CDBS = /usr/share/cdbs/1
-
-DEB_PYTHON_SYSTEM = pycentral
-include $(CDBS)/rules/debhelper.mk
-include $(CDBS)/class/python-distutils.mk
-
-###----- That's all, folks --------------------------------------------------
+%:; dh $@ --parallel -Bdebian/build --with=python-central