Minor packaging updates, ACKed by Jimmy.

[grml-rescueboot.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 40740de..24bbe1e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,13 +8,14 @@ It was downloaded from:
 
 Copyright:
 
 
 Copyright:
 

-    <Copyright (C) 2010++ Andreas "Jimmy" Gredler>
+    Copyright (C) 2010 Andreas "Jimmy" Gredler
+    Copyright (C) 2010 Michael Prokop

 
 License:
 
     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
 
 License:
 
     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 3 of the License, or
+    the Free Software Foundation, either version 2 of the License, or

     (at your option) any later version.
 
     This package is distributed in the hope that it will be useful,
     (at your option) any later version.
 
     This package is distributed in the hope that it will be useful,


@@ -26,19 +27,11 @@ License:
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General

-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

 
 The Debian packaging is:
 
     Copyright (C) 2010 Andreas "Jimmy" Gredler <jimmy@grml.org>
 
 
 The Debian packaging is:
 
     Copyright (C) 2010 Andreas "Jimmy" Gredler <jimmy@grml.org>
 

-# Please chose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following line in.
-
-and is licensed under the GPL version 3, see above.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+and is licensed under the GPL version 2 or (at your option) any later version,
+see above.