From 6bec75fe3e7da1eaa9259fdc69efd381c1a06090 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 16 Jul 2013 15:35:48 +0100 Subject: [PATCH] debian: Switch to plain debhelper rather than CDBS. --- Makefile.am | 1 + debian/.gitignore | 1 - debian/compat | 1 + debian/control | 2 +- debian/rules | 12 +----------- 5 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 debian/compat diff --git a/Makefile.am b/Makefile.am index 31e97ca..f4fb2ee 100644 --- 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 e36bd48..643ce57 100644 --- 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 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control index 0e34a93..ccfde9f 100644 --- 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 Standards-Version: 3.1.1 diff --git a/debian/rules b/debian/rules index abe7ec8..8817962 100755 --- 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 -- 2.11.0