From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 15 Jul 2014 22:33:30 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/checkpath
X-Git-Tag: 1.2.3~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/checkpath/commitdiff_plain/560879558a5486f4d201e0fed0736d1ee50b16e8?hp=efea3778bb80651e6b46cce26c49a1d5f5f69a98

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/checkpath

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/checkpath:
  debian/control: Correct version number for mLib.
  debian: Switch to plain debhelper rather than CDBS.
  chkpath.c, utils.c: Missing includes.
  Build: Use `silent-rules'.
---

diff --git a/Makefile.am b/Makefile.am
index b23bcbc..f4fb2ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,11 +73,11 @@ CLEANFILES		+= checkpath.pc
 EXTRA_DIST		+= checkpath.pc.in
 
 checkpath.pc: checkpath.pc.in Makefile
-	$(top_srcdir)/config/confsubst $(srcdir)/checkpath.pc.in >$@.new \
+	$(AM_V_GEN)$(top_srcdir)/config/confsubst \
+		$(srcdir)/checkpath.pc.in >$@.new \
 		prefix=$(prefix) exec_prefix=$(exec_prefix) \
 		libdir=$(libdir) includedir=$(includedir) \
-		VERSION=$(VERSION)
-	mv $@.new $@
+		VERSION=$(VERSION) && mv $@.new $@
 
 ###--------------------------------------------------------------------------
 ### Other finishing touches.
@@ -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/chkpath.c b/chkpath.c
index 08c39c7..7dea761 100644
--- a/chkpath.c
+++ b/chkpath.c
@@ -43,6 +43,7 @@
 #include <mLib/report.h>
 
 #include "checkpath.h"
+#include "utils.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
diff --git a/configure.ac b/configure.ac
index f433382..759333e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ mdw_AUTO_VERSION
 AC_INIT([Checkpath], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([checkpath.c])
 AC_CONFIG_AUX_DIR([config])
+mdw_SILENT_RULES
 AM_INIT_AUTOMAKE([foreign])
 
 dnl--------------------------------------------------------------------------
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..8ebaa64 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 (>= 2.0.4), debhelper (>= 8)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 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
diff --git a/utils.c b/utils.c
index 883a219..6182d08 100644
--- a/utils.c
+++ b/utils.c
@@ -29,6 +29,7 @@
 #include "config.h"
 
 #include <ctype.h>
+#include <stdlib.h>
 
 #include <sys/types.h>