[27480] in Source-Commits
xcluster commit: Make xcluster build without daconfiscate
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Sun Sep 29 20:25:23 2013
Date: Sun, 29 Sep 2013 20:25:16 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201309300025.r8U0PG6R013155@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/xcluster/commit/0c9f18c1b4432a6faa5a86ac7e4e8875ecc87e1e
commit 0c9f18c1b4432a6faa5a86ac7e4e8875ecc87e1e
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Sun Sep 29 07:15:14 2013 -0400
Make xcluster build without daconfiscate
Replace mkinstalldirs with mkdir -p, use automake for the rest, use
dh-autoreconf and debhelper 7.
Makefile.in | 7 ++++---
configure.in | 1 +
debian/changelog | 7 ++++++-
debian/control | 2 +-
debian/rules | 17 +++++++++++------
5 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 102b40c..ad583c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ SHELL=/bin/sh
VPATH=@srcdir@
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
+MKDIR_P=@MKDIR_P@
srcdir=@srcdir@
top_srcdir=@top_srcdir@
prefix=@prefix@
@@ -46,9 +47,9 @@ cview: ${COBJS}
check:
install:
- ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
- ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
- ${top_srcdir}/mkinstalldirs ${DESTDIR}${appdefsdir}
+ ${MKDIR_P} ${DESTDIR}${bindir}
+ ${MKDIR_P} ${DESTDIR}${mandir}/man1
+ ${MKDIR_P} ${DESTDIR}${appdefsdir}
${INSTALL_PROGRAM} xcluster ${DESTDIR}${bindir}
${INSTALL_PROGRAM} cview ${DESTDIR}${bindir}
${INSTALL} -m 444 ${srcdir}/xcluster.1 ${DESTDIR}${mandir}/man1
diff --git a/configure.in b/configure.in
index 0904d01..fb4d12b 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@ AC_INIT(xcluster.c)
AC_PROG_CC
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
AC_PATH_XTRA
ATHENA_HESIOD
diff --git a/debian/changelog b/debian/changelog
index 8ec53b3..1ae5710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-debathena-xcluster (10.0.0-0debathena3) UNRELEASED; urgency=low
+debathena-xcluster (10.0.1-0debathena1) UNRELEASED; urgency=low
+ [ Jonathan Reed ]
* Bump debian/compat to 6
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ [ Victor Vasiliev ]
+ * Make package build without daconfiscate
+ * Use debhelper 7
+
-- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:59:58 -0400
debathena-xcluster (10.0.0-0debathena2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b27f724..4d62c21 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-xcluster
Section: debathena/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, autoconf, libhesiod-dev, debathena-libxj-dev, libx11-dev, libxmu-dev
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, debathena-aclocal, libhesiod-dev, debathena-libxj-dev, libx11-dev, libxmu-dev
Standards-Version: 3.9.3
Package: debathena-xcluster
diff --git a/debian/rules b/debian/rules
index 6397020..7745622 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,15 @@
#!/usr/bin/make -f
-DEB_AUTO_UPDATE_AUTOCONF = 2.50
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+ dh $@ --with autoreconf
-DEB_CONFIGURE_EXTRA_FLAGS += --with-hesiod
+override_dh_auto_configure:
+ automake --add-missing --foreign || true
+ dh_auto_configure -- --with-hesiod
-clean::
- rm -f configure
+# For reasons I was unable to ascertain, dh_auto_test
+# tries to build check.c as a standalone file, even
+# though 'make check' is empty and even when it is
+# removed.
+override_dh_auto_test:
+ true
