Merge commit 'dkg/master'

[monkeysphere.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 413f60f3161ad369909b81c903da670cf597d179..4c25286e687fa9919a5cc22313e0e9c357a3b41c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,19 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=226
 Debianized-By: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 Debianized-Date: Fri Jun 13 10:19:16 EDT 2008
-Original-Source: http://lair.fifthhorseman.net/~dkg/git/monkeysphere.git/
+Original-Source: http://web.monkeysphere.info/download
 
 Files: *
-Copyright: Jameson Rollins <jrollins@fifthhorseman.net>, 
- Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Copyright:  Copyright 2008 Jameson Rollins <jrollins@fifthhorseman.net>,
+ Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
+ Jamie McClelland <jamie@mayfirst.org>,
+ Micah Anderson <micah@riseup.net>,
+ Matthew Goins <mjgoins@openflows.com>,
+ Mike Castleman <mlcastle@mlcastle.net>,
+ Elliot Winard <enw@caveteen.com>,
+ Ross Glover <ross@ross.mayfirst.org>,
+ Greg Lyle <greg@stealthisemail.com>
+
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by