[DRE-commits] [SCM] ruby-rubytorrent.git branch, master, updated. upstream/0.3-8-g514c958

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2d1797ae5a2563e46c1c92d1d98a0246c3618605
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue May 22 10:39:16 2012 +0200

    Update debian/copyright to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index 6ade291..2543ca1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,30 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rubytorrent
-Source: FIXME <http://example.com/>
+Source: http://rubytorrent.rubyforge.org
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2003-2005 William Morgan <ruby at cs.stanford.edu>
+License: GPL-2
+
+Files: doc/api.txt
+Copyright: 2005 William Morgan <ruby at cs.stanford.edu>
+License: GFDL-NIV-1.2
+
+Files: debian/*
+Copyright: 2006 Arnaud Cornet <arnaud.cornet at gmail.com>
+           2012 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: GPL-2
+
+License: GFDL-NIV-1.2
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2; with
+ no Invariant Sections, no Front-Cover Texts, and no Back-Covers.
+ .
+ On Debian systems, the full text of the GNU Free Docomentation
+ License version 1.2 can be found in the file
+ `/usr/share/common-licenses/GFDL-1.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 as published by the Free Software Foundation; either
@@ -27,7 +46,3 @@ License: GPL-2+ (FIXME)
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-Files: debian/*
-Copyright: 2012 Cédric Boutillier <cedric.boutillier at gmail.com>
-License:
- [LICENSE TEXT]

-- 
ruby-rubytorrent.git