[med-svn] r868 - trunk/packages/gwyddion/trunk/debian

Tue Nov 27 21:22:14 UTC 2007

Author: beathovn-guest
Date: 2007-11-27 21:22:14 +0000 (Tue, 27 Nov 2007)
New Revision: 868

Modified:
   trunk/packages/gwyddion/trunk/debian/README.Debian
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/copyright
Log:
Expanded debian/copyright and made it machine-interpretable.


Modified: trunk/packages/gwyddion/trunk/debian/README.Debian
===================================================================

--- trunk/packages/gwyddion/trunk/debian/README.Debian	2007-11-27 01:52:30 UTC (rev 867)
+++ trunk/packages/gwyddion/trunk/debian/README.Debian	2007-11-27 21:22:14 UTC (rev 868)
@@ -2,8 +2,7 @@
 -------------------
 
 The -dev package is architecture-dependent because of the files
-gwyddion.pc and gwyconfig.h which happen to be architecture 
-dependent.
+gwyddion.pc and gwyconfig.h which happen to be architecture dependent.
 
 The funny construction with the --disable-rpath configure-option and
 additionally having chrpath is caused by some strange libtool issue on amd64,
@@ -13,4 +12,11 @@
 Patching the Makefiles for the Gwyddion::Dump.3pm manpage was necessary, to
 comply to Debian policy, suggesting section 3pm for user generated perl modules.
 
