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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit c297842e63228f7abfee2c98dca1d0ae0e096318
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jul 22 22:58:22 2013 +0200

    Use hardening flags

diff --git a/debian/changelog b/debian/changelog
index 972e2dd..85280cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 funtools (1.4.4-4) unstable; urgency=low
 
   * Check command line input for funjoin and funimage. Closes: #715928, #715929
+  * Push standards version. No changes needed.
+  * Use hardening flags.
+  * Remove now-unneeded DMUA flag.
 
  -- Ole Streicher <debian at liska.ath.cx>  Mon, 22 Jul 2013 22:03:24 +0200
 
diff --git a/debian/clean b/debian/clean
index 0078de4..e7b2781 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,6 +1,9 @@
 config.status
 config.status.lineno
 Makefile
+*/Makefile
 */config.status
+util/NaN.h
+util/config.status.lineno
 pkgIndex.tcl-old
 wcs/config.log
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 585b9ff..8cf96d4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: autotools-dev,
-               debhelper (>= 7.5.0),
+               debhelper (>= 9),
                dh-autoreconf,
                gawk,
                libwcstools-dev,
                tcl-dev,
                zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: https://www.cfa.harvard.edu/~john/funtools/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/funtools.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/funtools.git
diff --git a/debian/patches/fix_hardening.patch b/debian/patches/fix_hardening.patch
new file mode 100644
index 0000000..2f24268
--- /dev/null
+++ b/debian/patches/fix_hardening.patch
@@ -0,0 +1,68 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix the format string for fprintf
+--- a/gnu/sort.c
++++ b/gnu/sort.c
+@@ -2775,7 +2775,7 @@
+ 		xfwrite (buf, 1, cc, ofp);
+ 	      if (ferror (fp))
+ 		{
+-		  fprintf (stderr, files[i]);
++  	          fprintf (stderr, "%s", files[i]);
+ 		  cleanup ();
+ 		  exit (2);
+ 		}
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -137,7 +137,7 @@
+ 
+ CC  =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+--- a/filter/Makefile.in
++++ b/filter/Makefile.in
+@@ -114,7 +114,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \
+ 		${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} -I. ${INCLUDES} ${AC_FLAGS}
+--- a/gnu/Makefile.in
++++ b/gnu/Makefile.in
+@@ -87,7 +87,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	${CFLAGS} ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	${CFLAGS} ${CPPFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -105,7 +105,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+--- a/mklib
++++ b/mklib
+@@ -169,7 +169,7 @@
+             rm -f ${LIBNAME}.so
+ 
+             # make lib
+-            ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
++            ${LINK} ${LDFLAGS} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+             # make usual symlinks
+             ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
+             ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
diff --git a/debian/patches/series b/debian/patches/series
index b496ff8..149d29b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix_hardening.patch
 fix_paths.patch
 fix_manpages.patch
 fix_autoheader.patch

-- 
Minimal buy-in FITS library and utility package