[DRE-commits] [SCM] ruby-cairo.git branch, master, updated. debian/1.10.0-3-12-g8a824e9

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 761131dff019394a3d776603aef04e818756520f
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon May 7 23:24:23 2012 +0200

    convert copyright file to DEP-5

diff --git a/debian/copyright b/debian/copyright
index 70a0b97..6049284 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,27 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ruby-cairo
 Source: https://github.com/rcairo/rcairo
 
 Files: *
-Copyright:
- Rcairo is copyrighted free software by Evan Marin, Øyvind Kolås, MenTaLguY and
- Kouhei Sutou, distributed under the same conditions as ruby.
+Copyright: Copyright Evan Marin <martine at danga.com>
+           Copyright Øyvind Kolås <oeyvindk at hig.no>
+           Copyright MenTaLguY <mental at rydia.net>
+           Copyright Kouhei Sutou <kou at cozmixng.org>
+License: GPL-2 or Ruby
+
+Files: debian/*
+Copyright: 
+ Copyright 2005, Thierry Reding <thierry at doppeltgemoppelt.de>
+ Copyright 2006-2009, Paul van Tilburg <paulvt at debian.org>
+ Copyright 2011, Antonio Terceiro <terceiro at softwarelivre.org>
+ Copyright 2012, Cédric Boutillier <cedric.boutillier at gmail.com>
+License: GPL-2 or Ruby
+
 License: GPL-2
+ On Debian systems, the full text of the GNU General Public License version can
+ be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: Ruby
  You can redistribute it and/or modify it under either the terms of the GPL
  (see the file GPL), or the conditions below:
  .
@@ -29,10 +44,10 @@ License: GPL-2
  3. You may distribute the software in object code or binary form, provided
  that you do at least ONE of the following:
       a) distribute the binaries and library files of the software,
-	 together with instructions (in the manual page or equivalent)
-	 on where to get the original distribution.
+  together with instructions (in the manual page or equivalent)
+  on where to get the original distribution.
       b) accompany the distribution with the machine-readable source of
-	 the software.
+  the software.
       c) give non-standard binaries non-standard names, with
          instructions on where to get the original software distribution.
       d) make other distribution arrangements with the author.
@@ -51,14 +66,4 @@ License: GPL-2
  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-Comment:
- On Debian systems, the full text of the GNU General Public License version can
- be found in the file `/usr/share/common-licenses/GPL-2'.
 
-Files: debian/*
-Copyright:
- Copyright © 2011, Antonio Terceiro <terceiro at softwarelivre.org>
- Copyright © 2006-2009, Paul van Tilburg <paulvt at debian.org>
- Copyright © 2005, Thierry Reding <thierry at doppeltgemoppelt.de>
-License:
- The same as the original package.

-- 
ruby-cairo.git