[DRE-commits] [SCM] ruby-nokogiri.git branch, master, updated. upstream/1.5.0-13-g009b732

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2f94f34990540f8b215ee42145f11430a1d28f5d
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat May 12 23:55:17 2012 +0200

    convert copyright file to DEP-5

diff --git a/debian/copyright b/debian/copyright
index b457eae..d3c6354 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,39 @@
-This package was debianized by Ryan Niebur <ryanryan52 at gmail.com> on
-Sat, 21 Mar 2009 00:16:04 -0700.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nokogiri
+Homepage: http://nokogiri.org/
+
+Files: *
+Copyright: 2008-2012 Aaron Patterson <aaron.patterson at gmail.com>
+           2008-2012 Mike Dalessio <mike.dalessio at gmail.com>
+           2008-2012 Charles Nutter <headius at headius.com.
+           2008-2012 Sergio Arbeo <serabe at gmail.com>
+           2008-2012 Patrick Mahoney <pat at polycrystal.org>
+           2008-2012 Yoko Harada <yokolet at gmail.com>
+License: Expat
+
+Files: debian/*
+Copyright: 2009 Ryan Niebur <ryanryan52 at gmail.com>
+           2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
+           2012 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-It was downloaded from <http://rubyforge.org/frs/?group_id=7062&release_id=32227>
-
-Upstream Authors:
-
-    Aaron Patterson
-    Mike Dalessio
-
-Copyright:
-
-    Copyright 2008-2009 Aaron Patterson
-    Copyright 2008-2009 Mike Dalessio
-
-License:
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    'Software'), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-The Debian packaging is copyright 2009, Ryan Niebur <ryanryan52 at gmail.com> and
-is licensed under the same license as nokogiri itself.

-- 
ruby-nokogiri.git