[Debian-astro-commits] [xpa] 01/03: Use autoreconf

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository xpa.

commit e7060f6dbc0fd05d11160fb61ee7b64db7ccaa56
Author: Ole Streicher <ole at aip.de>
Date:   Mon Jun 6 11:31:32 2016 +0200

    Use autoreconf
---
 debian/changelog                   |  6 ++++
 debian/control                     |  6 +++-
 debian/patches/fix_AC_DEFINE.patch | 65 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  2 +-
 5 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbed748..e493d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xpa (2.1.17-6) UNRELEASED; urgency=medium
+
+  * Use autoreconf
+
+ -- Ole Streicher <olebole at debian.org>  Mon, 06 Jun 2016 11:31:21 +0200
+
 xpa (2.1.17-5) unstable; urgency=low
 
   * Allow stderr in CI tests
diff --git a/debian/control b/debian/control
index 2f7c49a..9422651 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,11 @@ Section: science
 Priority: optional
 Maintainer: Debian Astro Team <debian-astro-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <olebole at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 9), libxt-dev, tcl-dev
+Build-Depends: autotools-dev,
+               debhelper (>= 9),
+               dh-autoreconf,
+               libxt-dev,
+               tcl-dev
 Standards-Version: 3.9.8
 Homepage: http://hea-www.harvard.edu/RD/xpa/
 Vcs-Git: https://anonscm.debian.org/git/debian-astro/packages/xpa.git
diff --git a/debian/patches/fix_AC_DEFINE.patch b/debian/patches/fix_AC_DEFINE.patch
new file mode 100644
index 0000000..a9e403d
--- /dev/null
+++ b/debian/patches/fix_AC_DEFINE.patch
@@ -0,0 +1,65 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Add a description to AC_DEFINEs
+ This is needed for modern autoheader call.
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,8 +65,8 @@
+   AC_MSG_RESULT($fun_ok)
+   AC_CHECK_LIB(pthread, pthread_create, have_pthread=yes)
+   if test  x"${have_pthread}" = x"yes"; then
+-    AC_DEFINE(HAVE_LIBPTHREAD)
+-    AC_DEFINE(_REENTRANT)
++    AC_DEFINE(HAVE_LIBPTHREAD,1,[flagging PThread])
++    AC_DEFINE(_REENTRANT,1,[flagging reentrancy])
+     TLIB="-lpthread"
+   else
+     AC_MSG_ERROR([no threads found ... can't use enable-threaded-xpans], 1)
+@@ -106,7 +106,7 @@
+ 
+ AC_PATH_XTRA
+ if test x"${have_x}" = "xyes"; then
+-    AC_DEFINE(HAVE_XT)
++    AC_DEFINE(HAVE_XT,1, [flagging XTRA])
+ fi
+ 
+ SC_PATH_TCLCONFIG
+@@ -122,12 +122,12 @@
+         TCL_LIBS="$TCL_LIB_SPEC"
+         AC_MSG_RESULT([Tcl support will utilize library: $TCL_LIBS])
+       fi
+-      AC_DEFINE(HAVE_TCL)
++      AC_DEFINE(HAVE_TCL,1, [Tcl support])
+     else
+       if test x"${with_tclconfig}" != x ; then
+         TCL_CFLAGS="$TCL_INCLUDE_SPEC"
+         TCL_LIBS="$TCL_LIB_SPEC"
+-        AC_DEFINE(HAVE_TCL)
++        AC_DEFINE(HAVE_TCL,1, [Tcl support])
+         AC_MSG_RESULT([warning: tcl.h not found with --with-tcl ... tcl build might fail])
+       else
+         AC_MSG_RESULT([$TCL_PREFIX/include/tcl.h not found ... use --with-tcl to build tcl explicitly])
+@@ -154,7 +154,7 @@
+   AC_MSG_RESULT(yes ($withval))
+   GTK_CFLAGS="`pkg-config gtk+-2.0 --cflags` -DHAVE_GTK=1"
+   GTK_LIBS="`pkg-config gtk+-2.0 --libs`"
+-  AC_DEFINE(HAVE_GTK)
++  AC_DEFINE(HAVE_GTK, 1, [flagging GTK])
+ else
+   GTK_CFLAGS=""
+   GTK_LIBS=""
+@@ -169,13 +169,13 @@
+ AC_MSG_CHECKING([$host_os configuration])
+ case $host_os in
+     *cygwin*|*Cygwin* )
+-        AC_DEFINE(HAVE_CYGWIN)
++        AC_DEFINE(HAVE_CYGWIN, 1, [flagging Cygwin])
+         AC_MSG_RESULT([flagging Cygwin])
+         ;;
+     *mingw32*|*Mingw32*)
+         CFLAGS="$CFLAGS -mconsole"
+ 	EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+-        AC_DEFINE(HAVE_MINGW32)
++        AC_DEFINE(HAVE_MINGW32, 1, [flagging MinGW])
+         AC_MSG_RESULT([flagging MinGW])
+         ;;
+     *darwin*|*Darwin*)
diff --git a/debian/patches/series b/debian/patches/series
index ea89961..2bb01ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix_paths.patch
 fix_manpages.patch
+fix_AC_DEFINE.patch
 install_tclxpa.patch
 hardening.patch
 sort_o_files
diff --git a/debian/rules b/debian/rules
index 272d9df..4c9614c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-shared=link --with-threads --with-tclconfig=/usr/lib --with-tcl=/usr/include/tcl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/xpa.git