summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-12 19:10:32 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-12 19:10:32 -0300
commit3f6c8000abbb45788f76a9b5bc36344d340763c3 (patch)
tree2ed8cb0750b4dbadd8a20009ed6fa54cb189cbf6 /debian
parent5811e07b6caca8023d823b8e7cf3eedc1dc1f8d9 (diff)
parentaf51f2155f7b103ccf2752eac4ef580bc2fe67d4 (diff)
downloadkeyringer-3f6c8000abbb45788f76a9b5bc36344d340763c3.tar.gz
keyringer-3f6c8000abbb45788f76a9b5bc36344d340763c3.tar.bz2
Merge branch 'master' into debian
Diffstat (limited to 'debian')
-rw-r--r--debian/copyright13
1 files changed, 3 insertions, 10 deletions
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.