r9376 - packages/trunk/cookietool/debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-04-03 14:12:04 +0000 (Fri, 03 Apr 2009)
New Revision: 9376

Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/copyright
Log:
Overhaul the copyright file.


Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2009-04-03 13:58:02 UTC (rev 9375)
+++ packages/trunk/cookietool/debian/changelog	2009-04-03 14:12:04 UTC (rev 9376)
@@ -5,6 +5,13 @@
   * Add a placeholder watchfile explaining why we can't use uscan.
   * Do not ignore errors from "make clean".
   * Fix a hyphen used as a minus sign in cookietool.6.
+  * Update the copyright file:
+    - convert it to the machine-parseable format
+    - add my copyright notice
+    - change the common-licenses reference to GPL-2, not the GPL symlink
+    - unfortunately, the original source files do not have a defensible
+      copyright statement - they all have only a "(c)" string in
+      the comments - but there's nothing we can do about it for the present
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 03 Apr 2009 16:18:42 +0300
 

Modified: packages/trunk/cookietool/debian/copyright
===================================================================
--- packages/trunk/cookietool/debian/copyright	2009-04-03 13:58:02 UTC (rev 9375)
+++ packages/trunk/cookietool/debian/copyright	2009-04-03 14:12:04 UTC (rev 9376)
@@ -1,14 +1,57 @@
-This package was primarily debianized by Miros/law L. Baran
-<baran at debian.org> on Sun, 30 Jan 2000 15:24:45 +0100.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?recall=184
+Upstream-Name: cookietool
+Upstream-Source: ftp://ftp.aminet.net/util/misc/
 
-It was downloaded from ftp://ftp.aminet.net/systems/amiga/aminet/util/misc
+Files: *
+Author: Wilhelm Noeker <wnoeker at t-online.de>
+Copyright: (c) 1995-2001 by Wilhelm Noeker (wnoeker at t-online.de)
+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.
+  .
+  On Debian systems, the complete text of the GNU General Public License
+  can be found in file "/usr/share/common-licenses/GPL-2".
 
-cookietool is (c) 1995-2001 by Wilhelm Noeker (wnoeker at t-online.de)
+Files: cdbdiff.c
+Author: Wilhelm Noeker <wnoeker at t-online.de>
+Copyright: (c) 2001 by Wilhelm Noeker (wnoeker at t-online.de)
+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.
+  .
+  On Debian systems, the complete text of the GNU General Public License
+  can be found in file "/usr/share/common-licenses/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.
-
-See /usr/share/common-licenses/GPL for further information.
-
+Files: debian/*
+Author: Miros/law L. Baran <baran at debian.org>,
+        Hamish Moffatt <hamish at debian.org>,
+        Peter Pentchev <roam at ringlet.net>
+Copyright: Copyright (c) 2000-2005  Miros/law L. Baran
+           Copyright (c) 2009  Peter Pentchev
+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.
+  .
+  On Debian systems, the complete text of the GNU General Public License
+  can be found in file "/usr/share/common-licenses/GPL-2".