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

Tue Dec 22 21:14:49 UTC 2015

Author: tille
Date: 2015-12-22 21:14:48 +0000 (Tue, 22 Dec 2015)
New Revision: 20868

Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/copyright
Log:
Several DEP5 fixes


Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================

--- trunk/packages/gwyddion/trunk/debian/changelog	2015-12-22 20:00:03 UTC (rev 20867)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2015-12-22 21:14:48 UTC (rev 20868)
@@ -1,10 +1,11 @@
-gwyddion (2.43-2) UNRELEASED; urgency=medium
+gwyddion (2.43-2) unstable; urgency=medium
 
   * cme fix dpkg-control
   * gwyddion-plugins drop Depends: perl5
     Closes: #808777
+  * Several DEP5 fixes
 
- -- Andreas Tille <tille at debian.org>  Tue, 22 Dec 2015 20:45:08 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 22 Dec 2015 21:40:23 +0100
 
 gwyddion (2.43-1) unstable; urgency=medium
 

Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright	2015-12-22 20:00:03 UTC (rev 20867)
+++ trunk/packages/gwyddion/trunk/debian/copyright	2015-12-22 21:14:48 UTC (rev 20868)
@@ -13,32 +13,12 @@
 Copyright: 2007, 2008 Jan Beyer <jan at beathovn.de>
 License: GPL-2+
 
-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.
-
 Files: INSTALL
 Copyright: 1994-1996, 1999- 2002 Free SoftwareFoundation, Inc.
-License: other
+License: free_documentation
  This file is free documentation; the Free Software Foundation gives
  unlimited permission to copy, distribute and modify it.
 
-Files: aclocal.m4 config.guess config.guess.cdbs-orig config.sub config.sub.cdbs-orig configure
-Copyright: 1992-2006  Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: depcomp ltmain.sh missing py-compile
-Copyright: 1996-2006 Free Software Foundation, Inc.
-License: GPL-2+
-
 Files: app/remote.c
 Copyright: 2000-2004 Sven Neumann <sven at gimp.org>
            2000-2004 Simon Budig <simon at gimp.org>
@@ -73,8 +53,8 @@
  .
  FSF changes to this file are in the public domain.
 
-Files: libgwyddion/gwyfdcurvepreset.c libgwyddion/gwynlfit.[ch] libgwyddion/gwynlfitpreset.[ch]
-       libgwydgets/gwy3dview.[ch]
+Files: libgwyddion/gwyfdcurvepreset.c libgwyddion/gwynlfit.* libgwyddion/gwynlfitpreset.*
+       libgwydgets/gwy3dview.*
 Copyright: 2000-2004 Martin Siler <silerm at physics.muni.cz>
            2003-2006 David Necas (Yeti) <yeti at gwyddion.net>
            2003-2006 Petr Klapetek <klapetek at gwyddion.net>
@@ -83,20 +63,16 @@
 Files: libgwyddion/gwymath.c
 Copyright: 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc.
 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/'.
 
-Files: libgwydgets/gwycolorbutton.[ch]
+Files: libgwydgets/gwycolorbutton.*
 Copyright: 1998, 1999 Red Hat, Inc.
 License: LGPL-2+
- On Debian systems, the complete text of the GNU Lesser General Public License
- (LGPL) can be found in `/usr/share/common-licenses/LGPL-2'.
 
 Files: libgwydgets/gwycurve.c
 Copyright: 1997 David Mosberger
            2005 Chris Anderson <sidewinder.asu at gmail.com>
 License: LGPL-2+ or GPL-2+
+Comment:
  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+.
@@ -105,12 +81,13 @@
 Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
            2005 Chris Anderson <sidewinder.asu at gmail.com>
 License: LGPL-2+ or GPL-2+
+Comment:
  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.[ch]
+Files: libgwydgets/gwy*ruler.*
 Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
 License: LGPL-2+
 
@@ -118,7 +95,7 @@
 Copyright: 2004 Jindrich Bilek
 License: GPL-2+
 
-Files: libprocess/spectra.[ch] modules/tools/spectro.c
+Files: libprocess/spectra.* 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>
@@ -133,6 +110,7 @@
            2005 Petr Klapetek <klapetek at gwyddion.net>
            Wine project
 License: GPL-2+ or LGPL-2.1+
+Comment:
  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.
@@ -193,7 +171,7 @@
            2007 Jan Horak <xhorak at gmail.com>
 License: GPL-2+
 
-Files: modules/pygwy/pygwy-console.[ch]
+Files: modules/pygwy/pygwy-console.*
 Copyright: Jan Horak <xhorak at gmail.com>
 License: GPL-2+
 
@@ -211,12 +189,12 @@
  and the GNU Lesser General Public License (LGPL) can be found in
  `/usr/share/common-licenses/'.
 
-Files: app/ige-mac-menu.[ch]
+Files: app/ige-mac-menu.*
 Copyright: 2007 Pioneer Research Center USA, Inc.
            2007, 2008 Imendio AB
 License: LGPL-2.1
 
-Files: app/mac_integration.[ch]
+Files: app/mac_integration.*
 Copyright: 2009 Andrey Gruzdev <gruzdev at ntmdt.ru>
 License: GPL-2+
 
@@ -232,13 +210,13 @@
            2010-2014 Daniil Bratashov <dn2010 at gmail.com>
 License: GPL-2+
 
-Files: libprocess/natural.[ch]
+Files: libprocess/natural.*
 Copyright: 2009 Ross Hemsley <rh7223 at bris.ac.uk>
            2009 David Necas (Yeti) <yeti at gwyddion.net>
            2009 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
-Files: libprocess/stats_uncertainty.[ch]
+Files: libprocess/stats_uncertainty.*
 Copyright: 2003-2009 Anna Campbellova <acampbellova at cmi.cz>
 License: GPL-2+
 
@@ -366,3 +344,22 @@
  On a Debian system, the LGPL license version 2.1 is distributed in the file
  ‘/usr/share/common-licenses/LGPL-2.1’.
 
+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, 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.
+ .
+ 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’.
+


