[DRE-commits] [SCM] ruby-eventmachine.git branch, master, updated. debian/0.12.10-1-5-g985df1c

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 985df1c82a840e3439727ce1db9d52aecd1f65eb
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Sep 28 21:26:32 2011 +0200

    debian/copyright: small fixes to further comply with the DEP5 format.

diff --git a/debian/changelog b/debian/changelog
index 327c72f..115fa76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 ruby-eventmachine (0.12.10-2) unstable; urgency=low
 
+  [ Laurent Arnoud ]
   * Switch to gem2deb-based packaging. Source and binary package renamed to
     ruby-eventmachine. Transitional packages added.
 
- -- Laurent Arnoud <laurent at spkdev.net>  Sun, 25 Sep 2011 23:43:46 +0200
+  [ Paul van Tilburg ]
+  * debian/copyright: small fixes to further comply with the DEP5 format. 
+
+ -- Paul van Tilburg <paulvt at debian.org>  Wed, 28 Sep 2011 21:25:39 +0200
 
 libeventmachine-ruby (0.12.10-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 395ca0b..e867fbd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ruby-eventmachine
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Daigo Moriwaki <daigo at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Laurent Arnoud <laurent at spkdev.net>
+Uploaders: Daigo Moriwaki <daigo at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Laurent Arnoud <laurent at spkdev.net>, Paul van Tilburg <paulvt at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~)
 Standards-Version: 3.9.2
 Homepage: http://rubyeventmachine.com/
diff --git a/debian/copyright b/debian/copyright
index c25eadf..bfcaf5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://rubyeventmachine.com/
 
 Files: *
 Copyright: Copyright 2006-2007 Francis Cianfrocca <blackhedd at gmail.com>
-License: Ruby | GPL-2
+License: Ruby or GPL-2
 
 Files: debian/*
 Copyright: Copyright 2008 Daigo Moriwaki <daigo at debian.org>

-- 
ruby-eventmachine.git