debian: Abandon CDBS for plain Debhelper.

diff --git a/MANIFEST.in b/MANIFEST.in
index 813894a4e681bf7ef98ed905eb862b251ba8f446..57bb183703973a5908a0e9339be6550cb307bc3e 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,5 +16,5 @@ include pwsafe
 recursive-include catacomb *.py
 
 ## 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 1e98f7c8c67a3d416e6d99ef4469322f50cbf65d..24336eadee98bbcb8382e9eee2e844fb5adcc114 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,7 +5,4 @@ substvars
 *.debhelper
 python-catacomb-bin
 python-catacomb
-python2.?-catacomb
-compat
-pycompat
 *.log

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 069d81d8c9e012efd983b149c7fbcba602b4ffc1..5b91beb0bd3bf55d3dcfae1027f8bc51fe495940 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
 Priority: extra
 XS-Python-Version: >= 2.6, << 2.8
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: catacomb-dev (>= 2.1.2), python, python2.6-dev, python2.7-dev
+Build-Depends: debhelper (>= 9), catacomb-dev (>= 2.1.2),
+       python, python2.6-dev, python2.7-dev
 Standards-Version: 3.8.0
 
 Package: python-catacomb

diff --git a/debian/rules b/debian/rules
index 6ebce3c90c180e385161cabc01ad6741350360b4..cec98bbefd3fecee9c600823051662e275a37f25 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