rev 6096 - kde-extras/libkdcraw/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-05-09 20:12:42 +0000 (Wed, 09 May 2007)
New Revision: 6096

Modified:
   kde-extras/libkdcraw/trunk/debian/copyright
Log:
Update debian/copyright

Modified: kde-extras/libkdcraw/trunk/debian/copyright
===================================================================
--- kde-extras/libkdcraw/trunk/debian/copyright	2007-05-09 20:01:38 UTC (rev 6095)
+++ kde-extras/libkdcraw/trunk/debian/copyright	2007-05-09 20:12:42 UTC (rev 6096)
@@ -1,6 +1,7 @@
 This package was debianized by Achim Bohnet <ach at mpe.mpg.de>
 on Tue, 20-Feb-2007.
 
+It was downloaded from https://sourceforge.net/projects/kipi
 
 Upstream authors (from AUTHORS file):
 
@@ -10,31 +11,34 @@
  (k)dcraw source and manpage
    Dave Coffin <cybercom dot net user dcoffin>
 
-Copyrights:
+Copyright:
 
    Copyright 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
    Copyright 2006-2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
    Copyright 2005 by Laurent Montel <montel at kde dot org>
    Copyright 1997-2007 by Dave Coffin, dcoffin a cybercom o net
 
+License:
 
-Licenses:
+    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.
 
-libkdcraw (except libkdcraw/dcraw)
+    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.
 
-   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, 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-The GNU General Public License version 2 can be found at
-/usr/share/common-licenses/GPL-2.
+The Debian packaging is (C) 2007, Mark Purcell <msp at debian.org>,
+Achim Bohnet <ach at mpe.mpg.de> and is licensed under the GPL, see above.
 
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
 
 libkdcraw/dcraw/ contains a copy of dcraw code.  dcraw Copyright:
 
@@ -56,8 +60,3 @@
    functions, (b) remove these functions, re-implement them, or
    copy them from an earlier, non-GPL Revision of dcraw.c, or (c)
    purchase a license from the author.
-
-
-This software may be redistributed under the terms of the GNU GPL, Version 2
-or later, found on Debian systems in the file /usr/share/common-licenses/GPL
-