+Following an advice from tiCo (Mario Iselis) on #debian-mentors, I wrote the
+debian/copyright file in such a way, that all unique combinations of copyright
+holders and licenses got one machine-interpretable entry, regardless of the
+copyright year. I.e., if there are several files mentioned and a range of years,
+the given copyright years indicate the widest range, which covers all actual
+copyright years of the files.
+
  -- Jan Beyer <jan at beathovn.de>  Sun, 04 Nov 2007 21:33:03 +0100

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2007-11-27 01:52:30 UTC (rev 867)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2007-11-27 21:22:14 UTC (rev 868)
@@ -1,3 +1,9 @@
+gwyddion (2.9-2) unstable; urgency=low
+
+  * Fixed debian/copyright.
+
+ -- Jan Beyer <jan at beathovn.de>  Tue, 27 Nov 2007 22:22:00 +0100
+
 gwyddion (2.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright	2007-11-27 01:52:30 UTC (rev 867)
+++ trunk/packages/gwyddion/trunk/debian/copyright	2007-11-27 21:22:14 UTC (rev 868)
@@ -1,34 +1,199 @@
 This package was debianized by Jan Beyer <jan at beathovn.de> on
 Tue, 18 Sep 2007 11:32:03 +0200.
 
-It was downloaded from <http://gwyddion.net/download>
+It was downloaded from <http://gwyddion.net/download>.
 
-Upstream Authors: David Nečas (Yeti) <yeti at gwyddion.net>,
-    Petr Klapetek <klapetek at gwyddion.net>,
-    for others see AUTHORS file
+On Debian systems, the complete text of the GNU General Public License (GPL)
+and the GNU Lesser General Public License (LGPL) can be found in
+`/usr/share/common-licenses/'.
 
-Copyright: © 2007 David Nečas and Petr Klapetek
+Files: *
+Copyright: © 2003-2007 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2003-2007 Petr Klapetek <klapetek at gwyddion.net>
+License: GPL-2+
 
-License:
+Files: debian/*
+Copyright: © 2007 Jan Beyer <jan at beathovn.de>
+License: GPL-2+
 
-   This package 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.
+Files: */Makefile.in, config.rpath
+Copyright: © 1994-2006  Free Software Foundation, Inc.
+License: other
+ This Makefile.in is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
 
-   This package 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.
+Files: INSTALL
+Copyright: © 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free SoftwareFoundation, Inc.
+License: other
+ This file is free documentation; the Free Software Foundation gives
+ unlimited permission to copy, distribute and modify it.
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Files: aclocal.m4, config.guess, config.guess.cdbs-orig, config.sub, config.sub.cdbs-orig, configure
+Copyright: © 1992-2006  Free Software Foundation, Inc.
+License: other, GPL-2+
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+ 
+ Parts of these files are licensed under the GNU General Public License, version 2
+ or (at your option) any later version.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Files: depcomp, ltmain.sh, missing, py-compile
+Copyright: © 1996-2006 Free Software Foundation, Inc.
+License: GPL-2+
 
-The plugins are in the public domain.
+Files: app/remote.c
+Copyright: © 2000-2004 Sven Neumann <sven at gimp.org>
+ © 2000-2004 Simon Budig <simon at gimp.org>
+ © 2007 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2007 Petr Klapetek <klapetek at gwyddion.net>
+License: GPL-2+
 
-The Debian packaging is © 2007 Jan Beyer <jan at beathovn.de> and
-is licensed under the GPL, see above.
+Files: app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], modules/file/gwytiff.h, modules/file/shimadzu.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/tools/grainmeasure.c, modules/tools/pathlevel.c
+Copyright: © 2007 David Necas (Yeti) <yeti at gwyddion.net>
+License: GPL-2+
+
+Files: install-sh
+Copyright: © 1994 X Consortium
+License: other, PD
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+ FSF changes to this file are in the public domain.
+
+Files: libgwyddion/gwyfdcurvepreset.c, libgwyddion/gwynlfit.[c,h], libgwyddion/gwynlfitpreset.[c,h]
+Copyright: © 2000-2003 Martin Siler
+ © 2004, 2005 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2004, 2005 Petr Klapetek <klapetek at gwyddion.net>
+License: GPL-2+
+
+Files: libgwyddion/gwymath.c
+Copyright: © 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc.See below.
+License: GPL-2+, LGPL-2.1+
+
+Files: libgwydgets/gwy3dview.[c,h]
+Copyright: © 2004 Martin Siler <silerm at physics.muni.cz>
+License: GPL-2+
+
+Files: libgwydgets/gwycolorbutton.[c,h]
+Copyright: © 1998, 1999 Red Hat, Inc.
+License: LGPL-2+
+
+Files: libgwydgets/gwycurve.c
+Copyright: © 1997 David Mosberger
+ © 2005 Chris Anderson <sidewinder.asu at gmail.com>
+License: LGPL-2+, GPL-2+
+ The original file was part of the GIMP Toolkit and copyrighted by David
+ Mosberger, licensed under the GNU LGPL-2+. Chris Anderson modified the file for
+ Gwyddion and put the resulting file under the GNU GPL-2+.
+
+Files: libgwydgets/gwycurve.h
+Copyright: © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ © 2005 Chris Anderson <sidewinder.asu at gmail.com>
+License: LGPL-2+, GPL-2+
+ The original file was part of the GIMP Toolkit and copyrighted by Peter Mattis,
+ Spencer Kimball and Josh MacDonald, licensed under the GNU LGPL-2+. Chris
+ Anderson modified the file for Gwyddion and put the resulting file under the
+ GNU GPL-2+.
+
+Files: libgwydgets/gwy*ruler.[c,h]
+Copyright: © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+License: LGPL-2+
+
+Files: libprocess/fractals.c
+Copyright: © 2004 Jindrich Bilek
+License: GPL-2+
+
+Files: libprocess/spectra.[c,h], modules/tools/spectro.c
+Copyright: © 2003-2007 Owain Davies <owain.davies at blueyonder.co.uk>
+ © 2003-2007 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2003-2007 Petr Klapetek <klapetek at gwyddion.net>
+License: GPL-2+
+
+Files: m4/pkg.m4
+Copyright: © 2004 Scott James Remnant <scott at netsplit.com>
+License: GPL-2+
+
+Files: modules/file/apefile.c
+Copyright: © 2005 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2005 Petr Klapetek <klapetek at gwyddion.net>
+ © Wine project
+License: GPL-2+, LGPL-2.1+
+ The file is copyright by David Necas and Petr Klapetek (GPL-2+ licensed), but
+ the date conversion code is copied from Wine and thus copyrighted by the Wine
+ project (LGPL-2.1+ licensed). No copyright year is given.
+
+Files: modules/file/createc.c, modules/file/stmprg.c
+Copyright: © 2004 Rok Zitko <rok.zitko at ijs.si>
+License: GPL-2+
+
+Files: modules/file/hdf4file.c
+Copyright: © 2006 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2006 Petr Klapetek <klapetek at gwyddion.net>
+ © 2006 Markus Pristovsek <prissi at gift.physik.tu-berlin.de>
+License: GPL-2+
+
+Files: modules/file/jpk.h, modules/file/jpkscan.c
+Copyright: © 2005  JPK Instruments AG <neumann at jpk.com>.
+License: GPL-2+
+
+Files: modules/file/mifile.c, modules/process/fft_filter_2d.c
+Copyright: © 2005 Chris Anderson, Molecular Imaging Corp <sidewinder.asu at gmail.com>
+License: GPL-2+
+
+Files: modules/file/nanotop.c
+Copyright: © 2006 Alexander Kovalev <av_kov at tut.by>
+License: GPL-2
+
+Files: modules/tools/distance.c
+Copyright: © 2003-2006 Nenad Ocelic <ocelic at biochem.mpg.de>
+ © 2003-2006 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2003-2006 Petr Klapetek <klapetek at gwyddion.net>
+License: GPL-2+
+
+Files: modules/tools/roughness.c
+Copyright: © 2006-2007 Martin Hason <hasonm at physics.muni.cz>
+ © 2006-2007 David Necas (Yeti) <yeti at gwyddion.net>
+ © 2006-2007 Petr Klapetek <klapetek at gwyddion.net>
+License: GPL-2+
+
+Files: po/Makefile.in.in
+Copyright: © 1995-1997, 2000-2006 Ulrich Drepper <drepper at gnu.ai.mit.edu>
+License: other
+ This file can be copied and used freely without restrictions.  It can
+ be used in projects which are not available under the GNU General Public
+ License but which still want to provide support for the GNU gettext
+ functionality.
+ Please note that the actual code of GNU gettext is covered by the GNU
+ General Public License and is *not* in the public domain.
+


