[SCM] Minimal buy-in FITS library and utility package branch, master, updated. 9d11faba23b87ec4f1b07ac3c301b7fa9674965c
Ole Streicher
debian at liska.ath.cx
Fri Feb 3 14:02:06 UTC 2012
The following commit has been merged in the master branch:
commit edd5ae1ed7caf7acdcc2a52135ce09a9b68c514b
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Feb 3 15:00:31 2012 +0100
Put all "misc" manpages into section 7.
diff --git a/debian/funtools.install b/debian/funtools.install
index 2fc602e..e8d63d3 100644
--- a/debian/funtools.install
+++ b/debian/funtools.install
@@ -13,18 +13,4 @@ usr/bin/funmerge
usr/bin/funsky
usr/bin/funtable
usr/bin/funtbl
-usr/share/man/man1/funcalc.1
-usr/share/man/man1/funcen.1
-usr/share/man/man1/funcnts.1
-usr/share/man/man1/funcone.1
-usr/share/man/man1/fundisp.1
-usr/share/man/man1/funds9.1
-usr/share/man/man1/funhead.1
-usr/share/man/man1/funhist.1
-usr/share/man/man1/funimage.1
-usr/share/man/man1/funindex.1
-usr/share/man/man1/funjoin.1
-usr/share/man/man1/funmerge.1
-usr/share/man/man1/funsky.1
-usr/share/man/man1/funtable.1
-usr/share/man/man1/funtbl.1
+usr/share/man/man1/*.1
diff --git a/debian/libfuntools-dev.install b/debian/libfuntools-dev.install
index 3ddb6a9..f79fe8f 100644
--- a/debian/libfuntools-dev.install
+++ b/debian/libfuntools-dev.install
@@ -3,3 +3,4 @@ usr/lib/libfuntools.so
usr/lib/libfuntools.a
usr/lib/pkgconfig/funtools.pc
usr/share/man/man1/fun*.1
+usr/share/man/man7/*.7
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 3c44a67..3a8834c 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -1,8 +1,77 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Fix manpages (section and name) so that lintian does not complain
---- sao-funtools-1.4.4.orig/man/man1/fundisp.1
-+++ sao-funtools-1.4.4/man/man1/fundisp.1
-@@ -530,7 +530,6 @@ such as sed, at the cost of generating u
+diff --git a/Makefile.in b/Makefile.in
+index 85f02fe..6ba1545 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -462,14 +462,19 @@ install-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
+ 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"; \
+diff --git a/man/man1/funcalc.1 b/man/man1/funcalc.1
+index 377bf79..8ee2304 100644
+--- a/man/man1/funcalc.1
++++ b/man/man1/funcalc.1
+@@ -619,4 +619,4 @@ adding support for image expressions at a later point, if there is
+ demand for such support from the community.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funcen.1 b/man/man1/funcen.1
+index 551263e..eb70978 100644
+--- a/man/man1/funcen.1
++++ b/man/man1/funcen.1
+@@ -247,4 +247,4 @@ See Region Boundaries for more information
+ about how boundaries are calculated using these two methods.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funcnts.1 b/man/man1/funcnts.1
+index 2f25906..6486b9d 100644
+--- a/man/man1/funcnts.1
++++ b/man/man1/funcnts.1
+@@ -803,4 +803,4 @@ For more information about these difference, see the discussion of
+ Region Boundaries.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funcone.1 b/man/man1/funcone.1
+index 4834767..1bd4e5d 100644
+--- a/man/man1/funcone.1
++++ b/man/man1/funcone.1
+@@ -282,4 +282,4 @@ in arc minutes:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/fundisp.1 b/man/man1/fundisp.1
+index 70b7023..0c668ca 100644
+--- a/man/man1/fundisp.1
++++ b/man/man1/fundisp.1
+@@ -530,7 +530,6 @@ such as sed, at the cost of generating unaligned columns. For example:
.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
@@ -18,8 +87,223 @@ Description: Fix manpages (section and name) so that lintian does not complain
512,512,6,7,79493997.45854475,578,574
512,512,8,9,79494575.58943175,579,573
512,512,5,6,79493631.03866175,578,575
---- sao-funtools-1.4.4.orig/man/man3/funlib.3
-+++ sao-funtools-1.4.4/man/man3/funlib.3
+@@ -588,4 +586,4 @@ The resulting filter file can then be used in various funtools programs:
+ to process only the events in the good-time intervals.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funhead.1 b/man/man1/funhead.1
+index 99fc093..0674047 100644
+--- a/man/man1/funhead.1
++++ b/man/man1/funhead.1
+@@ -284,4 +284,4 @@ See Column-based Text Files
+ for more information about header parameter format.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funhist.1 b/man/man1/funhist.1
+index 3e7711a..b4025b0 100644
+--- a/man/man1/funhist.1
++++ b/man/man1/funhist.1
+@@ -367,4 +367,4 @@ Similar plot commands are supplied in the script \fBfunhist.plot\fR:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funimage.1 b/man/man1/funimage.1
+index 5403890..ca5bb1d 100644
+--- a/man/man1/funimage.1
++++ b/man/man1/funimage.1
+@@ -1,3 +1,6 @@
++
++
++
+ .\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+ .\"
+ .\" Standard preamble:
+@@ -425,4 +428,4 @@ Display the \s-1FITS\s0 image generated from a blocked section of \s-1FITS\s0 bi
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funindex.1 b/man/man1/funindex.1
+index abefedd..61b5033 100644
+--- a/man/man1/funindex.1
++++ b/man/man1/funindex.1
+@@ -176,4 +176,4 @@ This will generate an index named foo_y.idx, which will be used by funtools
+ for filters involving the Y column.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funjoin.1 b/man/man1/funjoin.1
+index ccd4540..a1e11dc 100644
+--- a/man/man1/funjoin.1
++++ b/man/man1/funjoin.1
+@@ -323,4 +323,4 @@ flag which files were used in each row:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funmerge.1 b/man/man1/funmerge.1
+index 974a642..5962808 100644
+--- a/man/man1/funmerge.1
++++ b/man/man1/funmerge.1
+@@ -212,4 +212,4 @@ This program only works on raw event files and binary tables. We have
+ not yet implemented image and array merging.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funsky.1 b/man/man1/funsky.1
+index 2c6d2fd..568fab3 100644
+--- a/man/man1/funsky.1
++++ b/man/man1/funsky.1
+@@ -382,4 +382,4 @@ small discrepancy with ds9's converted values for floating point
+ data. We will remedy this conflict in the future, maybe.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funtable.1 b/man/man1/funtable.1
+index 1a5090a..867e9a8 100644
+--- a/man/man1/funtable.1
++++ b/man/man1/funtable.1
+@@ -353,4 +353,4 @@ be output with their \*(L"\s-1VALUE\s0\*(R" column set to zero. Obviously, this
+ switch does not make sense when individual events are output.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man1/funtbl.1 b/man/man1/funtbl.1
+index 2c5dfec..6a65d31 100644
+--- a/man/man1/funtbl.1
++++ b/man/man1/funtbl.1
+@@ -246,4 +246,4 @@ foo.out, the same result can be obtained by executing:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funclose.3 b/man/man3/funclose.3
+index 681e21b..58eab6f 100644
+--- a/man/man3/funclose.3
++++ b/man/man3/funclose.3
+@@ -157,4 +157,4 @@ you can call \fIFunFlush()\fR
+ explicitly).
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funcolumnactivate.3 b/man/man3/funcolumnactivate.3
+index fdbc966..e12f801 100644
+--- a/man/man3/funcolumnactivate.3
++++ b/man/man3/funcolumnactivate.3
+@@ -327,4 +327,4 @@ of calling it this way:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funcolumnlookup.3 b/man/man3/funcolumnlookup.3
+index 4e3cc37..62c60eb 100644
+--- a/man/man3/funcolumnlookup.3
++++ b/man/man3/funcolumnlookup.3
+@@ -217,4 +217,4 @@ example:
+ only returns information about the size of the phas vector.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funcolumnselect.3 b/man/man3/funcolumnselect.3
+index 13a565d..ad272f4 100644
+--- a/man/man3/funcolumnselect.3
++++ b/man/man3/funcolumnselect.3
+@@ -661,4 +661,4 @@ for working examples of how
+ \&\fIFunColumnSelect()\fR is used.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funflush.3 b/man/man3/funflush.3
+index 52aef78..946fe7c 100644
+--- a/man/man3/funflush.3
++++ b/man/man3/funflush.3
+@@ -209,4 +209,4 @@ file:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funimageget.3 b/man/man3/funimageget.3
+index e4f105b..b928d94 100644
+--- a/man/man3/funimageget.3
++++ b/man/man3/funimageget.3
+@@ -329,4 +329,4 @@ See Binning \s-1FITS\s0 Binary Tables and
+ Non-FITS Event Files for more information.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funimageput.3 b/man/man3/funimageput.3
+index adba50c..fbe6820 100644
+--- a/man/man3/funimageput.3
++++ b/man/man3/funimageput.3
+@@ -222,4 +222,4 @@ image padding. However, this is not necessary if you subsequently call
+ \&\fIFunClose()\fR without doing any other I/O to the \s-1FITS\s0 file.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funimagerowget.3 b/man/man3/funimagerowget.3
+index 758b1db..eed9644 100644
+--- a/man/man3/funimagerowget.3
++++ b/man/man3/funimagerowget.3
+@@ -212,4 +212,4 @@ above for specifying binning columns in
+ \&\fB\f(BIFunImageRowGet()\fB\fR.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funimagerowput.3 b/man/man3/funimagerowput.3
+index 03db150..22b70b2 100644
+--- a/man/man3/funimagerowput.3
++++ b/man/man3/funimagerowput.3
+@@ -199,4 +199,4 @@ image padding. However, this is not necessary if you subsequently call
+ \&\fIFunClose()\fR without doing any other I/O to the \s-1FITS\s0 file.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funinfoget.3 b/man/man3/funinfoget.3
+index 7ca385c..830ad81 100644
+--- a/man/man3/funinfoget.3
++++ b/man/man3/funinfoget.3
+@@ -332,4 +332,4 @@ works internally. We are happy to help you write such programs as the
+ need arises.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funinfoput.3 b/man/man3/funinfoput.3
+index 17304f1..a6b3fc2 100644
+--- a/man/man3/funinfoput.3
++++ b/man/man3/funinfoput.3
+@@ -243,4 +243,4 @@ Once the \s-1FUN_OPS\s0 variable has been reset, the next I/O call on the
+ output extension will output the header, as expected.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funlib.3 b/man/man3/funlib.3
+index a04229e..2b891e9 100644
+--- 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"
@@ -29,8 +313,46 @@ Description: Fix manpages (section and name) so that lintian does not complain
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
A description of the Funtools library.
---- sao-funtools-1.4.4.orig/man/man3/funref.3
-+++ sao-funtools-1.4.4/man/man3/funref.3
+@@ -522,4 +522,4 @@ void FunFlush(Fun fun, char *plist)
+ void FunClose(Fun fun)
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funopen.3 b/man/man3/funopen.3
+index a1d9c8a..4906be6 100644
+--- a/man/man3/funopen.3
++++ b/man/man3/funopen.3
+@@ -269,4 +269,4 @@ Fun handle that is used in subsequent Funtools calls. On error, \s-1NULL\s0
+ is returned.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funparamget.3 b/man/man3/funparamget.3
+index 3360afc..de3ea6e 100644
+--- a/man/man3/funparamget.3
++++ b/man/man3/funparamget.3
+@@ -259,4 +259,4 @@ header cards in a given extension and print out the raw card, use:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funparamput.3 b/man/man3/funparamput.3
+index 863a3f8..6645629 100644
+--- a/man/man3/funparamput.3
++++ b/man/man3/funparamput.3
+@@ -253,4 +253,4 @@ set the append argument to a non-zero value and the parameter did not
+ already exist in the file.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funref.3 b/man/man3/funref.3
+index b8096c5..3203425 100644
+--- 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"
@@ -40,27 +362,67 @@ Description: Fix manpages (section and name) so that lintian does not complain
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
A description of how to use a Funtools reference handle to connect a
---- sao-funtools-1.4.4.orig/man/mann/funcombine.n
-+++ sao-funtools-1.4.4/man/mann/funcombine.n
-@@ -129,9 +129,9 @@
+@@ -284,4 +284,4 @@ is closed \fBbefore\fR the input file:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funtablerowget.3 b/man/man3/funtablerowget.3
+index 8547247..be8128b 100644
+--- a/man/man3/funtablerowget.3
++++ b/man/man3/funtablerowget.3
+@@ -213,4 +213,4 @@ Note that \fIFunTableRowGet()\fR also can be called as \fIFunEventsGet()\fR, for
+ backward compatibility.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/man3/funtablerowput.3 b/man/man3/funtablerowput.3
+index 76e9ab4..80eceb8 100644
+--- a/man/man3/funtablerowput.3
++++ b/man/man3/funtablerowput.3
+@@ -294,4 +294,4 @@ Note that \fIFunTableRowPut()\fR also can be called as \fIFunEventsPut()\fR, for
+ backward compatibility.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funcombine.n b/man/mann/funcombine.n
+index e4a482a..310c7e7 100644
+--- a/man/mann/funcombine.n
++++ b/man/mann/funcombine.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funcombine n"
+-.IX Title "funcombine n"
-.TH funcombine n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funcombine 1 "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
+FunCombine \- Combining Region and Table Filters
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document discusses the conventions for combining region and table
---- sao-funtools-1.4.4.orig/man/mann/funds9.n
-+++ sao-funtools-1.4.4/man/mann/funds9.n
-@@ -129,9 +129,9 @@
+@@ -245,4 +245,4 @@ that the comma operator be avoided in such cases in favor of an
+ explicit boolean operator.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funds9.n b/man/mann/funds9.n
+index 06ad76c..082690b 100644
+--- a/man/mann/funds9.n
++++ b/man/mann/funds9.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funds9 n"
+-.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
@@ -68,185 +430,381 @@ Description: Fix manpages (section and name) so that lintian does not complain
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
Describes how funtools can be integrated into the ds9 Analysis menu.
---- sao-funtools-1.4.4.orig/man/mann/funenv.n
-+++ sao-funtools-1.4.4/man/mann/funenv.n
-@@ -129,9 +129,9 @@
+@@ -213,4 +213,4 @@ Aside from the units, the results should be identical to the file-based
+ results.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funenv.n b/man/mann/funenv.n
+index f9d9526..9f37f0c 100644
+--- a/man/mann/funenv.n
++++ b/man/mann/funenv.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funenv n"
+-.IX Title "funenv n"
-.TH funenv n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funenv 1 "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
+FunEnv \- Funtools Environment Variables
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
Describes the environment variables which can be used to tailor the overall
---- sao-funtools-1.4.4.orig/man/mann/funfiles.n
-+++ sao-funtools-1.4.4/man/mann/funfiles.n
-@@ -129,9 +129,9 @@
+@@ -349,4 +349,4 @@ but care should be taken to reset its value to false when debugging is
+ complete.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funfiles.n b/man/mann/funfiles.n
+index 3d42ac2..8d36eac 100644
+--- a/man/mann/funfiles.n
++++ b/man/mann/funfiles.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funfiles n"
+-.IX Title "funfiles n"
-.TH funfiles n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funfiles 1 "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
+FunFiles \- Funtools Data Files
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document describes the data file formats (\s-1FITS\s0, array, raw
---- sao-funtools-1.4.4.orig/man/mann/funfilters.n
-+++ sao-funtools-1.4.4/man/mann/funfilters.n
-@@ -129,9 +129,9 @@
+@@ -799,4 +799,4 @@ in a filter, enclose the file specification in quotes:
+ .Ve
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funfilters.n b/man/mann/funfilters.n
+index 192dc29..33fa301 100644
+--- a/man/mann/funfilters.n
++++ b/man/mann/funfilters.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funfilters n"
+-.IX Title "funfilters n"
-.TH funfilters n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funfilters 1 "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
+Funfilters \- Filtering Rows in a Table
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document contains a summary of the user interface for
---- sao-funtools-1.4.4.orig/man/mann/funidx.n
-+++ sao-funtools-1.4.4/man/mann/funidx.n
-@@ -129,9 +129,9 @@
+@@ -461,4 +461,4 @@ notation (use decimal, hex, or octal instead). Please contact us if
+ this is a problem.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funidx.n b/man/mann/funidx.n
+index 02711b7..b7971a7 100644
+--- a/man/mann/funidx.n
++++ b/man/mann/funidx.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funidx n"
+-.IX Title "funidx n"
-.TH funidx n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funidx 1 "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
+Funidx \- Using Indexes to Filter Rows in a Table
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document contains a summary of the user interface for
---- sao-funtools-1.4.4.orig/man/mann/funregions.n
-+++ sao-funtools-1.4.4/man/mann/funregions.n
-@@ -129,9 +129,9 @@
+@@ -324,4 +324,4 @@ event files. It does not work with text files. This restriction might be
+ removed in a future release.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funregions.n b/man/mann/funregions.n
+index e468f53..04c5a54 100644
+--- a/man/mann/funregions.n
++++ b/man/mann/funregions.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funregions n"
+-.IX Title "funregions n"
-.TH funregions n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funregions 1 "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
+FunRegions \- Spatial Region Filtering
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document contains a summary of the user interface for spatial
---- sao-funtools-1.4.4.orig/man/mann/funtext.n
-+++ sao-funtools-1.4.4/man/mann/funtext.n
-@@ -129,9 +129,9 @@
+@@ -675,4 +675,4 @@ Region Coordinates, and
+ Region Boundaries.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funtext.n b/man/mann/funtext.n
+index 041c0bc..d913223 100644
+--- a/man/mann/funtext.n
++++ b/man/mann/funtext.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funtext n"
+-.IX Title "funtext n"
-.TH funtext n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funtext 1 "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
+Funtext \- Support for Column\-based Text Files
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document contains a summary of the options for processing column-based
---- sao-funtools-1.4.4.orig/man/mann/funtools.n
-+++ sao-funtools-1.4.4/man/mann/funtools.n
-@@ -129,9 +129,9 @@
+@@ -710,4 +710,4 @@ The issue of data type transitions (which to allow and which to disallow)
+ is still under discussion.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/funtools.n b/man/mann/funtools.n
+index 31a69b2..c69b82c 100644
+--- a/man/mann/funtools.n
++++ b/man/mann/funtools.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funtools n"
+-.IX Title "funtools n"
-.TH funtools n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funtools 1 "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
+Funtools \- FITS Users Need Tools
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document is the Table of Contents for Funtools.
---- sao-funtools-1.4.4.orig/man/mann/funview.n
-+++ sao-funtools-1.4.4/man/mann/funview.n
-@@ -129,9 +129,9 @@
+@@ -208,7 +208,7 @@ Funtools \s-1ASCII\s0 output
+ [\fIfuntbl\fR\|(1)]
+ .IP "\(bu" 4
+ funtools and ds9 image display
+-[funds9(n)]
++[funds9(7)]
+ .RE
+ .RS 4
+ .RE
+@@ -302,7 +302,7 @@ imblank: blank out image values below a threshold
+ .RE
+ .IP "\(bu" 4
+ Funtools Data Files
+-[funfiles(n)]
++[funfiles(7)]
+ .RS 4
+ .IP "\(bu" 4
+ Supported Data Formats
+@@ -334,35 +334,35 @@ Funtools Data Filtering
+ .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 @@ Miscellaneous
+ .RS 4
+ .IP "\(bu" 4
+ Funtools Environment Variables
+-[funenv(n)]
++[funenv(7)]
+ .IP "\(bu" 4
+ Funtools ChangeLog
+ .RE
+diff --git a/man/mann/funview.n b/man/mann/funview.n
+index 187eb6e..8c2da90 100644
+--- a/man/mann/funview.n
++++ b/man/mann/funview.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "funview n"
+-.IX Title "funview n"
-.TH funview n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH funview 1 "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
+Funview \- Database View Support for Tables
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document contains a summary of the options for utilizing
---- sao-funtools-1.4.4.orig/man/mann/regalgebra.n
-+++ sao-funtools-1.4.4/man/mann/regalgebra.n
-@@ -129,9 +129,9 @@
+diff --git a/man/mann/regalgebra.n b/man/mann/regalgebra.n
+index 482867e..3bb6e3c 100644
+--- a/man/mann/regalgebra.n
++++ b/man/mann/regalgebra.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "regalgebra n"
+-.IX Title "regalgebra n"
-.TH regalgebra n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH regalgebra 1 "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
+RegAlgebra \- Boolean Algebra on Spatial Regions
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document describes the boolean arithmetic defined for
---- sao-funtools-1.4.4.orig/man/mann/regbounds.n
-+++ sao-funtools-1.4.4/man/mann/regbounds.n
-@@ -129,9 +129,9 @@
+@@ -397,4 +397,4 @@ The two smaller circles are entirely contained within the two exclude
+ \&\fB\s-1PIE\s0\fR slices and therefore are excluded from the region.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/regbounds.n b/man/mann/regbounds.n
+index d83ce83..4fc9da7 100644
+--- a/man/mann/regbounds.n
++++ b/man/mann/regbounds.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "regbounds n"
+-.IX Title "regbounds n"
-.TH regbounds n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH regbounds 1 "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
+RegBounds \- Region Boundaries
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
Describes how spatial region boundaries are handled.
---- sao-funtools-1.4.4.orig/man/mann/regcoords.n
-+++ sao-funtools-1.4.4/man/mann/regcoords.n
-@@ -129,9 +129,9 @@
+@@ -302,4 +302,4 @@ that funcnts would give the exact same results regardless of whether
+ a table or a derived non-blocked binned image is used.]
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/regcoords.n b/man/mann/regcoords.n
+index 04c1f5f..678fea6 100644
+--- a/man/mann/regcoords.n
++++ b/man/mann/regcoords.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "regcoords n"
+-.IX Title "regcoords n"
-.TH regcoords n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH regcoords 1 "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
+RegCoords \- Spatial Region Coordinates
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document describes the specification of coordinate systems, and the
---- sao-funtools-1.4.4.orig/man/mann/regdiff.n
-+++ sao-funtools-1.4.4/man/mann/regdiff.n
-@@ -129,9 +129,9 @@
+@@ -342,4 +342,4 @@ can be generated safely by asking ds9 to save/display regions in
+ pixels using the \s-1PHYSICAL\s0 coordsys.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/regdiff.n b/man/mann/regdiff.n
+index 63746f0..475c594 100644
+--- a/man/mann/regdiff.n
++++ b/man/mann/regdiff.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "regdiff n"
+-.IX Title "regdiff n"
-.TH regdiff n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH regdiff 1 "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
+RegDiff \-Differences Between Funtools and IRAF Regions
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
Describes the differences between Funtools/ds9 regions and the old \s-1IRAF/PROS\s0
---- sao-funtools-1.4.4.orig/man/mann/reggeometry.n
-+++ sao-funtools-1.4.4/man/mann/reggeometry.n
-@@ -129,9 +129,9 @@
+@@ -178,4 +178,4 @@ Spatial Region Filtering
+ for more information.
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
+diff --git a/man/mann/reggeometry.n b/man/mann/reggeometry.n
+index 3f3c7ac..58b0a5e 100644
+--- a/man/mann/reggeometry.n
++++ b/man/mann/reggeometry.n
+@@ -128,10 +128,10 @@
+ .rm #[ #] #H #V #F C
.\" ========================================================================
.\"
- .IX Title "reggeometry n"
+-.IX Title "reggeometry n"
-.TH reggeometry n "January 2, 2008" "version 1.4.2" "SAORD Documentation"
-+.TH reggeometry 1 "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
+RegGeometry \- Geometric Shapes in Spatial Region Filtering
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document describes the geometry of regions available for spatial
+@@ -1268,4 +1268,4 @@ Note that you must supply an image of the appropriate size \*(-- in this case,
+ a \s-1FITS\s0 image of dimension 40x40 is used.]
+ .SH "SEE ALSO"
+ .IX Header "SEE ALSO"
+-See funtools(n) for a list of Funtools help pages
++See funtools(7) for a list of Funtools help pages
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
index f70466f..decaae1 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/fix_paths.patch
@@ -42,22 +42,3 @@ Description: Fix the paths for a chroot build and for FHS
chmod 755 $$i; \
else true; \
fi; \
-@@ -462,14 +462,14 @@ install-binaries: lib $(PROGS) $(SCRIPTS
- 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/.1/`; \
-+ E=`echo $$i | awk -F. '{print $$NF}' | sed s/n/1/`; \
- M="$(MAN_INSTALL_DIR)/man$$E"; \
- if [ ! -d $$M ] ; then \
- echo "Making directory $$M"; \
-
--
Minimal buy-in FITS library and utility package
More information about the debian-science-commits
mailing list