[SCM] Image Reduction and Analysis Facility branch, debian, updated. 2ed5153522c1f923da70822b59c44e6544884252

[Ole Streicher]

The following commit has been merged in the debian branch:
commit d8ac2cfada8ef07d7ad5d30a3cfd70dea8515b25
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jun 2 21:11:32 2013 +0200

    Make copyright lintian clean

diff --git a/debian/copyright b/debian/copyright
index cd220c8..c4fc6e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -99,6 +99,8 @@ Files: sys/gio/ncarutil/*
 Copyright: Copyright (C) 1986, 2007-2011 University Corporation for
  Atmospheric Research (UCAR)
 License: expat
+
+License: expat
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -486,21 +488,59 @@ Comment: see local/LICENSES/OpenSolaris_License-CDDL.pdf as reference
 Files: debian/*
 Copyright: 2012 Ole Streicher <debian at liska.ath.cx>
 License: expat
- see above.
- .
- This package was first debianized by Zed Pobre <zed at debian.org>
+Note: This package was first debianized by Zed Pobre <zed at debian.org>
  on Monday, 10 March 1998
 
-*************************************************************************
-Files to be removed and replaced by system lib:
-pkg/ecl/readline/* pkg/vocl/readline/*: GPL2+
-./vendor/voclient/common/curl-7.18.2/*: BSD (3 clause)
-./vendor/voclient/libsamp/libxrpc/curl-7.20.1/*
-./vendor/voclient/libsamp/libxrpc/curl/*
-./vendor/voclient/common/expat-2.0.1/*: MIT/X11 (BSD like)
-./vendor/voclient/common/expat/* MIT/X11 (BSD like)
-./vendor/voclient/libsamp/cfitsio/* cfitsio license
-./vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/*: BSD (3 clause)
-./vendor/voclient/libsamp/libxrpc/include/xmlrpc-c/server_w32httpsys.h: BSD (3 clause)
-./vendor/voclient/libsamp/libxrpc/include/xmlrpc_server_w32httpsys.h: BSD (3 clause)
-./vendor/voclient/libsamp/libxrpc/xmlrpc-c/*
+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.

-- 
Image Reduction and Analysis Facility