[SCM] Minimal buy-in FITS library and utility package branch, debian, updated. 65c3895db1a8ccdb92fb9da3637524873b3047f0

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 65c3895db1a8ccdb92fb9da3637524873b3047f0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 3 22:41:01 2012 +0100

    Enable autoreconf
    This is needed to get changes into configure.ac (like TCL_LIBS).

diff --git a/debian/control b/debian/control
index 84cbbb8..23fa04d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 7.5.0), autotools-dev, tcl-dev, zlib1g-dev,
- libwcstools-dev, gawk
+Build-Depends: debhelper (>= 7.5.0), autotools-dev, dh-autoreconf, 
+ tcl-dev, zlib1g-dev, libwcstools-dev, gawk
 Standards-Version: 3.9.2
 Homepage: https://www.cfa.harvard.edu/~john/funtools/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/funtools.git
diff --git a/debian/patches/fix_autoheader.patch b/debian/patches/fix_autoheader.patch
new file mode 100644
index 0000000..7004080
--- /dev/null
+++ b/debian/patches/fix_autoheader.patch
@@ -0,0 +1,121 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix the AC_DEFINE lines so that autoheader (and therefore 
+ dh_autoreconf) works
+--- a/configure.ac
++++ b/configure.ac
+@@ -193,7 +193,7 @@ AC_MSG_RESULT($fun_ok)
+ 
+ SC_PATH_TCLCONFIG
+ if test x"${no_tcl}" = x ; then
+-    AC_DEFINE(HAVE_TCL)
++    AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
+ fi
+ 
+ AC_PROG_AWK
+@@ -218,7 +218,7 @@ POST="|\& cat"
+ case $host_os in
+     *cygwin*|*Cygwin* )
+         CFLAGS="$CFLAGS -enable-auto-import"
+-        AC_DEFINE(HAVE_CYGWIN)
++        AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+         AC_MSG_RESULT(flagging Cygwin)
+ 	PRE="sh -c {"
+ 	POST="}"
+@@ -226,7 +226,7 @@ case $host_os in
+     *mingw32*|*Mingw32*)
+         CFLAGS="$CFLAGS -mconsole"
+ 	EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+-        AC_DEFINE(HAVE_MINGW32)
++        AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+         AC_MSG_RESULT(flagging MinGW)
+         ;;
+     *osf*|*Osf*)
+--- a/filter/configure.ac
++++ b/filter/configure.ac
+@@ -150,7 +150,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+     *cygwin*|*Cygwin* )
+-        AC_DEFINE(HAVE_CYGWIN)
++        AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+         AC_MSG_RESULT(flagging Cygwin)
+ 	PRE="sh -c {"
+ 	POST="}"
+@@ -158,7 +158,7 @@ case $host_os in
+     *mingw32*|*Mingw32*)
+         CFLAGS="$CFLAGS -mconsole"
+ 	EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+-        AC_DEFINE(HAVE_MINGW32)
++        AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+         AC_MSG_RESULT(flagging MinGW)
+         ;;
+     *osf*|*Osf*)
+--- a/fitsy/configure.ac
++++ b/fitsy/configure.ac
+@@ -121,7 +121,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+     *cygwin*|*Cygwin* )
+-        AC_DEFINE(HAVE_CYGWIN)
++        AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+         AC_MSG_RESULT(flagging Cygwin)
+ 	PRE="sh -c {"
+ 	POST="}"
+@@ -129,7 +129,7 @@ case $host_os in
+     *mingw32*|*Mingw32*)
+         CFLAGS="$CFLAGS -mconsole"
+ 	EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+-        AC_DEFINE(HAVE_MINGW32)
++        AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+         AC_MSG_RESULT(flagging MinGW)
+         ;;
+     *darwin*|*Darwin*)
+--- a/util/configure.ac
++++ b/util/configure.ac
+@@ -133,7 +133,7 @@ fi
+ 
+ SC_PATH_TCLCONFIG
+ if test x"${no_tcl}" = x ; then
+-    AC_DEFINE(HAVE_TCL)
++    AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
+ fi
+ 
+ AC_MSG_CHECKING(for external zlib)
+@@ -146,7 +146,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+     *cygwin*|*Cygwin* )
+-        AC_DEFINE(HAVE_CYGWIN)
++        AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+         AC_MSG_RESULT(flagging Cygwin)
+ 	PRE="sh -c {"
+ 	POST="}"
+@@ -154,7 +154,7 @@ case $host_os in
+     *mingw32*|*Mingw32*)
+         CFLAGS="$CFLAGS -mconsole"
+ 	EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+-        AC_DEFINE(HAVE_MINGW32)
++        AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+         AC_MSG_RESULT(flagging MinGW)
+         ;;
+     *osf*|*Osf*)
+--- a/wcs/configure.ac
++++ b/wcs/configure.ac
+@@ -125,7 +125,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+     *cygwin*|*Cygwin* )
+-        AC_DEFINE(HAVE_CYGWIN)
++        AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+         AC_MSG_RESULT(flagging Cygwin)
+ 	PRE="sh -c {"
+ 	POST="}"
+@@ -133,7 +133,7 @@ case $host_os in
+     *mingw32*|*Mingw32*)
+         CFLAGS="$CFLAGS -mconsole"
+ 	EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+-        AC_DEFINE(HAVE_MINGW32)
++        AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+         AC_MSG_RESULT(flagging MinGW)
+         ;;
+     *osf*|*Osf*)
diff --git a/debian/patches/series b/debian/patches/series
index 6f32331..aeb5ea6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix_paths.patch
 fix_manpages.patch
+fix_autoheader.patch
 link_to_so.patch
 use_shared_libwcstools.patch
 build_tclfun.patch
diff --git a/debian/rules b/debian/rules
index b3c8230..d08e328 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-shared --with-zlib=-lz --with-wcslib=-lwcstools  --with-tcl=/usr/lib --enable-dl

-- 
Minimal buy-in FITS library and utility package