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

Andreas Tille tille at alioth.debian.org
Thu Mar 29 07:14:11 UTC 2012 

Author: tille
Date: 2012-03-29 07:14:11 +0000 (Thu, 29 Mar 2012)
New Revision: 10133

Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/copyright
Log:
DEP5 fixes using cme fix dpkg-copyright


Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2012-03-29 07:01:11 UTC (rev 10132)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2012-03-29 07:14:11 UTC (rev 10133)
@@ -11,6 +11,8 @@
   * debian/control:
      - Standards-Version: 3.9.3 (no changes needed)
      - Fixed Vcs fields
+  * debian/copyright: DEP5 fixes verified using
+      cme fix dpkg-copyright
 
  -- Andreas Tille <tille at debian.org>  Thu, 29 Mar 2012 08:47:46 +0200
 

Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright	2012-03-29 07:01:11 UTC (rev 10132)
+++ trunk/packages/gwyddion/trunk/debian/copyright	2012-03-29 07:14:11 UTC (rev 10133)
@@ -1,15 +1,12 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gwyddion
-Upstream-Maintainer: David Necas (Yeti) <yeti at gwyddion.net>
- Petr Klapetek <klapetek at gwyddion.net>
-Upstream-Source: http://gwyddion.net/download
+Upstream-Contact: David Necas (Yeti) <yeti at gwyddion.net>
+                  Petr Klapetek <klapetek at gwyddion.net>
+Source: http://gwyddion.net/download
 
 Files: *
