[Debian-astro-commits] [iraf] 02/03: Correct minor things found by Lintian

Ole Streicher olebole at moszumanska.debian.org
Thu Nov 23 12:34:36 UTC 2017 

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

olebole pushed a commit to branch master
in repository iraf.

commit 221a0ca37e27077eda4a755bb4c433fe31a4c408
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Nov 23 11:29:49 2017 +0100

    Correct minor things found by Lintian
---
 debian/TODO                   |  4 +++-
 debian/control                |  2 +-
 debian/copyright              | 49 ++++++++++++++++++++++++++++++-------------
 debian/iraf.links             |  7 +------
 debian/iraf.lintian-overrides |  4 ----
 debian/rules                  |  2 +-
 6 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 44e27d3..b9ee861 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -18,7 +18,7 @@
     iraf-common             - irafcl, mkiraf, sgidispatch
 
 * Add aliases "cl", "ecl" to iraf-cl in setup.sh. Fix "iraf" alias to
-  work with xterm as well.
+  work with xterm as well. Default to xterm terminal.
    
 * Run unit tests on build and as CI
 
@@ -33,3 +33,5 @@
   /usr/share/iraf 
 
 * Check portability: little endian will probably work.
+
+* Propagate CFLAGS (Hardening)
diff --git a/debian/control b/debian/control
index 6a751a2..8c1ad24 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Package: iraf-dev
 Architecture: any
 Multi-Arch: foreign
 Depends: iraf, ${misc:Depends}, ${shlibs:Depends}
-Description: Image Reduction and Analysis Facility (common files)
+Description: Image Reduction and Analysis Facility (development files)
  IRAF is the "Image Reduction and Analysis Facility". The main
  IRAF distribution includes a good selection of programs for
  general image processing and graphics, plus a large number of
diff --git a/debian/copyright b/debian/copyright
index dd08002..b14ea19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: 1986-2014 Association of Universities for Research in Astronomy Inc.
  2006-2009 Chisato Yamauchi
 License: IRAF
 
-Files: pkg/*cl/ytab.[ch]
+Files: pkg/*cl/ytab.*
 Copyright: 1984-2006 Free Software Foundation, Inc
 License: GPL-2+
 Comment: As a special exception, you may create a larger work that
@@ -22,7 +22,7 @@ Comment: As a special exception, you may create a larger work that
  without this special exception.
 
 Files: unix/hlib/libc/stdarg-gcc.h
-Copyright; 1989-2000 Free Software Foundation, Inc.
+Copyright: 1989-2000 Free Software Foundation, Inc.
 License: GPL-2+
 Comment: As a special exception, if you include this header file into
  source files compiled by GCC, this header file does not by itself
@@ -53,29 +53,33 @@ Comment: License clarified for scipy; see
  J. Hanso:Solving Least Squares Problems", 1974.
 
 Files: math/bevington/*
+Copyright: not applicable
 License: public-domain
-Comment: These files were copied from this book: Bevington, Robinson: Data
+ These files were copied from this book: Bevington, Robinson: Data
  Reduction and Error Analysis for the Physical Sciences. 1st ed. from
- 1969. This code is from from before 1976 and does not contain a
- copyright statement, so according to the Copyright Act of 1976 it is
- public domain.
+ 1969. This code is from before 1976 and does not contain a copyright
+ statement, so according to the Copyright Act of 1976 it is public
+ domain.
 
 Files: math/deboor/*
+Copyright: not applicable
 License: public-domain
-Comment: Carl Deboor wrote these files 1978 as an U.S. government employee.
+ Carl Deboor wrote these files 1978 as an U.S. government employee.
  Reference: Carl DeBoor: A Practical Guide to Splines, 1978.
 
 Files: math/fftpack/*
+Copyright: not applicable
 License: public-domain
-Comment:  FFTPACK was developed by Paul Swarztrauber of the National
- Center for Atmospheric Research as an US government employeee.
+ FFTPACK was developed by Paul Swarztrauber of the National Center for
+ Atmospheric Research as an US government employeee.
 
 Files:  math/minpack/*
+Copyright: not applicable
 License: public-domain
-Comment: The original minpack code (where the code in IRAF derivates
- from; it went into IRAF ~1992) was written by by B. Garbow,
- K. Hillstrom, J. More' (Argonne National Laboratory, MINPACK project,
- in March 1980) and is public domain.
+ The original minpack code (where the code in IRAF derivates from; it
+ went into IRAF ~1992) was written by B. Garbow, K. Hillstrom,
+ J. More' (Argonne National Laboratory, MINPACK project, in March
+ 1980) and is public domain.
 
 Files: noao/astutil/asttools/asttimes.x
 Copyright: 2013-2017 NumFOCUS Foundation
@@ -98,7 +102,7 @@ License: BSD-3-Clause
 
 Files: vendor/cfitsio/cfortran.*
 Copyright: 1990-2003 Burkhard Burow
-License: LGPL-2+ | CFORTRAN
+License: LGPL-2+ or CFORTRAN
 
 Files: vendor/readline/*
 Copyright: 1992 Free Software Foundation, Inc.
@@ -521,7 +525,7 @@ License: CDDL
  California and the state courts of the State of California, with
  venue lying in Santa Clara County, California.
 
-License: GPL2+
+License: GPL-2+
  This program 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, or (at your option)
@@ -535,6 +539,21 @@ License: GPL2+
  On Debian systems, the full text of the GNU General Public License
  version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
 
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ . 
+ On Debian systems, the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2'.
+
 License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/debian/iraf.links b/debian/iraf.links
index 17c7bb9..454ef53 100644
--- a/debian/iraf.links
+++ b/debian/iraf.links
@@ -1,6 +1 @@
-usr/lib/iraf/mkpkg.e /usr/bin/mkpkg
-usr/lib/iraf/xc.e /usr/bin/xc
-usr/lib/iraf/generic.e /usr/bin/iraf-generic
-usr/lib/iraf/xyacc.e /usr/bin/iraf-xyacc
-usr/lib/iraf/rpp.e /usr/bin/iraf-rpp
-usr/lib/iraf/xpp.e /usr/bin/iraf-xpp
+/usr/share/iraf/unix/hlib/cl.sh /usr/bin/irafcl
diff --git a/debian/iraf.lintian-overrides b/debian/iraf.lintian-overrides
index bd914be..1dae331 100644
--- a/debian/iraf.lintian-overrides
+++ b/debian/iraf.lintian-overrides
@@ -1,11 +1,7 @@
 # Since the package is really old, we will find some really old
 # files here. This is not a bug.
 package-contains-ancient-file *
-# This is a false positive (read()).
-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/rules b/debian/rules
index 42505b5..c4db6d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git

More information about the Debian-astro-commits mailing list