[SCM] Minimal buy-in FITS library and utility package branch, master, updated. 42181c62779c523b0135d680ae334a25a89c69bb
Ole Streicher
debian at liska.ath.cx
Mon Feb 27 13:17:28 UTC 2012
The following commit has been merged in the master branch:
commit 42181c62779c523b0135d680ae334a25a89c69bb
Merge: c021e2e96458b2dfe0c89b52745b745ed7d3a0a6 508f98ee25ece461d5d31dc72f717ab397b109c1
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Feb 27 14:17:04 2012 +0100
Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/funtools into debian
diff --combined debian/copyright
index 7afefc4,19b0d1d..bf82ace
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,4 -1,4 +1,4 @@@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: XPA
Upstream-Author: Eric Mandel <eric at head.cfa.havard.edu>
Source: http://hea-www.harvard.edu/saord/funtools/
@@@ -8,7 -8,7 +8,7 @@@ Copyright: Copyright (c) 1998-2007 Smit
Cambridge, MA, USA
Copyright (c) 1991-2003 John B. Roll jr.
Copyright (C) 1988-1995 Free Software Foundation, Inc.
- License: GPLv2+
+ License: GPLv2
Funtools 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
@@@ -28,9 -28,31 +28,31 @@@
Cambridge, MA 02138 USA
eric at cfa.harvard.edu
.
- On Debian systems, the complete text of the GNU Lesser General
+ On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Files: wcs/*
+ Copyright: Copyright (C) 1994-2002, Mark Calabretta
+ Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory,
+ Cambridge, MA, USA
+ 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 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.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+ .
+ Remark by Ole Streicher: These source files are not used to build the
+ package. Instead, the distributed debian package libwcstools-dev is
+ used.
+
Files: util/zlib-1.2.3/*
Copyright: Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
License: BSD
--
Minimal buy-in FITS library and utility package
More information about the debian-science-commits
mailing list