From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 12 Sep 2013 22:09:41 +0000 (-0300)
Subject: Fixing debian/copyright as of #10
X-Git-Tag: 0.2.3~32^2
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=af51f2155f7b103ccf2752eac4ef580bc2fe67d4;p=keyringer.git

Fixing debian/copyright as of #10
---

diff --git a/debian/copyright b/debian/copyright
index 0c7a7af..51157ee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,29 +11,22 @@ Upstream Author(s):
     Silvio Rhatto <rhatto@riseup.net>
     Daniel Kahn Gillmor <dkg@fifthhorseman.net>
     Jamie McClelland <jm@mayfirst.org>
+    ricola <ricola@poivron.org>
 
 Copyright:
 
     <Copyright (C) 2009-2012 Silvio Rhatto>
     <Copyright (C) 2010 Daniel Kahn Gillmor>
     <Copyright (C) 2012 Jamie McClelland>
+    <Copyright (C) 2012 ricola>
 
 License:
 
-    GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007
+    GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 or greater
 
 The Debian packaging is:
 
     Copyright (C) 2012 Silvio Rhatto <rhatto@riseup.net>
 
-# 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 lines in.
-
 and is licensed under the GPL version 3,
 see "/usr/share/common-licenses/GPL-3".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.