debian/: Scrap CDBS; use dh(1) instead.

diff --git a/Makefile.am b/Makefile.am
index 5a6117e..4b5312b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,6 +115,7 @@ EXTRA_DIST          += debian/rules
 EXTRA_DIST             += debian/control
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/changelog
+EXTRA_DIST             += debian/compat
 
 EXTRA_DIST             += debian/xtoys.install
 

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

diff --git a/debian/control b/debian/control
index e46350d..c0767b5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xtoys
 Section: x11
 Priority: extra
 Build-Depends:
-       libx11-dev, mlib-dev (>= 2.0.4), debhelper (>= 5),
+       libx11-dev, mlib-dev (>= 2.0.4), debhelper (>= 8),
        python-central, python (>= 2.4), python-gtk2
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4

diff --git a/debian/rules b/debian/rules
index 7aa6821..cec98bb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,2 @@
 #! /usr/bin/make -f
-
-CDBS = /usr/share/cdbs/1
-include $(CDBS)/rules/debhelper.mk
-include $(CDBS)/class/autotools.mk
-
-DEB_BUILDDIR = $(CURDIR)/build
-
-binary-install/xtoys-gtk::
-       dh_pycentral -pxtoys-gtk
+%:; dh $@ --parallel -Bdebian/build