r10148 - packages/trunk/cookietool/debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-08-17 15:10:30 +0000 (Mon, 17 Aug 2009)
New Revision: 10148

Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/copyright
Log:
Switch the copyright file format to DEP 5 rev. 59 (from the wiki version)
and shorten the file by breaking out the license into a section of its own.


Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2009-08-17 15:05:53 UTC (rev 10147)
+++ packages/trunk/cookietool/debian/changelog	2009-08-17 15:10:30 UTC (rev 10148)
@@ -7,6 +7,8 @@
   * Extract the history section of the README file into a changelog.
   * Bump Standards-Version to 3.8.3 with no changes.
   * Add the Vcs-Svn and Vcs-Browser control fields.
+  * Switch the copyright file to the rev. 59 of DEP 5 and shorten it by
+    breaking out the repeated GPL-2+ license text into a separate section.
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 17 Aug 2009 17:22:23 +0300
 

Modified: packages/trunk/cookietool/debian/copyright
===================================================================
--- packages/trunk/cookietool/debian/copyright	2009-08-17 15:05:53 UTC (rev 10147)
+++ packages/trunk/cookietool/debian/copyright	2009-08-17 15:10:30 UTC (rev 10148)
@@ -1,40 +1,16 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?recall=184
-Upstream-Name: cookietool
-Upstream-Source: ftp://ftp.aminet.net/util/misc/
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Name: cookietool
+Source: ftp://ftp.aminet.net/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".
 
 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".
 
 Files: debian/*
 Author: Miros/law L. Baran <baran at debian.org>,
@@ -43,6 +19,8 @@
 Copyright: Copyright (c) 2000-2005  Miros/law L. Baran
            Copyright (c) 2009  Peter Pentchev
 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