[funtools] 03/09: Fixes patches that are in upstream and refresh the other patches
Ole Streicher
olebole at moszumanska.debian.org
Sat Feb 28 14:31:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository funtools.
commit 98616cbe033d3b67926546ba74258186c957584b
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sat Feb 28 14:13:36 2015 +0100
Fixes patches that are in upstream and refresh the other patches
---
debian/changelog | 6 +
debian/patches/build_bsd+hurd.patch | 31 --
debian/patches/ds9_fixes.diff | 292 --------------
debian/patches/fix_autoheader.patch | 121 ------
debian/patches/fix_crashes.patch | 99 -----
debian/patches/fix_hardening.patch | 68 ----
debian/patches/fix_includes.patch | 602 ----------------------------
debian/patches/fix_manpages.patch | 400 ------------------
debian/patches/fix_paths.patch | 44 --
debian/patches/link_to_so.patch | 8 +-
debian/patches/series | 8 -
debian/patches/use_shared_libwcstools.patch | 11 +-
12 files changed, 15 insertions(+), 1675 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c0a977..1e1c08b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+funtools (1.4.6+git150228-1) UNRELEASED; urgency=low
+
+ * Changed upstream to github repository
+
+ -- Ole Streicher <olebole at debian.org> Sat, 28 Feb 2015 14:08:54 +0100
+
funtools (1.4.4+dfsg2-1) unstable; urgency=low
* Change uploader's e-mail address
diff --git a/debian/patches/build_bsd+hurd.patch b/debian/patches/build_bsd+hurd.patch
deleted file mode 100644
index 5d88a4c..0000000
--- a/debian/patches/build_bsd+hurd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Extend the mklib script so that it (hopefully) builds shared
- libraries on GNU/kFreeBSD and Hurd
---- a/mklib
-+++ b/mklib
-@@ -113,7 +113,7 @@ fi
- #
- case $ARCH in
-
-- 'Linux' | 'OpenBSD')
-+ 'Linux' | 'OpenBSD' | 'GNU' | GNU/*)
- # GCC-based environment
-
- if [ $NOPREFIX = 1 ] ; then
-@@ -144,11 +144,13 @@ case $ARCH in
- FINAL_LIBS=${LIBNAME}.a
- else
- LIBNAME="lib${LIBNAME}" # prefix with "lib"
-- if [ $ARCH = 'Linux' ] ; then
-+ case $ARCH in 'Linux' | 'GNU' | GNU/*)
- OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
-- else
-+ ;;
-+ *)
- OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
-- fi
-+ ;;
-+ esac
- if [ x${PATCH} = "x" ] ; then
- VERSION="${MAJOR}.${MINOR}"
- else
diff --git a/debian/patches/ds9_fixes.diff b/debian/patches/ds9_fixes.diff
deleted file mode 100644
index 6a08915..0000000
--- a/debian/patches/ds9_fixes.diff
+++ /dev/null
@@ -1,292 +0,0 @@
-Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0.tar.gz
-Description: Fixes that were applied to the package included in the saods9
- source. Only the patches that affect the Debian distribution are included here.
- These patches are not specific for DS9, however.
- .
- From the changelog:
- * Fixed -J funcone, which was not properly outputting all rows.
- * Fixed bug in funim.c which broke vcol functionality.
- .
---- a/filter/filter.c
-+++ b/filter/filter.c
-@@ -326,24 +326,31 @@ Filter FilterOpen(header, string, mode)
- }
-
- /* determine which type of process execution we do */
-- filter->ptype = DEFAULT_FILTER_PTYPE;
-- *tbuf = '\0';
-- if( (s=(char *)getenv("FILTER_PTYPE")) ){
-- strcpy(tbuf, s);
-- }
-- if( !*tbuf && (s=xstrdup(filter->mode)) ){
-- keyword(s, "ptype", tbuf, SZ_LINE);
-- if( s ) xfree(s);
-- }
-- if( *tbuf ){
-- if( *tbuf == 'p' )
-- filter->ptype = PTYPE_PROCESS;
-- else if( *tbuf == 'c' )
-- filter->ptype = PTYPE_CONTAINED;
-+ switch(filter->method){
-+ case METHOD_C:
-+ filter->ptype = DEFAULT_FILTER_PTYPE;
-+ *tbuf = '\0';
-+ if( (s=(char *)getenv("FILTER_PTYPE")) ){
-+ strcpy(tbuf, s);
-+ }
-+ if( !*tbuf && (s=xstrdup(filter->mode)) ){
-+ keyword(s, "ptype", tbuf, SZ_LINE);
-+ if( s ) xfree(s);
-+ }
-+ if( *tbuf ){
-+ if( *tbuf == 'p' )
-+ filter->ptype = PTYPE_PROCESS;
-+ else if( *tbuf == 'c' )
-+ filter->ptype = PTYPE_CONTAINED;
- #ifdef USE_DL
-- else if( *tbuf == 'd' )
-- filter->ptype = PTYPE_DYNAMIC;
-+ else if( *tbuf == 'd' )
-+ filter->ptype = PTYPE_DYNAMIC;
- #endif
-+ }
-+ break;
-+ default:
-+ filter->ptype = PTYPE_PROCESS;
-+ break;
- }
-
- /* determine region paint mode */
-@@ -470,7 +477,10 @@ Filter FilterOpen(header, string, mode)
- if( !FilterProgCompile(filter) )
- goto error;
-
-- if( filter->debug < 2 ){
-+ if( filter->debug >= 2 ) goto done;
-+
-+ switch(filter->method){
-+ case METHOD_C:
- switch(filter->ptype){
- case PTYPE_PROCESS:
- case PTYPE_CONTAINED:
-@@ -478,7 +488,7 @@ Filter FilterOpen(header, string, mode)
- case PIPE_WIN32:
- #if HAVE_CYGWIN
- if( !WinProcessOpen(filter->prog,
-- &(filter->ihandle), &(filter->ohandle), &(filter->process)) )
-+ &(filter->ihandle), &(filter->ohandle), &(filter->process)) )
- goto error;
- #else
- gerror(stderr, "internal error: no WinProcess without Windows");
-@@ -487,20 +497,23 @@ Filter FilterOpen(header, string, mode)
- break;
- default:
- if( !ProcessOpen(filter->prog,
-- &(filter->ichan), &(filter->ochan), &(filter->pid)) )
-+ &(filter->ichan), &(filter->ochan), &(filter->pid)) )
- goto error;
- break;
- }
- break;
- #ifdef USE_DL
- case PTYPE_DYNAMIC:
-- if( !(filter->dl=DLOpen(filter->prog)) )
-- goto error;
-- break;
-+ if( !(filter->dl=DLOpen(filter->prog)) )
-+ goto error;
-+ break;
- #endif
- default:
-- goto error;
-+ goto error;
- }
-+ break;
-+ default:
-+ goto error;
- }
-
- /* return the good news */
---- a/filter/filt.l
-+++ b/filter/filt.l
-@@ -871,6 +871,26 @@ compass { BEGIN COMM; }
- *
- */
-
-+
-+#ifdef YY_USE_PROTOS
-+static void floatprefix(void)
-+#else
-+static void floatprefix()
-+#endif
-+{
-+ if( filt->method == METHOD_C )
-+ _FiltLexCat("(double)");
-+}
-+
-+#ifdef YY_USE_PROTOS
-+static void floatsuffix(void)
-+#else
-+static void floatsuffix()
-+#endif
-+{
-+ return;
-+}
-+
- #ifdef YY_USE_PROTOS
- static void
- bin2num(char *d, char *s, int maxlen)
-@@ -1414,7 +1434,14 @@ static void _FiltLexRegionStart(docols)
- FilterSymbolDefaults(filt, 0);
- /* initialize wcs for default image case */
- _FiltLexWcsCols(filt->fhd, filt->xbin, filt->ybin);
-- _FiltLexCat(",(double)x,(double)y");
-+ _FiltLexCat(",");
-+ floatprefix();
-+ _FiltLexCat("x");
-+ floatsuffix();
-+ _FiltLexCat(",");
-+ floatprefix();
-+ _FiltLexCat("y");
-+ floatsuffix();
- break;
- case 1:
- if( !initbindefs ){
-@@ -1427,16 +1454,24 @@ static void _FiltLexRegionStart(docols)
- if( !filt->xbin || !filt->ybin ){
- _filterror("two binning columns are required for regions");
- }
-- _FiltLexCat(",(double)");
-+ _FiltLexCat(",");
-+ floatprefix();
- _FiltLexCat(filt->xbin);
-- _FiltLexCat(",(double)");
-+ floatsuffix();
-+ _FiltLexCat(",");
-+ floatprefix();
- _FiltLexCat(filt->ybin);
-+ floatsuffix();
- break;
- case 2:
-- _FiltLexCat(",(double)");
-+ _FiltLexCat(",");
-+ floatprefix();
- _FiltLexCat(colnames[0]);
-- _FiltLexCat(",(double)");
-+ floatsuffix();
-+ _FiltLexCat(",");
-+ floatprefix();
- _FiltLexCat(colnames[1]);
-+ floatsuffix();
- break;
- }
- if( s ) xfree(s);
---- a/filter/filtprog_c.c
-+++ b/filter/filtprog_c.c
-@@ -198,7 +198,8 @@ static int FilterProgOpen_C(filter)
- ccstr = "gcc";
- }
- /* make sure we have a compiler */
-- if( !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) &&
-+ if( !(filter->cc = Access(ccstr, "x")) &&
-+ !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) &&
- !(filter->cc = Find("gcc", "x", NULL, FilterPath())) &&
- !(filter->cc = Find("cc", "x", NULL, FilterPath())) &&
- !(filter->cc = Find("cc", "x", NULL, ".")) &&
-@@ -212,6 +213,9 @@ static int FilterProgOpen_C(filter)
- #if HAVE_CYGWIN
- if( (s=strrchr(filter->cc, '/')) ){
- s++;
-+ }
-+ else if( (s=strrchr(filter->cc, '\\')) ){
-+ s++;
- } else {
- s = filter->cc;
- }
---- a/funcone.c
-+++ b/funcone.c
-@@ -1036,6 +1036,9 @@ main(argc, argv)
- strncpy(decstr, argv[optind+ioff++], SZ_LINE-1);
- strncpy(radstr, argv[optind+ioff++], SZ_LINE-1);
-
-+ /* dolimfilt does not work with doall */
-+ if( doall ) dolimfilt = 0;
-+
- /* process list arguments */
- if( dolist ){
- if( !(list=OpenList(lname, rastr, decstr, radstr)) ){
-@@ -1085,6 +1088,8 @@ main(argc, argv)
- if( !(adbuf=xcalloc(nrow+1, sizeof(char))) ){
- gerror(stderr, "can't allocate all (-J|-X) buffer of size %d\n", nrow);
- }
-+ /* must read one event at a time, or else we can't tell the event num */
-+ maxrow = 1;
- }
-
- /* activate columns specified by user, if necessary */
-@@ -1371,7 +1376,7 @@ done:
- while( (ebuf = (Ev)FunTableRowGet(fun, NULL, maxrow, NULL, &got)) ){
- /* if we have a filter, then we don't know the row number til after
- we read the event, i.e. now */
-- if( doall & ALL_FILT ) FunInfoGet(fun, FUN_ROW, &irow, 0);
-+ FunInfoGet(fun, FUN_ROW, &irow, 0);
- /* process all rows */
- for(i=0; i<got; i++){
- /* skip rows that already were written out */
---- a/funtab.c
-+++ b/funtab.c
-@@ -1386,7 +1386,7 @@ int FunTableRowPut(fun, rows, nrow, idx, plist)
- off_t
- FunTableRowSeek(Fun fun, int nrow, char *plist)
- #else
--off_t FunTableRowPut(fun, nrow, plist)
-+off_t FunTableRowSeek(fun, nrow, plist)
- Fun fun;
- int nrow;
- char *plist;
---- a/funim.c
-+++ b/funim.c
-@@ -111,9 +111,9 @@ static void *_FunTableBin(fun, buf, plist)
- /* optional value column for binning */
- if( fun->vbin >= 0 ){
- dovcol = 1;
-- voffset = fun->header->table->col[fun->bin[2]].offset;
-- vsize = fun->header->table->col[fun->bin[2]].size;
-- vtype = fun->header->table->col[fun->bin[2]].type;
-+ voffset = fun->header->table->col[fun->vbin].offset;
-+ vsize = fun->header->table->col[fun->vbin].size;
-+ vtype = fun->header->table->col[fun->vbin].type;
- }
- else{
- dovcol = 0;
---- a/calc.l
-+++ b/calc.l
-@@ -284,7 +284,7 @@ static char *_CalcCB(name, client_data)
- {
- CalcCols cur;
- char tbuf[SZ_LINE];
-- char tbuf2[SZ_LINE];
-+ char tbuf2[SZ_LINE*2];
- char tbuf3[SZ_LINE];
- int i, got, ip;
-
---- a/util/gio.c
-+++ b/util/gio.c
-@@ -2209,7 +2209,7 @@ void gerror(va_alist) va_dcl
- vsnprintf(_gerrors, SZ_LINE-1, tbuf, args);
- /* if the error flag is positive, we output immediately */
- if( (fd != NULL) && _gerror ){
-- fprintf(fd, _gerrors);
-+ fputs(_gerrors, fd);
- fflush(fd);
- }
- /* if the error flag is set high, we exit */
-@@ -2281,7 +2281,7 @@ void gwarning(va_alist) va_dcl
- vsnprintf(_gwarnings, SZ_LINE-1, tbuf, args);
- /* if the warning flag is positive, we output immediately */
- if( (fd != NULL) && _gwarning ){
-- fprintf(fd, _gwarnings);
-+ fputs(_gwarnings, fd);
- fflush(fd);
- }
- }
diff --git a/debian/patches/fix_autoheader.patch b/debian/patches/fix_autoheader.patch
deleted file mode 100644
index 7004080..0000000
--- a/debian/patches/fix_autoheader.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-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/fix_crashes.patch b/debian/patches/fix_crashes.patch
deleted file mode 100644
index 75d6908..0000000
--- a/debian/patches/fix_crashes.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Check cmd line arguments for illegal input that caused crashes
- found with the "Mayhem" tool.
-Bug: http://bugs.debian.org/715928
-Bug: http://bugs.debian.org/715929
---- a/funjoin.c
-+++ b/funjoin.c
-@@ -737,7 +737,7 @@ main(argc, argv)
- case 'a':
- if( argv[i][2] ){
- j = atoi(&argv[i][2])-1;
-- if( (j >= 0) && (j < MAXIFILE) ){
-+ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
- files[j].actstr = argv[++i];
- }
- else{
-@@ -751,7 +751,7 @@ main(argc, argv)
- case 'b':
- if( argv[i][2] ){
- j = atoi(&argv[i][2])-1;
-- if( (j >= 0) && (j < MAXIFILE) ){
-+ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
- files[j].bstr = argv[++i];
- }
- else{
-@@ -765,7 +765,7 @@ main(argc, argv)
- case 'j':
- if( argv[i][2] ){
- j = atoi(&argv[i][2])-1;
-- if( (j >= 0) && (j < MAXIFILE) ){
-+ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
- files[j].jname = argv[++i];
- }
- else{
-@@ -773,25 +773,35 @@ main(argc, argv)
- }
- }
- else{
-- defcol = argv[++i];
-+ if (i < argc-1) {
-+ defcol = argv[++i];
-+ }
- }
- break;
- case 'm':
-- minmatch = atoi(argv[++i])+1;
-+ if (i < argc-1) {
-+ minmatch = atoi(argv[++i])+1;
-+ }
- if( minmatch < 1 ) minmatch = 1;
- break;
- case 'M':
-- maxmatch = atoi(argv[++i])+1;
-+ if (i < argc-1) {
-+ maxmatch = atoi(argv[++i])+1;
-+ }
- if( maxmatch < 1 ) maxmatch = 1;
- break;
- case 's':
- jfiles = JFILES_COL;
- break;
- case 'S':
-- jfiles = argv[++i];
-+ if (i < argc-1) {
-+ jfiles = argv[++i];
-+ }
- break;
- case 't':
-- tol = atof(argv[++i]);
-+ if (i < argc-1) {
-+ tol = atof(argv[++i]);
-+ }
- if( tol <= 0 ){
- gerror(stderr, "tolerance value must be positive\n");
- }
---- a/funimage.c
-+++ b/funimage.c
-@@ -338,12 +338,16 @@ main(argc, argv)
- t = strchr(s, ',');
- strncat(newname, s, t-s);
- strncat(newname, ",y:", SZ_LINE-strlen(newname));
-- s = ++t;
-- t = strchr(s, ',');
-- strncat(newname, s, t-s);
-+ if (t != NULL) {
-+ s = ++t;
-+ t = strchr(s, ',');
-+ strncat(newname, s, t-s);
-+ }
- strncat(newname, "),", SZ_LINE-strlen(newname));
-- s = ++t;
-- strncat(newname, s, SZ_LINE-strlen(newname));
-+ if (t != NULL) {
-+ s = ++t;
-+ strncat(newname, s, SZ_LINE-strlen(newname));
-+ }
- iname = newname;
- }
-
diff --git a/debian/patches/fix_hardening.patch b/debian/patches/fix_hardening.patch
deleted file mode 100644
index 2f24268..0000000
--- a/debian/patches/fix_hardening.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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/fix_includes.patch b/debian/patches/fix_includes.patch
deleted file mode 100644
index 4068ace..0000000
--- a/debian/patches/fix_includes.patch
+++ /dev/null
@@ -1,602 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: The include files are going to be installed in
- /usr/include/funtools. So, they should refer to each other by using ""
- instead of <> which also searches in the current directory.
---- a/filter/column.h
-+++ b/filter/column.h
-@@ -12,14 +12,14 @@
- #define __column_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
-
--#include <prsetup.h>
-+#include "prsetup.h"
- _PRbeg
-
- void ColumnLoad _PRx((char *ibuf, int size, int n, int convert, void *obuf));
---- a/filter/dl.h
-+++ b/filter/dl.h
-@@ -2,14 +2,14 @@
- #define __dl_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #ifdef HAVE_DLFCN_H
- #include <dlfcn.h>
- #endif
-
--#include <prsetup.h>
-+#include "prsetup.h"
-
- _PRbeg
-
---- a/filter/filter.h
-+++ b/filter/filter.h
-@@ -12,7 +12,7 @@
- #define __filter_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- /* avoid use of system -- its not secure */
-@@ -34,28 +34,28 @@
- #include <string.h>
- #endif
- #include <sys/types.h>
--#include <prsetup.h>
--#include <gio.h>
--#include <file.h>
--#include <find.h>
--#include <macro.h>
--#include <word.h>
--#include <xalloc.h>
--#include <strtod.h>
-+#include "prsetup.h"
-+#include "gio.h"
-+#include "file.h"
-+#include "find.h"
-+#include "macro.h"
-+#include "word.h"
-+#include "xalloc.h"
-+#include "strtod.h"
- #define USE_XFILEIO 1
--#include <fitsy.h>
-+#include "fitsy.h"
- #undef USE_XFILEIO
--#include <idx.h>
--#include <wcs.h>
--#include <column.h>
--#include <tl.h>
--#include <dl.h>
--#include <mkrtemp.h>
--#include <zprocess.h>
--#include <winprocess.h>
--#include <parse.h>
-+#include "idx.h"
-+#include "wcs.h"
-+#include "column.h"
-+#include "tl.h"
-+#include "dl.h"
-+#include "mkrtemp.h"
-+#include "zprocess.h"
-+#include "winprocess.h"
-+#include "parse.h"
- #ifdef USE_LAUNCH
--#include <xlaunch.h>
-+#include "xlaunch.h"
- #endif
-
- #ifndef OBJPATH
---- a/filter/idx.h
-+++ b/filter/idx.h
-@@ -11,9 +11,9 @@
- #define __idx_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
--#include <prsetup.h>
-+#include "prsetup.h"
- #include <stdio.h>
- #include <ctype.h>
- #ifdef HAVE_UNISTD_H
-@@ -22,10 +22,10 @@
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
--#include <fitsy.h>
--#include <gio.h>
--#include <xalloc.h>
--#include <strtod.h>
-+#include "fitsy.h"
-+#include "gio.h"
-+#include "xalloc.h"
-+#include "strtod.h"
-
- /* binary search edge */
- #define IDX_EDGE_LEFT 1
---- a/filter/tl.h
-+++ b/filter/tl.h
-@@ -11,7 +11,7 @@
- #ifndef __tl_h
- #define __tl_h
-
--#include <prsetup.h>
-+#include "prsetup.h"
-
- _PRbeg
-
---- a/fitsy/fitsy.h
-+++ b/fitsy/fitsy.h
-@@ -5,13 +5,13 @@
- #define FITSY_H
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #if USE_XFILEIO
--#include <xfileio.h>
-+#include "xfileio.h"
- #else
--#include <xfile.h>
-+#include "xfile.h"
- #endif
-
- #ifdef __STDC__
-@@ -30,7 +30,7 @@
-
- #include <ctype.h>
-
--#include <longlong.h>
-+#include "longlong.h"
-
- #ifndef NULL
- #define NULL 0
---- a/funtools.h
-+++ b/funtools.h
-@@ -27,11 +27,11 @@
- #define FUN_VERSION "1.4.4"
-
- #ifndef FUNTOOLS_PRIVATE
--#include <prsetup.h>
-+#include "prsetup.h"
- #define USE_XFILEIO 1
--#include <fitsy.h>
-+#include "fitsy.h"
- #undef USE_XFILEIO
--#include <wcs.h>
-+#include "wcs.h"
- typedef void *Fun;
- #endif
-
---- a/funtoolsP.h
-+++ b/funtoolsP.h
-@@ -12,7 +12,7 @@
- #define __funtoolsP_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <stdio.h>
-@@ -32,20 +32,20 @@
- #include <getopt.h>
- #endif
- #include <sys/types.h>
--#include <prsetup.h>
-+#include "prsetup.h"
- #define USE_XFILEIO 1
--#include <fitsy.h>
-+#include "fitsy.h"
- #undef USE_XFILEIO
--#include <wcs.h>
--#include <filter.h>
--#include <file.h>
--#include <swap.h>
--#include <word.h>
--#include <parse.h>
--#include <xalloc.h>
--#include <mkrtemp.h>
--#include <NaN.h>
--#include <xlaunch.h>
-+#include "wcs.h"
-+#include "filter.h"
-+#include "file.h"
-+#include "swap.h"
-+#include "word.h"
-+#include "parse.h"
-+#include "xalloc.h"
-+#include "mkrtemp.h"
-+#include "NaN.h"
-+#include "xlaunch.h"
-
- #ifndef MAXINT
- #define MAXINT 2147483647
-@@ -338,6 +338,6 @@ int FunView _PRx((Fun fun, char *view, char *vmode, char *fname, int fmax));
-
- _PRend
-
--#include <funtools.h>
-+#include "funtools.h"
-
- #endif /* __funtoolsP.h */
---- a/ofuntools.h
-+++ b/ofuntools.h
-@@ -27,11 +27,11 @@
- #define FUN_VERSION "1.4.4"
-
- #ifndef FUNTOOLS_PRIVATE
--#include <prsetup.h>
-+#include "prsetup.h"
- #define USE_XFILEIO 1
--#include <fitsy.h>
-+#include "fitsy.h"
- #undef USE_XFILEIO
--#include <wcs.h>
-+#include "wcs.h"
- typedef void *Fun;
- #endif
-
---- a/util/NaN.h.in
-+++ b/util/NaN.h.in
-@@ -20,7 +20,7 @@
- #ifndef __nan_h
- #define __nan_h
-
--#include <prsetup.h>
-+#include "prsetup.h"
-
- #define BIGENDIAN @BIGENDIAN@
-
---- a/util/file.h
-+++ b/util/file.h
-@@ -12,7 +12,7 @@
- #define __file_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <stdio.h>
-@@ -28,9 +28,9 @@
- #endif
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <prsetup.h>
--#include <macro.h>
--#include <xalloc.h>
-+#include "prsetup.h"
-+#include "macro.h"
-+#include "xalloc.h"
-
- _PRbeg
- int FileExists _PRx((char *filename));
---- a/util/find.h
-+++ b/util/find.h
-@@ -12,7 +12,7 @@
- #define __find_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <stdio.h>
-@@ -25,8 +25,8 @@
- #endif
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <xalloc.h>
--#include <prsetup.h>
-+#include "xalloc.h"
-+#include "prsetup.h"
-
- _PRbeg
-
---- a/util/gio.h
-+++ b/util/gio.h
-@@ -11,10 +11,10 @@
- #ifndef _gio_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
--#include <xport.h>
-+#include "xport.h"
-
- #include <stdio.h>
- #ifdef HAVE_STRING_H
-@@ -46,8 +46,8 @@
- #include <sys/stat.h>
- #include <sys/time.h>
-
--#include <prsetup.h>
--#include <xalloc.h>
-+#include "prsetup.h"
-+#include "xalloc.h"
-
- /* use ftello/fseeko (assuming its available) if we are using 64-bit offsets */
- #if _FILE_OFFSET_BITS == 64
---- a/util/macro.h
-+++ b/util/macro.h
-@@ -12,7 +12,7 @@
- #define __macro_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <stdio.h>
-@@ -26,7 +26,7 @@
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
--#include <prsetup.h>
-+#include "prsetup.h"
-
- typedef char *(*MacroCall)(
- #ifdef ANSI_FUNC
---- a/util/mainlib.h
-+++ b/util/mainlib.h
-@@ -12,7 +12,7 @@
- #define __mainlib_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
- #ifdef HAVE_STRING_H
- #include <string.h>
-@@ -29,11 +29,11 @@
- #include <stdio.h>
- #include <errno.h>
- #include <sys/types.h>
--#include <prsetup.h>
--#include <xalloc.h>
--#include <word.h>
--#include <find.h>
--#include <gio.h>
-+#include "prsetup.h"
-+#include "xalloc.h"
-+#include "word.h"
-+#include "find.h"
-+#include "gio.h"
-
- /* types of mainlibs we recognize */
- #define MAINLIB_ERROR 0
---- a/util/mkrtemp.h
-+++ b/util/mkrtemp.h
-@@ -12,7 +12,7 @@
- #define __mkrtemp_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <sys/types.h>
-@@ -31,9 +31,9 @@
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
--#include <prsetup.h>
--#include <word.h>
--#include <xalloc.h>
-+#include "prsetup.h"
-+#include "word.h"
-+#include "xalloc.h"
-
- #ifdef __APPLE__
- #define lrand48 random
---- a/util/parse.h
-+++ b/util/parse.h
-@@ -12,7 +12,7 @@
- #define __parse_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <stdio.h>
-@@ -33,12 +33,12 @@
- #endif
- #include <ctype.h>
-
--#include <prsetup.h>
--#include <strtod.h>
--#include <xalloc.h>
--#include <word.h>
--#include <gio.h>
--#include <longlong.h>
-+#include "prsetup.h"
-+#include "strtod.h"
-+#include "xalloc.h"
-+#include "word.h"
-+#include "gio.h"
-+#include "longlong.h"
-
- #define PARSE_DEBUG 1
- #if PARSE_DEBUG
---- a/util/strtod.h
-+++ b/util/strtod.h
-@@ -11,7 +11,7 @@
- #ifndef __strtod_h
- #define __strtod_h
-
--#include <prsetup.h>
-+#include "prsetup.h"
-
- extern int SAOdtype;
-
---- a/util/swap.h
-+++ b/util/swap.h
-@@ -11,7 +11,7 @@
- #ifndef __swap_h
- #define __swap_h
-
--#include <prsetup.h>
-+#include "prsetup.h"
-
- /* data types */
- #define TY_CHAR 1
---- a/util/tclmainlib.h
-+++ b/util/tclmainlib.h
-@@ -1,4 +1,4 @@
--#include <mainlib.h>
-+#include "mainlib.h"
-
- #if HAVE_TCL
-
---- a/util/winprocess.h
-+++ b/util/winprocess.h
-@@ -13,7 +13,7 @@
- #define __winprocess_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
- #include <stdio.h>
- #ifdef HAVE_UNISTD_H
-@@ -25,7 +25,7 @@
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
--#include <prsetup.h>
-+#include "prsetup.h"
-
- #if defined(HAVE_CYGWIN) || defined(WIN32)
-
---- a/util/word.h
-+++ b/util/word.h
-@@ -12,7 +12,7 @@
- #define __word_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
- #ifdef HAVE_STRING_H
- #include <string.h>
-@@ -23,8 +23,8 @@
- #if HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
--#include <prsetup.h>
--#include <xalloc.h>
-+#include "prsetup.h"
-+#include "xalloc.h"
-
- /* defines the types of callback procedure we use */
- typedef char *(*MacroCB)(
---- a/util/xalloc.h
-+++ b/util/xalloc.h
-@@ -12,7 +12,7 @@
- #define __xalloc_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <sys/types.h>
-@@ -33,7 +33,7 @@
- #include <setjmp.h>
- #endif
-
--#include <prsetup.h>
-+#include "prsetup.h"
-
- _PRbeg
-
---- a/util/xfileio.h
-+++ b/util/xfileio.h
-@@ -7,7 +7,7 @@
- #ifndef XFILEIO_H
- #define XFILEIO_H
-
--#include <gio.h>
-+#include "gio.h"
-
- /* define the basic IO routines */
- typedef GIO File;
---- a/util/xlaunch.h
-+++ b/util/xlaunch.h
-@@ -12,7 +12,7 @@
- #define __xlaunch_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #include <stdio.h>
-@@ -33,10 +33,10 @@
- #if HAVE_POSIX_SPAWN
- #include <spawn.h>
- #endif
--#include <xport.h>
--#include <word.h>
--#include <xalloc.h>
--#include <prsetup.h>
-+#include "xport.h"
-+#include "word.h"
-+#include "xalloc.h"
-+#include "prsetup.h"
-
- #define LAUNCH_ARGS 1024
-
---- a/util/xport.h
-+++ b/util/xport.h
-@@ -11,7 +11,7 @@
- #define __xport_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
-
- #if HAVE_MINGW32
---- a/util/zprocess.h
-+++ b/util/zprocess.h
-@@ -14,7 +14,7 @@
- #define __zprocess_h
-
- #if HAVE_CONFIG_H
--#include <conf.h>
-+#include "conf.h"
- #endif
- #include <stdio.h>
- #ifdef HAVE_UNISTD_H
-@@ -28,8 +28,8 @@
- #endif
- #include <sys/time.h>
- #include <signal.h>
--#include <xlaunch.h>
--#include <find.h>
-+#include "xlaunch.h"
-+#include "find.h"
-
- _PRbeg
-
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
deleted file mode 100644
index 90a4e16..0000000
--- a/debian/patches/fix_manpages.patch
+++ /dev/null
@@ -1,400 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix manpages (section and name) so that lintian does not complain
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -462,14 +462,19 @@
- install-man:
- @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
- echo "Making directory $(MAN_INSTALL_DIR)"; \
-- mkdir $(MAN_INSTALL_DIR); \
-+ mkdir -p $(MAN_INSTALL_DIR); \
- chmod 755 $(MAN_INSTALL_DIR); \
- else true; \
- fi;
- @-(for i in `ls ./man/man?/*.?` ; \
- do \
-- B=`basename $$i`; \
-- E=`echo $$i | awk -F. '{print $$NF}'`; \
-+ B=`basename $$i|sed s/\\\\.n/.7/`; \
-+ E=`echo $$i | awk -F. '{print $$NF}' | sed s/n/7/`; \
-+ case $$B in \
-+ funds9.7) \
-+ B=funds9.1; \
-+ E=1;; \
-+ esac; \
- M="$(MAN_INSTALL_DIR)/man$$E"; \
- if [ ! -d $$M ] ; then \
- echo "Making directory $$M"; \
-@@ -479,6 +484,9 @@
- fi; \
- echo "Installing $$B" ; \
- $(INSTALL_DATA) $$i $$M/$$B; \
-+ sed -i "s/\([ \"\']\)\(-[A-Za-z0-9]\)/\1\\\\\2/g" $$M/$$B ; \
-+ sed -i "s/^\\\&\\\fB\(.*\):\(.*\)\\\fR/\1 \- \2/g" $$M/$$B ;\
-+ sed -i "s/funtools(n)/funtools(7)/g" $$M/$$B ; \
- done;)
-
- install-share:
---- a/man/man1/fundisp.1
-+++ b/man/man1/fundisp.1
-@@ -530,7 +530,6 @@
- .PP
- fundisp \-F',' snr.ev'[cir 512 512 .1]'
- X, Y, \s-1PHA\s0, \s-1PI\s0, \s-1TIME\s0, \s-1DX\s0, \s-1DY\s0
--\&\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-
- 512, 512, 6, 7, 79493997.45854475, 578, 574
- 512, 512, 8, 9, 79494575.58943175, 579, 573
- 512, 512, 5, 6, 79493631.03866175, 578, 575
-@@ -539,7 +538,6 @@
- .PP
- fundisp \-F',' snr.ev'[cir 512 512 .1]' | sed 's/ *, */,/g'
- X,Y,PHA,PI,TIME,DX,DY
--\&\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-,\-\-\-\-\-\-\-\-
- 512,512,6,7,79493997.45854475,578,574
- 512,512,8,9,79494575.58943175,579,573
- 512,512,5,6,79493631.03866175,578,575
---- a/man/mann/funcombine.n
-+++ b/man/mann/funcombine.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funcombine n"
--.TH funcombine n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funcombine 7"
-+.TH funcombine 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunCombine: Combining Region and Table Filters\fR
-+\&\fBFunCombine \- Combining Region and Table Filters\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document discusses the conventions for combining region and table
---- a/man/mann/funds9.n
-+++ b/man/mann/funds9.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funds9 n"
--.TH funds9 n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funds9 1"
-+.TH funds9 1 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunDS9: Funtools and DS9 Image Display\fR
-+\&\fBFunDS9 \- Funtools and DS9 Image Display\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes how funtools can be integrated into the ds9 Analysis menu.
---- a/man/mann/funenv.n
-+++ b/man/mann/funenv.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funenv n"
--.TH funenv n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funenv 7"
-+.TH funenv 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunEnv: Funtools Environment Variables\fR
-+\&\fBFunEnv \- Funtools Environment Variables\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes the environment variables which can be used to tailor the overall
---- a/man/mann/funfiles.n
-+++ b/man/mann/funfiles.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funfiles n"
--.TH funfiles n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funfiles 7"
-+.TH funfiles 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunFiles: Funtools Data Files\fR
-+\&\fBFunFiles \- Funtools Data Files\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document describes the data file formats (\s-1FITS\s0, array, raw
---- a/man/mann/funfilters.n
-+++ b/man/mann/funfilters.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funfilters n"
--.TH funfilters n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funfilters 7"
-+.TH funfilters 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunfilters: Filtering Rows in a Table\fR
-+\&\fBFunfilters \- Filtering Rows in a Table\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document contains a summary of the user interface for
---- a/man/mann/funidx.n
-+++ b/man/mann/funidx.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funidx n"
--.TH funidx n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funidx 7"
-+.TH funidx 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunidx: Using Indexes to Filter Rows in a Table\fR
-+\&\fBFunidx \- Using Indexes to Filter Rows in a Table\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document contains a summary of the user interface for
---- a/man/mann/funregions.n
-+++ b/man/mann/funregions.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funregions n"
--.TH funregions n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funregions 7"
-+.TH funregions 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBRegions: Spatial Region Filtering\fR
-+\&\fBFunRegions \- Spatial Region Filtering\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document contains a summary of the user interface for spatial
---- a/man/mann/funtext.n
-+++ b/man/mann/funtext.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funtext n"
--.TH funtext n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funtext 7"
-+.TH funtext 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFuntext: Support for Column\-based Text Files\fR
-+\&\fBFuntext \- Support for Column\-based Text Files\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document contains a summary of the options for processing column-based
---- a/man/mann/funtools.n
-+++ b/man/mann/funtools.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funtools n"
--.TH funtools n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funtools 7"
-+.TH funtools 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFuntools: FITS Users Need Tools\fR
-+\&\fBFuntools \- FITS Users Need Tools\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document is the Table of Contents for Funtools.
-@@ -208,7 +208,7 @@
- [\fIfuntbl\fR\|(1)]
- .IP "\(bu" 4
- funtools and ds9 image display
--[funds9(n)]
-+[funds9(7)]
- .RE
- .RS 4
- .RE
-@@ -302,7 +302,7 @@
- .RE
- .IP "\(bu" 4
- Funtools Data Files
--[funfiles(n)]
-+[funfiles(7)]
- .RS 4
- .IP "\(bu" 4
- Supported Data Formats
-@@ -334,35 +334,35 @@
- .RS 4
- .IP "\(bu" 4
- Table Filtering
--[funfilters(n)]
-+[funfilters(7)]
- .IP "\(bu" 4
- Fast Table Filtering using Indexes
--[funidx(n)]
-+[funidx(7)]
- .IP "\(bu" 4
- Spatial Region Filtering
--[funregions(n)]
-+[funregions(7)]
- .RS 4
- .IP "\(bu" 4
- Region Geometry
--[reggeometry(n)]
-+[reggeometry(7)]
- .IP "\(bu" 4
- Region Algebra
--[regalgebra(n)]
-+[regalgebra(7)]
- .IP "\(bu" 4
- Region Coordinates
--[regcoords(n)]
-+[regcoords(7)]
- .IP "\(bu" 4
- Region Boundaries
--[regbounds(n)]
-+[regbounds(7)]
- .IP "\(bu" 4
- Differences Between Funtools and \s-1IRAF\s0 Regions
--[regdiff(n)]
-+[regdiff(7)]
- .RE
- .RS 4
- .RE
- .IP "\(bu" 4
- Combining Table and Region Filters
--[funcombine(n)]
-+[funcombine(7)]
- .RE
- .RS 4
- .RE
-@@ -371,7 +371,7 @@
- .RS 4
- .IP "\(bu" 4
- Funtools Environment Variables
--[funenv(n)]
-+[funenv(7)]
- .IP "\(bu" 4
- Funtools ChangeLog
- .RE
---- a/man/mann/funview.n
-+++ b/man/mann/funview.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "funview n"
--.TH funview n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "funview 7"
-+.TH funview 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunview: Database View Support for Tables\fR
-+\&\fBFunview \- Database View Support for Tables\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document contains a summary of the options for utilizing
---- a/man/mann/regalgebra.n
-+++ b/man/mann/regalgebra.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "regalgebra n"
--.TH regalgebra n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "regalgebra 7"
-+.TH regalgebra 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBRegAlgebra: Boolean Algebra on Spatial Regions\fR
-+\&\fBRegAlgebra \- Boolean Algebra on Spatial Regions\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document describes the boolean arithmetic defined for
---- a/man/mann/regbounds.n
-+++ b/man/mann/regbounds.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "regbounds n"
--.TH regbounds n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "regbounds 7"
-+.TH regbounds 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBRegBounds: Region Boundaries\fR
-+\&\fBRegBounds \- Region Boundaries\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes how spatial region boundaries are handled.
---- a/man/mann/regcoords.n
-+++ b/man/mann/regcoords.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "regcoords n"
--.TH regcoords n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "regcoords 7"
-+.TH regcoords 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBRegCoords: Spatial Region Coordinates\fR
-+\&\fBRegCoords \- Spatial Region Coordinates\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document describes the specification of coordinate systems, and the
---- a/man/mann/regdiff.n
-+++ b/man/mann/regdiff.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "regdiff n"
--.TH regdiff n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "regdiff 7"
-+.TH regdiff 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBRegDiff:Differences Between Funtools and IRAF Regions\fR
-+\&\fBRegDiff \- Differences Between Funtools and IRAF Regions\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes the differences between Funtools/ds9 regions and the old \s-1IRAF/PROS\s0
---- a/man/mann/reggeometry.n
-+++ b/man/mann/reggeometry.n
-@@ -128,10 +128,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "reggeometry n"
--.TH reggeometry n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.IX Title "reggeometry 7"
-+.TH reggeometry 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBRegGeometry: Geometric Shapes in Spatial Region Filtering\fR
-+\&\fBRegGeometry \- Geometric Shapes in Spatial Region Filtering\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document describes the geometry of regions available for spatial
---- a/man/man3/funcolumnselect.3
-+++ b/man/man3/funcolumnselect.3
-@@ -593,7 +593,7 @@
- .PP
- Note that the only modification to the call is in the plist string.
- .PP
--Of course, instead of using staticly allocated arrays, you also can specify
-+Of course, instead of using statically allocated arrays, you also can specify
- dynamically allocated pointers:
- .PP
- .Vb 7
---- a/man/man3/funlib.3
-+++ b/man/man3/funlib.3
-@@ -131,7 +131,7 @@
- .IX Title "funlib 3"
- .TH funlib 3 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunLib: the Funtools Programming Interface\fR
-+\&\fBFunLib \- the Funtools Programming Interface\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- A description of the Funtools library.
---- a/man/man3/funref.3
-+++ b/man/man3/funref.3
-@@ -131,7 +131,7 @@
- .IX Title "funref 3"
- .TH funref 3 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
- .SH "NAME"
--\&\fBFunRef: the Funtools Reference Handle\fR
-+\&\fBFunRef \- the Funtools Reference Handle\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- A description of how to use a Funtools reference handle to connect a
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
deleted file mode 100644
index decaae1..0000000
--- a/debian/patches/fix_paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix the paths for a chroot build and for FHS
---- sao-funtools-1.4.4.orig/Makefile.in
-+++ sao-funtools-1.4.4/Makefile.in
-@@ -34,7 +34,7 @@ exec_prefix = @exec_prefix@
- # to be different than those used for actually reference files at
- # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
- # when installing files.
--INSTALL_ROOT =
-+INSTALL_ROOT = $(DESTDIR)
-
- # Directory in which to install the .a or .so binary for the FUNTOOLS library:
- LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
-@@ -43,10 +43,10 @@ LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_
- BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-
- # Directory in which to install the funtools.h include file:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/funtools
-
- # Top-level directory for manual entries:
--MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/man
-
- # Top-level directory for share entries:
- MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools
-@@ -386,7 +386,7 @@ install::
- @for dir in $(SUBDIRS); do \
- echo " "; \
- echo Installing in $$dir ...; \
-- (cd $$dir; $(MAKE) $@) ; \
-+ (cd $$dir; $(MAKE) INSTALL_ROOT=$(INSTALL_ROOT) INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR) $@) ; \
- done
-
- install:: install-man
-@@ -422,7 +422,7 @@ install-binaries: lib $(PROGS) $(SCRIPTS
- do \
- if [ ! -d $$i ] ; then \
- echo "Making directory $$i"; \
-- mkdir $$i; \
-+ mkdir -p $$i; \
- chmod 755 $$i; \
- else true; \
- fi; \
diff --git a/debian/patches/link_to_so.patch b/debian/patches/link_to_so.patch
index 4bf1f4b..ccb8f3f 100644
--- a/debian/patches/link_to_so.patch
+++ b/debian/patches/link_to_so.patch
@@ -1,9 +1,9 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Link the executables agains libfuntools.so and link libfuntools.so
against the needed libs.
---- sao-funtools-1.4.4.orig/Makefile.in
-+++ sao-funtools-1.4.4/Makefile.in
-@@ -160,7 +160,7 @@ LIB = @LIB@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -160,7 +160,7 @@
# this is used in the link line
# LLIB = $(LIB)
@@ -12,7 +12,7 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
# libraries containing main as subroutines
MAINLIB = lib$(PACKAGE)MainLib.a
-@@ -228,7 +228,7 @@ shlib: sublib $(LIBOBJS)
+@@ -228,7 +228,7 @@
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
CC='$(CC)' CXX=$(CXX) \
diff --git a/debian/patches/series b/debian/patches/series
index 6cb242f..ef62806 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,4 @@
-fix_hardening.patch
-fix_paths.patch
-fix_manpages.patch
-fix_autoheader.patch
link_to_so.patch
-fix_includes.patch
use_shared_libwcstools.patch
build_tclfun.patch
-build_bsd+hurd.patch
-ds9_fixes.diff
-fix_crashes.patch
multiarch.patch
diff --git a/debian/patches/use_shared_libwcstools.patch b/debian/patches/use_shared_libwcstools.patch
index 6a2f552..25f1deb 100644
--- a/debian/patches/use_shared_libwcstools.patch
+++ b/debian/patches/use_shared_libwcstools.patch
@@ -1,19 +1,19 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Use the shared libwcstools package instead of the convienence copy.
---- sao-funtools-1.4.4.orig/Makefile.in
-+++ sao-funtools-1.4.4/Makefile.in
-@@ -60,8 +60,8 @@ FITSY_INC = -I./fitsy
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -60,8 +60,8 @@
# FITSY_LIBS = -L./fitsy -lfitsy
# wcs files are in the wcs subdirectory
-WCS_INC = -I./wcs
-# WCS_LIBS = -L./wcs -lwcs
-+WCS_INC =
++WCS_INC =
+WCS_LIBS = -lwcstools
# filter files are in the filter subdirectory
FILTER_INC = -I./filter
-@@ -188,7 +188,7 @@ DEVEL =
+@@ -188,7 +188,7 @@
# Subdirectories to run make in for the primary targets.
@@ -22,7 +22,6 @@ Description: Use the shared libwcstools package instead of the convienence copy.
SUBDIRS = $(SUBLIBS) gnu funtest faq
-
--- a/funcen.c
+++ b/funcen.c
@@ -21,7 +21,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/funtools.git
More information about the debian-science-commits
mailing list