[27476] in Source-Commits
xdsc commit: Make xdsc build without daconfiscate
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Sun Sep 29 06:56:17 2013
Date: Sun, 29 Sep 2013 06:56:09 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201309291056.r8TAu9mb010232@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/xdsc/commit/9cdba8182ed8d56d0a5c12e58ef0551a9e63b334
commit 9cdba8182ed8d56d0a5c12e58ef0551a9e63b334
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Sun Sep 29 06:37:31 2013 -0400
Make xdsc 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 | 10 +++++-----
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 86c334d..8ce2201 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@
@@ -43,9 +44,9 @@ xdsc: ${OBJS}
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} xdsc ${DESTDIR}${bindir}
${INSTALL} -m 444 ${srcdir}/Xdsc ${DESTDIR}${appdefsdir}
${INSTALL} -m 444 ${srcdir}/xdsc.1 ${DESTDIR}${mandir}/man1
diff --git a/configure.in b/configure.in
index 035424e..fd06e09 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@ AC_INIT(xdsc.c)
AC_PROG_CC
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
AC_PATH_XTRA
diff --git a/debian/changelog b/debian/changelog
index 37c6dfd..11f7579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-debathena-xdsc (10.0.0-0debathena5) UNRELEASED; urgency=low
+debathena-xdsc (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 14:00:00 -0400
debathena-xdsc (10.0.0-0debathena4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d052dee..4032e24 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-xdsc
Section: debathena/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, autoconf, libxt-dev, libxaw7-dev
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, autoconf, automake, libxt-dev, libxaw7-dev
Standards-Version: 3.9.3
Package: debathena-xdsc
diff --git a/debian/rules b/debian/rules
index 52f6256..b458851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
#!/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
-clean::
- rm -f configure
+override_dh_auto_configure:
+ automake --add-missing --foreign || true
+ dh_auto_configure