-Copyright: Copyright 2003-2011 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2003-2011 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License (GPL)
- version 2 can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: debian/*
 Copyright: Copyright 2007, 2008 Jan Beyer <jan at beathovn.de>
@@ -21,7 +18,7 @@
  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
@@ -35,27 +32,13 @@
 
 Files: aclocal.m4, config.guess, config.guess.cdbs-orig, config.sub, config.sub.cdbs-orig, configure
 Copyright: 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.
+License: GPL-2+
 
 Files: depcomp, ltmain.sh, missing, py-compile
 Copyright: Copyright 1996-2006 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: app/remote.c
-Copyright: Copyright 2000-2004 Sven Neumann <sven at gimp.org>
-Copyright: Copyright 2000-2004 Simon Budig <simon at gimp.org>
-Copyright: Copyright 2007 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2007 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
@@ -65,40 +48,38 @@
 
 Files: install-sh
 Copyright: Copyright 1994 X Consortium
-License: other, PD
+License: 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], libgwydgets/gwy3dview.[c,h]
-Copyright: Copyright 2000-2004 Martin Siler <silerm at physics.muni.cz>
-Copyright: Copyright 2003-2006 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2003-2006 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
 Files: libgwyddion/gwymath.c
 Copyright: Copyright 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc.
-License: GPL-2+, LGPL-2.1+
+License: GPL-2+ or LGPL-2.1+
  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/'.
@@ -110,17 +91,15 @@
  (LGPL) can be found in `/usr/share/common-licenses/LGPL-2'.
 
 Files: libgwydgets/gwycurve.c
-Copyright: Copyright 1997 David Mosberger
 Copyright: Copyright 2005 Chris Anderson <sidewinder.asu at gmail.com>
-License: LGPL-2+, GPL-2+
+License: LGPL-2+ or 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: Copyright 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
 Copyright: Copyright 2005 Chris Anderson <sidewinder.asu at gmail.com>
-License: LGPL-2+, GPL-2+
+License: LGPL-2+ or 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
@@ -135,8 +114,6 @@
 License: GPL-2+
 
 Files: libprocess/spectra.[c,h], modules/tools/spectro.c
-Copyright: Copyright 2003-2007 Owain Davies <owain.davies at blueyonder.co.uk>
-Copyright: Copyright 2003-2007 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2003-2007 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
@@ -145,17 +122,13 @@
 License: GPL-2+
 
 Files: modules/file/apefile.c
-Copyright: Copyright 2005 David Necas (Yeti) <yeti at gwyddion.net>
-Copyright: Copyright 2005 Petr Klapetek <klapetek at gwyddion.net>
 Copyright: Copyright Wine project
-License: GPL-2+, LGPL-2.1+
+License: GPL-2+ or 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/burleigh_bii.c
-Copyright: Copyright 2006 David Necas (Yeti)
-Copyright: Copyright 2006 Petr Klapetek <klapetek at gwyddion.net>
 Copyright: Copyright 2006 Hans-Peter Doerr <doerr at cip.physik.uni-freiburg.de>
 License: GPL-2+
 
@@ -164,13 +137,10 @@
 License: GPL-2+
 
 Files: modules/file/omicronmatrix.c
-Copyright: Copyright 2008 Philipp Rahe <hquerquadrat at gmail.com>
 Copyright: Copyright 2008 David Necas <yeti at gwyddion.net>
 License: GPL-2+
 
 Files: modules/file/hdf4file.c
-Copyright: Copyright 2006 David Necas (Yeti) <yeti at gwyddion.net>
-Copyright: Copyright 2006 Petr Klapetek <klapetek at gwyddion.net>
 Copyright: Copyright 2006 Markus Pristovsek <prissi at gift.physik.tu-berlin.de>
 License: GPL-2+
 
@@ -184,22 +154,17 @@
 
 Files: modules/file/nanotop.c
 Copyright: Copyright 2006 Alexander Kovalev <av_kov at tut.by>
-License: GPL-2
+License: GPL-2+
 
 Files: modules/tools/distance.c
-Copyright: Copyright 2003-2006 Nenad Ocelic <ocelic at biochem.mpg.de>
-Copyright: Copyright 2003-2006 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2003-2006 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
 Files: modules/tools/roughness.c
-Copyright: Copyright 2006-2007 Martin Hason <hasonm at physics.muni.cz>
-Copyright: Copyright 2006-2007 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2006-2007 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
 Files: app/remote-win32.c
-Copyright: Copyright 2007 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2007 Jan Horak <xhorak at gmail.com>
 License: GPL-2+
 
@@ -216,13 +181,12 @@
  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.
+ .
+ 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/'.
 
-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/'.
-
 Files: app/ige-mac-menu.[c,h]
-Copyright: Copyright 2007 Pioneer Research Center USA, Inc.
 Copyright: Copyright 2007, 2008 Imendio AB
 License: LGPL-2.1
 
@@ -235,17 +199,90 @@
 License: GPL-2+
 
 Files: modules/file/wipfile.c, modules/graph/graph_dos_spectrum.c, modules/process/averaging.c, modules/process/grain_edge.c, modules/process/mcrop.c
-Copyright: Copyright 2010,2011 David Necas (Yeti) <yeti at gwyddion.net>
-Copyright: Copyright 2010,2011 Petr Klapetek <klapetek at gwyddion.net>
 Copyright: Copyright 2010,2011 Daniil Bratashov <dn2010 at gmail.com>
 License: GPL-2+
 
 Files: libprocess/natural.[c,h]
-Copyright: Copyright 2009 Ross Hemsley <rh7223 at bris.ac.uk>
-Copyright: Copyright 2009 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2009 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
 Files: libprocess/stats_uncertainty.[c,h]
 Copyright: Copyright 2003-2009 Anna Campbellova <acampbellova at cmi.cz>
 License: GPL-2+
+
+License: GPL-2+
+ 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.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ For other licensing arrangements, please contact Daniel J. Schaid.
+ .
+ On a Debian system, the GNU GPL license version 2 is distributed in the file
+ ‘/usr/share/common-licenses/GPL-2’.
+
+License: LGPL-2
+ 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; version 2.1
+ of the License.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ On a Debian system, the LGPL license version 2 is distributed in the file
+ ‘/usr/share/common-licenses/LGPL-2’.
+
+License: LGPL-2+
+ 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On a Debian system, the LGPL license version 2 is distributed in the file
+ ‘/usr/share/common-licenses/LGPL-2’.
+
+License: LGPL-2.1
+ 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; version 2.1
+ of the License.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ On a Debian system, the LGPL license version 2.1 is distributed in the file
+ ‘/usr/share/common-licenses/LGPL-2.1’.
+

More information about the debian-med-commit mailing list