debian: Switch to plain debhelper rather than CDBS.

diff --git a/Makefile.am b/Makefile.am
index 31e97ca303ad20edcb7876e12706ff7d256c87b6..f4fb2ee4206961723cbf39c33becb7b4799deaa7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,6 +100,7 @@ EXTRA_DIST          += debian/rules
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/control
 EXTRA_DIST             += debian/changelog
+EXTRA_DIST             += debian/compat
 
 ## Library.
 EXTRA_DIST             += debian/libcheckpath1.install

diff --git a/debian/.gitignore b/debian/.gitignore
index e36bd4851d7a691f0a0c6da8204f4e894f3b08e9..643ce57ee8e24f4ab3afd132bdc66460b9cfcd7a 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -10,6 +10,5 @@ checkpath1
 libcheckpath1
 tmpdir
 chkpath
-compat
 stamp-*
 q

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 0e34a939bc282109683f291a08c071bebc043bb7..ccfde9f09625065ccd62429aea190cd3ae6f7697 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: checkpath
 Section: admin
 Priority: extra
-Build-Depends: mlib-dev, cdbs
+Build-Depends: mlib-dev, debhelper (>= 8)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.1.1
 

diff --git a/debian/rules b/debian/rules
index abe7ec8064a05bd7a00f66c6cc5266570bd61ce0..881796298a308f89ee0bcd3eb7426fcdd76da609 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,2 @@
 #! /usr/bin/make -f
-
-CDBS = /usr/share/cdbs/1
-include $(CDBS)/class/autotools.mk
-include $(CDBS)/rules/debhelper.mk
-
-###--------------------------------------------------------------------------
-### General settings.
-
-DEB_BUILDDIR = $(CURDIR)/build
-
-###----- That's all, folks --------------------------------------------------
+%:; dh $@ --builddirectory=debian/build