[funtools] 03/06: Rename manpages of section 3. Closes: #759687, and others

Ole Streicher olebole at moszumanska.debian.org
Sun Oct 26 19:23:38 UTC 2014


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

olebole pushed a commit to branch debian
in repository funtools.

commit 5499e9dc20781803b63744a79f30213c8a9831e8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 26 19:39:06 2014 +0100

    Rename manpages of section 3. Closes: #759687, and others
---
 debian/changelog                  |   9 ++-
 debian/control                    |   4 +-
 debian/copyright                  |  10 +--
 debian/patches/fix_manpages.patch | 143 +++++++++++++++++++++++++++-----------
 debian/rules                      |  12 ++++
 debian/watch                      |   2 +-
 6 files changed, 130 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 245c544..2c0a977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-funtools (1.4.4+dfsg-2) UNRELEASED; urgency=low
+funtools (1.4.4+dfsg2-1) unstable; urgency=low
 
-  * Update maintainers e-mail address
+  * Change uploader's e-mail address
+  * Change VCS repository location to debian-astro
   * Update standards version to 3.9.6. No changes needed.
+  * Remove prebuilt .chm file to make lintian happy.
+  * Rename manpages of section 3. Closes: #759687
 
- -- Ole Streicher <olebole at debian.org>  Thu, 25 Sep 2014 12:21:32 +0200
+ -- Ole Streicher <olebole at debian.org>  Sun, 26 Oct 2014 19:39:21 +0100
 
 funtools (1.4.4+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b971333..819dfd3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: autotools-dev,
                zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: https://www.cfa.harvard.edu/~john/funtools/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/funtools.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/funtools.git
+Vcs-Git: git://anonscm.debian.org/debian-astro/packages/funtools.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/funtools.git
 
 Package: funtools
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index f6ccbe4..8febcb5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: funtools
 Upstream-Author: Eric Mandel <eric at head.cfa.havard.edu>
 Source: http://hea-www.harvard.edu/saord/funtools/
-Files-Excluded: filter/ftest gnu/_sort util/tfoo .*
+Files-Excluded: filter/ftest gnu/_sort util/tfoo .* util/zlib-1.2.3/contrib/dotzlib/DotZLib.chm
 
 Files: *
 Copyright: Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory,
  Cambridge, MA, USA
  Copyright (c) 1991-2003 John B. Roll jr.
  Copyright (C) 1988-1995 Free Software Foundation, Inc.
-License: GPLv2
+License: GPL
  Funtools is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
@@ -36,7 +36,7 @@ Files: wcs/*
 Copyright:  Copyright (C) 1994-2002, Mark Calabretta
  Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory,
  Cambridge, MA, USA
-License: LGPLv2+
+License: LGPL
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -56,7 +56,7 @@ License: LGPLv2+
 
 Files: util/zlib-1.2.3/*
 Copyright: Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-License: BSD
+License: BSD-3
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
@@ -82,4 +82,4 @@ License: BSD
 Files: debian/*
 Copyright: not applicable
 License: public-domain
- Debian packaging by Ole Streicher <debian at liska.ath.cx>
+ Debian packaging by Ole Streicher <olebole at debian.org>
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 25a5f29..90a4e16 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -2,7 +2,7 @@ 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-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
+@@ -462,14 +462,19 @@
  install-man:
  	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
  	    echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -37,7 +37,7 @@ Description: Fix manpages (section and name) so that lintian does not complain
  install-share:
 --- 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:
+@@ -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
@@ -45,7 +45,7 @@ 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
-@@ -539,7 +538,6 @@ fundisp \-F',' snr.ev'[cir 512 512 .1]'
+@@ -539,7 +538,6 @@
  .PP
  fundisp \-F',' snr.ev'[cir 512 512 .1]' | sed 's/ *, */,/g'
         X,Y,PHA,PI,TIME,DX,DY
@@ -55,7 +55,7 @@ Description: Fix manpages (section and name) so that lintian does not complain
       512,512,5,6,79493631.03866175,578,575
 --- a/man/mann/funcombine.n
 +++ b/man/mann/funcombine.n
-@@ -128,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -64,11 +64,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -77,11 +80,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -90,11 +96,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -103,11 +112,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -116,11 +128,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -129,11 +144,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -142,11 +160,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.IX Title "funregions 7"
 +.TH funregions 7 "January 2, 2008" "version 1.4.2" "SAORD Documentation"
  .SH "NAME"
- \&\fBRegions: Spatial Region Filtering\fR
+-\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -155,11 +176,14 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -168,9 +192,12 @@ Description: Fix manpages (section and name) so that lintian does not complain
 +.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
++\&\fBFuntools \- FITS Users Need Tools\fR
  .SH "SYNOPSIS"
-@@ -208,7 +208,7 @@ Funtools \s-1ASCII\s0 output
+ .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
@@ -179,7 +206,7 @@ Description: Fix manpages (section and name) so that lintian does not complain
  .RE
  .RS 4
  .RE
-@@ -302,7 +302,7 @@ imblank: blank out image values below a threshold
+@@ -302,7 +302,7 @@
  .RE
  .IP "\(bu" 4
  Funtools Data Files
@@ -188,7 +215,7 @@ Description: Fix manpages (section and name) so that lintian does not complain
  .RS 4
  .IP "\(bu" 4
  Supported Data Formats
-@@ -334,35 +334,35 @@ Funtools Data Filtering
+@@ -334,35 +334,35 @@
  .RS 4
  .IP "\(bu" 4
  Table Filtering
@@ -233,7 +260,7 @@ Description: Fix manpages (section and name) so that lintian does not complain
  .RE
  .RS 4
  .RE
-@@ -371,7 +371,7 @@ Miscellaneous
+@@ -371,7 +371,7 @@
  .RS 4
  .IP "\(bu" 4
  Funtools Environment Variables
@@ -242,11 +269,9 @@ Description: Fix manpages (section and name) so that lintian does not complain
  .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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -255,11 +280,14 @@ index 187eb6e..8c2da90 100644
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -268,11 +296,14 @@ index 187eb6e..8c2da90 100644
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -281,11 +312,14 @@ index 187eb6e..8c2da90 100644
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -294,11 +328,14 @@ index 187eb6e..8c2da90 100644
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -307,11 +344,14 @@ index 187eb6e..8c2da90 100644
 +.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
++\&\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,8 +128,8 @@
+@@ -128,10 +128,10 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -320,8 +360,11 @@ index 187eb6e..8c2da90 100644
 +.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
++\&\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 @@
@@ -333,3 +376,25 @@ index 187eb6e..8c2da90 100644
  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/rules b/debian/rules
index 8ff4ec4..7808bbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,18 @@ override_dh_auto_configure:
 override_dh_auto_build: 
 	dh_auto_build -- all shtclfun
 
+override_dh_installman:
+	dh_installman
+	for t in  FunClose FunImageGet FunInfoPut FunRef FunColumnActivate \
+	 FunImagePut FunLib FunTableRowGet FunColumnLookup FunImageRowGet \
+	 FunOpen FunTableRowPut FunColumnSelect FunImageRowPut FunParamGet \
+	 FunFlush FunInfoGet FunParamPut ; do \
+	  s=$$(echo $$t | tr [A-Z] [a-z]) ; \
+	  mv debian/libfuntools-dev/usr/share/man/man3/$$s.3 \
+	     debian/libfuntools-dev/usr/share/man/man3/$$t.3 ; \
+	done
+
+
 override_dh_installchangelogs:
 	dh_installchangelogs doc/changelog.html
 
diff --git a/debian/watch b/debian/watch
index f0b4670..70155b9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
+opts=dversionmangle=s/\+dfsg.*// \
 http://cfa-www.harvard.edu/~john/funtools .+funtools-(.+)\.tar\.gz

-- 
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