Switch debian build system to dh

diff --git a/debian/control b/debian/control
index 9123ac10f820adab3b320f6cc92370566d17c262..a387bf99c9dbd4d36b7da60787778b055e951d2b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Jonathan McDowell <noodles@earth.li>
 Uploaders: Ross Burton <ross@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, libdb-dev, nettle-dev, libcurl4-gnutls-dev | libcurl-dev
+Build-Depends: debhelper (>= 7), libdb-dev, nettle-dev, libcurl4-gnutls-dev | libcurl-dev
 Standards-Version: 3.9.4.0
 Homepage: http://www.earth.li/projectpurple/progs/onak.html
 Vcs-Browser: http://the.earth.li/gitweb/?p=onak.git;a=summary

diff --git a/debian/rules b/debian/rules
index baac1267c1a5c82c021db6a3d2992d1221f75ef4..acf47b1923dc5749b63ef8808da3ebb54cbf84df 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-backend=dynamic
 
 CFLAGS += -std=gnu99
+
+%:
+       dh "$@"
+
+override_dh_clean:
+       rm -f config.log configure config.h.in aclocal.m4
+       dh_clean
+
+override_dh_auto_configure:
+       autoreconf
+       dh_auto_configure -- ${DEB_CONFIGURE_EXTRA_FLAGS}