[27486] in Source-Commits
libXj commit: Make libXj build without daconfiscate
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Mon Sep 30 03:26:34 2013
Date: Mon, 30 Sep 2013 03:26:26 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201309300726.r8U7QQjE011980@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/libXj/commit/08f0246f1ab40938eb86b09438e874f7d2298348
commit 08f0246f1ab40938eb86b09438e874f7d2298348
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Mon Sep 30 03:12:00 2013 -0400
Make libXj build without daconfiscate
Replace mkinstalldirs with mkdir -p, use automake for the rest, use
dh-autoreconf and debhelper 7.
Makefile.in | 5 +++--
configure.in | 1 +
debian/changelog | 7 ++++++-
debian/control | 2 +-
debian/rules | 12 +++++-------
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 70f3558..e1cb94c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,7 @@ VPATH=@srcdir@
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
RANLIB=@RANLIB@
+MKDIR_P=@MKDIR_P@
srcdir=@srcdir@
top_srcdir=@top_srcdir@
prefix=@prefix@
@@ -54,8 +55,8 @@ sintable: sintable.o
check:
install:
- ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/Jets
+ ${MKDIR_P} ${DESTDIR}${libdir}
+ ${MKDIR_P} ${DESTDIR}${includedir}/Jets
${INSTALL} -m 644 libXj.a ${DESTDIR}${libdir}
${RANLIB} ${DESTDIR}${libdir}/libXj.a
chmod u-w ${DESTDIR}${libdir}/libXj.a
diff --git a/configure.in b/configure.in
index 90a3e8d..e062c05 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AC_INIT(Jets.c)
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_RANLIB
+AC_PROG_MKDIR_P
AC_PATH_XTRA
AC_STRUCT_TIMEZONE
diff --git a/debian/changelog b/debian/changelog
index dd62f04..0ca34f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-debathena-libxj (10.0.0-0debathena3) UNRELEASED; urgency=low
+debathena-libxj (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:01:57 -0400
debathena-libxj (10.0.0-0debathena2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 23a95e3..5b2557e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-libxj
Section: debathena/libs
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, autoconf, libx11-dev, libxext-dev
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, libx11-dev, libxext-dev
Standards-Version: 3.9.3
Package: debathena-libxj-dev
diff --git a/debian/rules b/debian/rules
index 34ee9aa..b458851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +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
-DEB_MAKE_CLEAN_TARGET = clean
-
-clean::
- rm -f sintable.h Makefile config.status config.log configure
+override_dh_auto_configure:
+ automake --add-missing --foreign || true
+ dh_auto_configure
