debian: Dump CDBS in favour of plain Debhelper.

diff --git a/Makefile.am b/Makefile.am
index 64eeabfb69dad364fd546647eab3de63257ea255..f660e70f672f936f2eb72956ca9eb55f469d440d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,6 +305,7 @@ EXTRA_DIST          += debian/rules
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/control
+EXTRA_DIST             += debian/compat
 
 ## What to install where.
 EXTRA_DIST             += debian/inst

diff --git a/debian/.gitignore b/debian/.gitignore
index bbb9628b87b351310b601548d86e53e36c41c1d1..d7c93da8374baf66be2f75aaf4a7cf70b7c1e473 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -20,4 +20,3 @@ inplace
 *.install
 stamp-*
 tmp
-compat

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 9af2b325f97d2bd9d37a009d06868dd8420fae51..55fa6dd08bc653b9a1e05d86d0b8a89cd38a1eff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nsict-utils
 Section: utils
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: tinycdb, cdbs, python, python-cdb,
+Build-Depends: tinycdb, debhelper (>= 9), python, python-cdb,
  catacomb-dev (>= 2.1.1), mlib-dev (>= 2.0.4), libspamc-dev, libcdb-dev
 Standards-Version: 3.1.1
 

diff --git a/debian/rules b/debian/rules
index 27cc80f7a4bc720b4bb8dce7602332824c6711e2..f04c6f86885e6ec27454257f10a63a63ac5de4b8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,10 @@
 #! /usr/bin/make -f
 
-CDBS = /usr/share/cdbs/1
+DH_OPTIONS = --parallel --builddir=debian/build
+%:; dh $@ $(DH_OPTIONS)
 
-include $(CDBS)/class/autotools.mk
-include $(CDBS)/rules/debhelper.mk
-
-###--------------------------------------------------------------------------
-### General settings.
-
-DEB_BUILDDIR = $(CURDIR)/build
-
-###--------------------------------------------------------------------------
-### Correct configuration.
-
-DEB_CONFIGURE_EXTRA_FLAGS = \
-       --with-perlmoddir=/usr/share/perl5
+override_dh_auto_configure:
+       dh_auto_configure -- --with-perlmoddir=/usr/share/perl5
 
 ###--------------------------------------------------------------------------
 ### Installation.
@@ -22,15 +12,21 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 ### Rather than have lots (and /lots/) of little *.install files, we just
 ### have one big list of everything and split it out as we go.
 
-clean::; rm -f debian/*.install
-
-$(addprefix install/, $(DEB_ALL_PACKAGES)):: install/%: debian/%.install
-
-debian/%.install: debian/inst
-       while read file pkg dir; do \
-         if [ "$$pkg" = "$*" ]; then \
-           echo "debian/tmp$$dir/$$file"; \
-         fi; \
-       done <debian/inst >$@.new && mv $@.new $@
+override_dh_clean:
+       dh_clean
+       rm -f debian/*.install debian/*.stamp
+
+override_dh_install: debian/install-files.stamp
+       dh_install
+
+debian/install-files.stamp: debian/inst
+       rm -f debian/*.install debian/*.install.new
+       pkgs=" "; while read file pkg dir; do \
+         case "$$pkgs" in *" $$pkg "*) ;; *) pkgs="$$pkgs$$pkg ";; esac; \
+         echo "debian/tmp$$dir/$$file" >>debian/$$pkg.install.new; \
+       done <debian/inst; \
+       for pkg in $$pkgs; do \
+         mv debian/$$pkg.install.new debian/$$pkg.install; \
+       done
 
 ###----- That's all, folks --------------------------------------------------