[DRE-commits] [SCM] ruby-bdb.git branch, debian-sid, updated. debian/0.6.5-7-3-gec52151

[Gunnar Wolf]

The following commit has been merged in the debian-sid branch:
commit 3e80b7e588b84e5c79adce739f4a5442fd0a5ecb
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Wed Jun 1 09:58:39 2011 -0500

    Clarified and completed debian/copyright information

diff --git a/debian/changelog b/debian/changelog
index d18f300..44f0461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ruby-bdb (0.6.5-7) unstable; urgency=low
 
+  [ Ondřej Surý ]
   * Convert package to gem2deb
   * Rename package to ruby-bdb according to new ruby policy
   * Merge libdb-ruby control and add transitional package
@@ -16,7 +17,10 @@ ruby-bdb (0.6.5-7) unstable; urgency=low
   * Add custom script debian/ruby-tests.rb to run ruby tests
   * Exclude .rb and .rd files from documentation
 
- -- Ondřej Surý <ondrej at debian.org>  Wed, 25 May 2011 14:35:53 +0200
+  [ Gunnar Wolf ]
+  * Clarified and completed debian/copyright information
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 01 Jun 2011 09:54:13 -0500
 
 libdb-ruby (0.6.5-6) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 89b32ff..36ed638 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,16 @@ Source: https://rubyforge.org/projects/bdb/
 
 Files: *
 Copyright: Copyright 2008 Guy Decoux <ts at moulon.inra.fr>
+License: Ruby or GPL-2
+
+Files: util/marshal16.c
+Copyright: Copyright (C) 1993-2000 Yukihiro Matsumoto <matz at netlab.jp>
+License: Ruby or GPL-2
+
+Files: debian/*
+ Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
+ License: GPL2+
+
 License: Ruby
  Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
  You can redistribute it and/or modify it under either the terms of the GPL
@@ -66,6 +76,23 @@ License: Ruby
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
-Files: debian/*
-Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
-License: GPL2+
+License: GPL-2
+ The files hereby included are free software; you can distribute them
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; under version 2 of the License as published
+ in June 1991.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+
+License: GPL-2+
+ The files hereby included are free software; you can distribute them
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at
+ your option) any later version.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.

-- 
ruby-bdb.git