[SCM] Image Reduction and Analysis Facility branch, debian, updated. 699a0f6faed403d953dbf4635104f2c0bcf5545c
Ole Streicher
debian at liska.ath.cx
Wed Jun 5 12:20:18 UTC 2013
The following commit has been merged in the debian branch:
commit 699a0f6faed403d953dbf4635104f2c0bcf5545c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jun 5 14:20:11 2013 +0200
Silence Lintian
diff --git a/debian/copyright b/debian/copyright
index 97da44b..c7ea21e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,16 +36,16 @@ License: MIT with advertising clause
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Comment: If another compiler than gcc is used, the files
- unix/hlib/libc/stdarg-*.h fall (additionally?) under GPL. See these
+ unix/hlib/libc/stdarg-*.h fall (additionally?) under the GPL. See these
files for details.
.
The math/ directory contains several packages that were copied from
books. I got the confirmation from NOAO that theses files are distributable
under this license.
.
- The files pkg/*/ytab.[ch] are GPL licensed but as a special exception
- they are allowed to be distributed under any license in our case. So, they
- are also covered by the MIT license.
+ The files pkg/*/ytab.[ch] are licensed by the GPL, but as a special
+ exception they are allowed to be distributed under any license in our
+ case. So, they are also covered by this MIT license.
Files: sys/gio/ncarutil/*
Copyright: Copyright (C) 1986, 2007-2011 University Corporation for
@@ -73,7 +73,6 @@ License: expat
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
SOFTWARE.
-Comment: see local/LICENSES/UCAR as reference
Files: unix/boot/xyacc/* unix/hlib/stdarg-solaris.h
Copyright: Copyright: 1988 AT&T, 2008 Sun Microsystems, Inc.
@@ -435,8 +434,7 @@ License: CDDL
to the jurisdiction of the Federal Courts of the Northern District of
California and the state courts of the State of California, with
venue lying in Santa Clara County, California.
-Comment: See local/LICENSES/OpenSolaris_License-CDDL.pdf as reference.
- The file unix/hlib/stdarg-solaris.h is not used here.
+Comment: The file unix/hlib/stdarg-solaris.h is not used here.
Files: debian/*
Copyright: 2012 Ole Streicher <debian at liska.ath.cx>
diff --git a/debian/iraf-common.lintian-overrides b/debian/iraf-common.lintian-overrides
index 1935af8..bc973cf 100644
--- a/debian/iraf-common.lintian-overrides
+++ b/debian/iraf-common.lintian-overrides
@@ -4,3 +4,5 @@ csh-considered-harmful *
# Since the package is really old, we will find some really old
# files here. This is not a bug.
package-contains-ancient-file *
+# The GPL is just mentioned in a notice.
+copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/iraf-noao-common.lintian-overrides b/debian/iraf-noao-common.lintian-overrides
index 6e68748..4312d3e 100644
--- a/debian/iraf-noao-common.lintian-overrides
+++ b/debian/iraf-noao-common.lintian-overrides
@@ -1,3 +1,5 @@
# Since the package is really old, we will find some really old
# files here. This is not a bug.
package-contains-ancient-file *
+# The GPL is just mentioned in a notice.
+copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/iraf-noao.lintian-overrides b/debian/iraf-noao.lintian-overrides
index c219bc2..cf482a8 100644
--- a/debian/iraf-noao.lintian-overrides
+++ b/debian/iraf-noao.lintian-overrides
@@ -2,5 +2,7 @@
# files here. This is not a bug.
package-contains-ancient-file *
# This is a false positive.
-spelling-error-in-binary usr/lib/x86_64-linux-gnu/iraf/noao/bin/* teH the
-spelling-error-in-binary usr/lib/x86_64-linux-gnu/iraf/noao/bin/* tEH the
+spelling-error-in-binary usr/lib/iraf/noao/bin/* teH the
+spelling-error-in-binary usr/lib/iraf/noao/bin/* tEH the
+# The GPL is just mentioned in a notice.
+copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/iraf-vo-common.lintian-overrides b/debian/iraf-vo-common.lintian-overrides
index 6e68748..4312d3e 100644
--- a/debian/iraf-vo-common.lintian-overrides
+++ b/debian/iraf-vo-common.lintian-overrides
@@ -1,3 +1,5 @@
# Since the package is really old, we will find some really old
# files here. This is not a bug.
package-contains-ancient-file *
+# The GPL is just mentioned in a notice.
+copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/iraf-vo.lintian-overrides b/debian/iraf-vo.lintian-overrides
index 41a302b..922503e 100644
--- a/debian/iraf-vo.lintian-overrides
+++ b/debian/iraf-vo.lintian-overrides
@@ -2,4 +2,6 @@
# files here. This is not a bug.
package-contains-ancient-file *
# This is a false positive.
-spelling-error-in-binary usr/lib/x86_64-linux-gnu/iraf/vo/bin/* tEH the
+spelling-error-in-binary usr/lib/iraf/vo/bin/* tEH the
+# The GPL is just mentioned in a notice.
+copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/iraf.lintian-overrides b/debian/iraf.lintian-overrides
index bc39f95..bd914be 100644
--- a/debian/iraf.lintian-overrides
+++ b/debian/iraf.lintian-overrides
@@ -6,3 +6,6 @@ hardening-no-fortify-functions usr/lib/iraf/unix/bin/sgi2uptx.e
# This is a false positive.
spelling-error-in-binary usr/lib/iraf/bin/* teH the
spelling-error-in-binary usr/lib/iraf/bin/* tEH the
+spelling-error-in-binary usr/lib/iraf/unix/bin/* tEH the
+# The GPL is just mentioned in a notice.
+copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/manpages/iraf-cl.1 b/debian/manpages/iraf-ecl.1
similarity index 90%
copy from debian/manpages/iraf-cl.1
copy to debian/manpages/iraf-ecl.1
index dfa3137..7d636a4 100644
--- a/debian/manpages/iraf-cl.1
+++ b/debian/manpages/iraf-ecl.1
@@ -1,12 +1,12 @@
.\" Hey, EMACS: -*- nroff -*-
-.TH CL 1 "February 10, 2000"
+.TH ECL 1 "February 10, 2000"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
-cl \- IRAF Command Language Interpreter
+ecl \- IRAF Command Language Interpreter
.SH SYNOPSIS
-.B cl
+.B ecl
.SH DESCRIPTION
-.B cl
+.B ecl
starts up the command language interpreter for IRAF, the Image
Reduction and Analysis Facility. It can be fed a series of commands
from stdin that will be executed in sequence.
diff --git a/debian/manpages/iraf-generic.1 b/debian/manpages/iraf-generic.1
index 58e3e99..f481367 100644
--- a/debian/manpages/iraf-generic.1
+++ b/debian/manpages/iraf-generic.1
@@ -198,12 +198,12 @@ any existing files therein. The \fBgeneric\fP task is a bootstrap
utility written in C and is implemented as a CL foreign task, hence
the UNIX command syntax.
- cl> generic -k -p ak/ -t silrdx aadd.gx
+ cl> generic \-k \-p ak/ \-t silrdx aadd.gx
2. Perform an inline transformation ($FOR directive) of the source
file "imsum.gx", producing the single file "imsum.x" as output.
- cl> generic -k -o imsum.x imsum.gx
+ cl> generic \-k \-o imsum.x imsum.gx
3. The following is a simple example of a typical generic source file.
For additional examples, see the ".gx" sources in the VOPS, IMIO,
diff --git a/debian/manpages/mkpkg.1 b/debian/manpages/mkpkg.1
index 4881e49..8ecac2b 100644
--- a/debian/manpages/mkpkg.1
+++ b/debian/manpages/mkpkg.1
@@ -19,7 +19,7 @@ mkpkg \- make or update an IRAF package or library
.B -d[ddd]
Debug mode. Print detailed messages describing what \fImkpkg\fR is doing.
There are four levels of debug messages, selected by repeating the "d"
-character in the switch, e.g., "-d" is level one, "-dd" is level two, and
+character in the switch, e.g., "\-d" is level one, "\-dd" is level two, and
so on. The debug messages get progressively more detailed as the debug level
increases. Debug mode automatically enables the verbose mode messages.
.TP
@@ -35,12 +35,12 @@ cases it does anyhow, so this switch has little effect at present.
.TP
.B -n
No execute. Go through the motions, but do not touch any files. No
-execute mode automatically enables verbose mode (flag "-v"). This
+execute mode automatically enables verbose mode (flag "\-v"). This
switch should be used to verify new mkpkg files before execution.
.TP
.B -p \fIpkgname\fP
Load the package environment for the named external package, e.g.,
-"mkpkg -p noao update". If the same package is always specified
+"mkpkg \-p noao update". If the same package is always specified
the environment variable or logical name PKGENV may be defined at the
host level to accomplish the same thing. The package name \fImust\fR
be specified when doing software development in an external or layered
@@ -243,7 +243,7 @@ operator.
zeta.f
;
i2:
- $set XFLAGS = "-cO -i2"
+ $set XFLAGS = "\-cO \-i2"
gamma.f
delta.f
;
@@ -286,7 +286,7 @@ as in the following example, which prints the pathname of the
\fBdev$graphcap\fR file on the \fBmkpkg\fR standard output. The sequence
"$(" triggers macro substitution. The value of a symbol may be obtained
interactively from the standard input by adding a question mark after the
-left parenthesis, i.e., "$(?terminal)" (this does not work with the -f stdin
+left parenthesis, i.e., "$(?terminal)" (this does not work with the \-f stdin
flag). The contents of a file may be included using the notation
"$(@\fIfile\fR)". Note that case is ignored in macro names; by convention,
logical directories are normally given in lower case, and locally defined
@@ -321,7 +321,7 @@ symbol table. The sequence "$$" is replaced by a single "$" whenever
it is encountered in the input stream.
.nf
- $set GFLAGS = "-k -t silrdx -p ak/"
+ $set GFLAGS = "\-k \-t silrdx \-p ak/"
$set GEN = "$generic $$(GFLAGS)"
ifolder (amulr.x, amul.x) $(GEN) amul.x $endif
@@ -434,13 +434,13 @@ operation makes the file accessible as if it were in the current
directory; checkout is implemented either as a symbolic link or as a
physical file copy depending upon the host system. The referenced
directory may be a logical directory, e.g., "lib$", or a path, e.g,
-"pkg$images/". Checkout is not disabled by the "-n" flag.
+"pkg$images/". Checkout is not disabled by the "\-n" flag.
.TP
.B $checkin \fIfile directory
.sp
Check the named file back into the indicated directory. The checkin operation
is implemented either as a remove link or copy and delete depending upon the
-host system. Checkin is not disabled by the "-n" flag.
+host system. Checkin is not disabled by the "\-n" flag.
.TP
.B $copy \fIfilea fileb
.sp
@@ -567,7 +567,7 @@ Sample mkpkg-file for the above commands:
relink:
$update libpkg.a
$omake x_mypkg.x
- $link x_mypkg.o -lxtools
+ $link x_mypkg.o \-lxtools
;
libpkg.a:
@@ -578,7 +578,7 @@ Sample mkpkg-file for the above commands:
;
listing:
- !pr task1.x task2.x file[ab].x | vpr -Pvup
+ !pr task1.x task2.x file[ab].x | vpr \-Pvup
;
.fi
diff --git a/debian/manpages/rmbin.1 b/debian/manpages/rmbin.1
index 538970b..c63e6f4 100644
--- a/debian/manpages/rmbin.1
+++ b/debian/manpages/rmbin.1
@@ -41,18 +41,18 @@ a list of binary files for some purpose other than deletion. For
example, on a UNIX host, the following command will compute the disk
space used by the binary files in a directory tree:
- % du `rmbin -n .`
+ % du `rmbin \-n .`
-The -n option, of course, is also useful for verifying the delete
+The \-n option, of course, is also useful for verifying the delete
operation before destroying the files.
.TP
.B -o \fIextns\fP
Delete only files with the listed extensions (whitespace delimited).
.TP
.B -r
-Reenable recursive descent. Recursive descent is the default, however
+Re-enable recursive descent. Recursive descent is the default, however
it may be turned off at one point in the command line, and later
-reenabled with this switch.
+re-enabled with this switch.
.TP
.B -v
Print names of files as they are deleted.
@@ -66,7 +66,7 @@ is for a UNIX host, but this works for all other IRAF hosts as well.
.nf
% cd $iraf
- % rmbin -v pkg sys
+ % rmbin \-v pkg sys
.fi
.SH SEE ALSO
diff --git a/debian/manpages/rmfiles.1 b/debian/manpages/rmfiles.1
index 351d5c4..37cb828 100644
--- a/debian/manpages/rmfiles.1
+++ b/debian/manpages/rmfiles.1
@@ -13,7 +13,7 @@ The \fBrmfiles\fR utility is used to delete (or list) files in one or
more directory trees. If only one directory tree is to be pruned the
necessary instructions can be entered on the command line, otherwise a
program file must be used. When developing a program file, a dry run
-using the "-n" switch is recommended to see what files will be
+using the "\-n" switch is recommended to see what files will be
deleted.
If a program file is used each line in the file has one of two
@@ -26,7 +26,7 @@ line, i.e.:
The significance of each field is as described in the ARGUMENTS
section above. The program file may also contain lines of the form
- -file filename
+ \-file filename
to delete one or more files by name. This is useful for removing
files which do not fit into any recognizable class.
@@ -62,10 +62,10 @@ path from the current directory or from a logical directory.
.I action
The possible actions are listed below. This is a required parameter.
.nf
- -all Delete all files.
- -allbut Delete all files except those with
+ \-all Delete all files.
+ \-allbut Delete all files except those with
the listed extensions.
- -only Delete only those files with the
+ \-only Delete only those files with the
listed extensions.
.fi
.TP
@@ -80,7 +80,7 @@ running \fBrmfiles\fR.
.nf
cl> cd iraf
- cl> rmfiles -v pkg .o .e .a .hd
+ cl> rmfiles \-v pkg .o .e .a .hd
.fi
2. Strip the entire IRAF system, using the program in file
@@ -89,7 +89,7 @@ problems on some systems since \fBrmfiles\fR is a foreign task.
.nf
cl> cd iraf
- cl> rmfiles -vf hlib$stripper
+ cl> rmfiles \-vf hlib$stripper
.fi
.SH SEE ALSO
diff --git a/debian/manpages/wtar.1 b/debian/manpages/wtar.1
index 80db4bf..5b12432 100644
--- a/debian/manpages/wtar.1
+++ b/debian/manpages/wtar.1
@@ -62,27 +62,27 @@ directory tree rooted at the current directory) is assumed.
.nf
cl> cd iraf
- cl> wtar -of /dev/nrmt8
+ cl> wtar \-of /dev/nrmt8
.fi
2. Archive the "uparm" directory to the VMS logical device MSA0:.
- cl> wtar -f msa0 uparm
+ cl> wtar \-f msa0 uparm
3. Make a disk archive of the LIB and PKG directory trees in your home
directory.
- cl> wtar -f home$archive.tar lib pkg
+ cl> wtar \-f home$archive.tar lib pkg
4. Examine the resultant file to make sure everything worked
correctly.
- cl> rtar -tvf home$archive.tar
+ cl> rtar \-tvf home$archive.tar
5. Make a disk archive, using a host filename for the output file.
- cl> wtar -f /tmp2/arc lib pkg sys
+ cl> wtar \-f /tmp2/arc lib pkg sys
IRAF magtape commands such as \fIrewind\fR may be used with
\fBwtar\fR, but switching between IRAF and host device names can be
diff --git a/debian/manpages/xc.1 b/debian/manpages/xc.1
index d1a1a2e..50a452f 100644
--- a/debian/manpages/xc.1
+++ b/debian/manpages/xc.1
@@ -11,7 +11,7 @@ xc \- portable IRAF compile/link utility
\fBXC\fP is a machine independent utility for compiling and linking
IRAF tasks or files. The XC utility may also be used to compile
and/or link non-IRAF files and tasks. The VMS version of XC supports
-all of the important flags except -D which VMS C doesn't support in
+all of the important flags except \-D which VMS C doesn't support in
any way. It can be used to generate fortran from xpp or ratfor code,
to compile any number of files, and then link them if desired. XC
accepts and maps IRAF virtual filenames, but since it is a standalone
@@ -82,8 +82,8 @@ Tells fortran to use I*4 by default.
This tells the linker which libraries besides the standard ones to
include. These must be either on the current directory, or in an IRAF
system library (lib$ or hlib$). The library specification must be
-immediately after the option as in "-lxtools". No other option may
-follow the 'l' option in the same argument as in -lxtoolsO.
+immediately after the option as in "\-lxtools". No other option may
+follow the 'l' option in the same argument as in \-lxtoolsO.
.TP
.B -L
Creates a list file. VMS specific.
@@ -96,7 +96,7 @@ Not really supported under VMS since "normal" users cannot install
images. In Unix this is just a link option to make a shareable image.
.TP
.B -N
-Same as -z for VMS.
+Same as \-z for VMS.
.TP
.B -Nh \fR[\fIfilename\fR]
This tells xpp that the foreign definitions in the file specified
@@ -104,7 +104,7 @@ should be used in preference to standard include files.
.TP
.B -o
This flag redirects the output of the compile if used in conjunction
-with -c option or specifies where the executable or object is to be
+with \-c option or specifies where the executable or object is to be
placed. If not given the first file name is used to obtain the name
for the executable or object.
.TP
@@ -113,8 +113,8 @@ Optimize object code produced; this is now the default, but this
switch is still provided for backwards compatibility.
.TP
.B -p \fIpkgname
-Load the package environment for the named external package, e.g., "xc
--c -p noao file.x". If the same package is always specified the
+Load the package environment for the named external package, e.g.,
+"xc \-c \-p noao file.x". If the same package is always specified the
environment variable or logical name PKGENV may be defined at the host
level to accomplish the same thing. The package name \fImust\fR be
specified when doing software development in an external or layered
@@ -128,14 +128,14 @@ reason. This may be used and probably should when working with
Fortran due to Dec non-standard extension.
.TP
.B -q
-Disable optimization. Opposite of -O. Object code will be optimized
+Disable optimization. Opposite of \-O. Object code will be optimized
by default.
.TP
.B -s
Strips all symbols and debugging information.
.TP
.B -S
-Same as -s for VMS.
+Same as \-s for VMS.
.TP
.B -v
Verbose mode. Causes messages to be printed during execution telling
--
Image Reduction and Analysis Facility
More information about the debian-science-commits
mailing list