[SCM] Handle World Coordinate Systems in Astronomy branch, master, updated. 585e2280b9efce8c208c17a37e8157459fa2dc32

[Ole Streicher]

The following commit has been merged in the master branch:
commit 585e2280b9efce8c208c17a37e8157459fa2dc32
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Feb 9 13:47:16 2012 +0100

    Adjust copyright and add dss copyright.

diff --git a/debian/copyright b/debian/copyright
index c4be1b3..a418370 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,22 +5,39 @@ Source: http://www.starlink.ac.uk/ast
 
 Files: *
 Copyright: Copyright (c) 1999-2003 Smithsonian Astrophysical Observatory
-License: LGPLv2+
- 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
- version 2.1 of the License, or (at your option) any later
- version.
+ Copyright (C) 1995-2002, Mark Calabretta <mcalabre at atnf.csiro.au>
+License: LGPLv2.1+
+ 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 Lesser General Public License for more
- details.
+ 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 complete text of the GNU Lesser General 
- Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
+Files: dssmap.c dssmap.h
+Copyright: Copyright 1997-2006 Central Laboratory of the Research Councils
+ Modifications by Doug Mink are copyright: 1988 Smithsonian Astrophysical
+ Observatory
+License: GPLv2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public Licence as
+ published by the Free Software Foundation; either version 2 of
+ the Licence, 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 Licence for more details.
+ .
+ On Debian systems, the complete text of the GNU General 
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ 
 Files: debian/*
 Copyright: not applicable
 License: public-domain

-- 
Handle World Coordinate Systems in Astronomy