r12747 - packages/trunk/invaders/debian

[Fabian Greffrath]

Author: fabian-guest
Date: 2011-10-31 13:30:47 +0000 (Mon, 31 Oct 2011)
New Revision: 12747

Modified:
   packages/trunk/invaders/debian/changelog
   packages/trunk/invaders/debian/copyright
Log:
Make debian/copyright DEP-5 compliant and update Debian packaging license.

Modified: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog	2011-10-31 13:20:49 UTC (rev 12746)
+++ packages/trunk/invaders/debian/changelog	2011-10-31 13:30:47 UTC (rev 12747)
@@ -10,6 +10,7 @@
     palette and use a secret key to toggle "psychedelic mode". ;)
   * 05-pause.patch: Use "P" to pause and resume.
   * Add DEP-3 compliant headers to all patches.
+  * Make debian/copyright DEP-5 compliant and update Debian packaging license.
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 31 Oct 2011 13:10:20 +0100
 

Modified: packages/trunk/invaders/debian/copyright
===================================================================
--- packages/trunk/invaders/debian/copyright	2011-10-31 13:20:49 UTC (rev 12746)
+++ packages/trunk/invaders/debian/copyright	2011-10-31 13:30:47 UTC (rev 12747)
@@ -1,14 +1,18 @@
-Author: Erik Thiele <erikyyy at erikyyy.de>
-Download: http://www.erikyyy.de/invaders/
+Format: http://dep.debian.net/deps/dep5 
+Upstream-Name: Invaders
+Upstream-Contact: Erik Thiele <erikyyy at erikyyy.de>
+Source: http://www.erikyyy.de/invaders/
 
 Files: *
 Copyright: © 2001, Erik Thiele
-           © 1999, Free Software Foundation, Inc.
 License: GPL-2+
+
+Files: io.h
+Copyright: © 1991-2009, Linus Torvalds and many others
+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.
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,12 +26,19 @@
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: io.h
-Copyright: © 1991-2009, Linus Torvalds and many others
-License: GPL-2
+Files: multiboot.h
+Copyright: © 1999, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: debian/*
+Copyright: © 2007-2011, Fabian Greffrath <fabian+debian at greffrath.com>
+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 version 2 as
- published by the Free Software Foundation.
+ 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
@@ -40,10 +51,3 @@
  .
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: © 2007-2009, Fabian Greffrath <fabian at debian-unofficial.org>
-License: GAP
- Copying and distribution of the Debian packaging, with or without modification,
- are permitted in any medium without royalty provided the copyright
- notice and this notice are preserved.