[SCM] Image Reduction and Analysis Facility branch, debian, updated. 6107a0ee18d6473fac0738ee3ee79848eca6bc34

Ole Streicher debian at liska.ath.cx
Wed Jun 5 09:44:06 UTC 2013


The following commit has been merged in the debian branch:
commit 6107a0ee18d6473fac0738ee3ee79848eca6bc34
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 5 11:43:59 2013 +0200

    Simplify copyright: remove the licenses of the files removed by debian/repack.sh

diff --git a/debian/copyright b/debian/copyright
index ed40440..97da44b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,10 +4,12 @@ Upstream-Author: IRAF programming group at the National Optical Astronomy Observ
 Source: ftp://iraf.noao.edu/iraf/
 
 Files: *
-Copyright: Copyright(c) 1986 Association of Universities for Research in Astronomy Inc.
- Copyright: 1989-2000 Free Software Foundation, Inc
- Copyright: 1990-2001 by AT&T, Lucent Technologies and Bellcore
- Copyright: 2004 Sun Microsystems, Inc. / 1988 AT&T
+Copyright: 1986,1995 Association of Universities for Research in Astronomy Inc.
+ 1984-2006 Free Software Foundation, Inc
+ 1990-2001 by AT&T, Lucent Technologies and Bellcore
+ 1995-1999 Rutherford Appleton Laboratory,
+ 1997 P.T.Wallace Starlink
+ 2004 Sun Microsystems, Inc. / 1988 AT&T
 License: MIT with advertising clause
  The IRAF software is publicly available, but is NOT in the public domain.
  The difference is that copyrights granting rights for unrestricted use and
@@ -40,60 +42,10 @@ Comment: If another compiler than gcc is used, the files
  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.
-
-Files: math/sla/*
-Copyright: P.T.Wallace Starlink 1997,
- Copyright (C) 1995-1999 Rutherford Appleton Laboratory,
- Copyright (C) 1995 Association of Universities for Research in Astronomy Inc.
-License: GPLv2+
-Comment: The license is not explicitly mentioned in these files.
- However, the author (Patrick Wallace) stated that they are not covered
- by the common iRAF license, but by the GPL.
-
-Files: pkg/*/ytab.[ch]
-Copyright: Copyright (C) 1984-2006 Free Software Foundation, Inc.
-License: GPLv2+
-
-License: GPLv2+
- 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 of the License, or
- (at your option) any later version.
- .
- This program 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 General Public License for more details.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: unix/hlib/libc/stdarg-freebsd.h
-Copyright: Copyright (c) 2002 David E. O'Brien.
- Copyright (c) 1991, 1993 The Regents of the University of California.
-License: BSD-4
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
-   This product includes software developed by the University of
-   California, Berkeley and its contributors.
  .
- 4. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ 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.
 
 Files: sys/gio/ncarutil/*
 Copyright: Copyright (C) 1986, 2007-2011 University Corporation for
@@ -483,64 +435,14 @@ 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
+Comment: See local/LICENSES/OpenSolaris_License-CDDL.pdf as reference.
+ The file  unix/hlib/stdarg-solaris.h is not used here.
 
 Files: debian/*
 Copyright: 2012 Ole Streicher <debian at liska.ath.cx>
 License: expat
 Note: This package was first debianized by Zed Pobre <zed at debian.org>
- on Monday, 10 March 1998
-
-Files: pkg/ecl/readline/* pkg/vocl/readline/*
-Copyright: 1987-2004 Free Software Foundation, Inc.
-License: GPLv2+
-Note: These files are not used to create the package.
-
-Files: vendor/voclient/common/curl-7.18.2/*
- vendor/voclient/libsamp/libxrpc/curl-7.20.1/*
- vendor/voclient/libsamp/libxrpc/curl/*
- vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/*
- vendor/voclient/libsamp/libxrpc/include/xmlrpc-c/server_w32httpsys.h
- vendor/voclient/libsamp/libxrpc/include/xmlrpc_server_w32httpsys.h
- vendor/voclient/libsamp/libxrpc/xmlrpc-c/*
-Copyright: 1996-2012, Daniel Stenberg <daniel at haxx.se>,
- 2001 by First Peer, Inc. All rights reserved.,
- 2001 by Eric Kidd. All rights reserved.,
- 2005 by Steven A. Bone, sbone at pobox.com. All rights reserved.
-License: BSD (3 clause)
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-Note: These files are not used to create the package.
-
-Files: vendor/voclient/common/expat-2.0.1/*
- vendor/voclient/common/expat/*
- vendor/voclient/libsamp/cfitsio/*
-Copyright: 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper,
- 2001-2006 Expat maintainers,
- 2000 Smithsonian Astrophysical Observatory,
- 1984-1993 Free Software Foundation, Inc,
- 1986-1993 Association of Universities for Research in Astronomy Inc.,
- 1995-2010 Jean-loup Gailly and Mark Adler,
- 1996-2011 William Pence
-License: expat
-Note: These files are not used to create the package.
+ on Monday, 10 March 1998. From him, I took mainly the manpages.
+ .
+ The build structure was taken from the Fedora approach made by
+ Joseph Wang <joequant at gmail.com> which I adopted as a start.

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list