debian/rules: Switch to Debhelper for building.

diff --git a/debian/.gitignore b/debian/.gitignore
index 8f17807515789766d5f0668b279be5a9c3669c5f..5b88400f583ba63582829ef0a7877778e68a492b 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -2,6 +2,6 @@ files
 *.debhelper
 tmp
 cfd
 *.debhelper
 tmp
 cfd

-compat

 stamp-*
 *.log
 stamp-*
 *.log

+*.substvars

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 cbe7595f3e6227ecc0216d485194b7d0fc6cebf5..0355e9c2ef715e09aa68930f7148ffe0eeb1d369 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: cfd
 Section: devel
 Priority: extra
 Maintainer: Mark Wooding <mdw@nsict.org>
 Section: devel
 Priority: extra
 Maintainer: Mark Wooding <mdw@nsict.org>

+Build-Depends: debhelper (>> 8.9)

 Standards-Version: 3.1.1
 
 Package: cfd
 Architecture: all
 Standards-Version: 3.1.1
 
 Package: cfd
 Architecture: all

-Recommends: autoconf (<< 2.50) | autoconf2.13, automake
+Recommends: autoconf, automake

 Description: A collection of miscellaneous bits of build system.
  The common files distribution (CFD) contains standard boilerplate files
  and some handy autoconf macros.  It also contains some scripts which
 Description: A collection of miscellaneous bits of build system.
  The common files distribution (CFD) contains standard boilerplate files
  and some handy autoconf macros.  It also contains some scripts which

diff --git a/debian/rules b/debian/rules
index 21eca792aacd7358a23a85824e00b5b909a45121..881796298a308f89ee0bcd3eb7426fcdd76da609 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,2 @@
 #! /usr/bin/make -f
 #! /usr/bin/make -f

-
-CDBS = /usr/share/cdbs/1
-include $(CDBS)/rules/debhelper.mk
-include $(CDBS)/class/autotools.mk
-
-DEB_BUILDDIR = build
-
-install/cfd::
-       rm -f debian/cfd/usr/share/info/dir
+%:; dh $@ --builddirectory=debian/build