[DRE-commits] [SCM] ruby-oauth.git branch, master, updated. debian/0.4.6-1-4-g9d65d2e

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 6acbf676ebdb84f9c7c2fd6ad27c24cd6c78073a
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Jun 30 16:01:35 2012 +0200

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

diff --git a/debian/copyright b/debian/copyright
index df330bf..5bed599 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,34 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=454
-Upstream-Maintainer: Blaine Cook, Larry Halff, Pelle Braendgaard
-Upstream-Source: http://rubygems.org/gems/oauth
-Upstream-Name: Ruby OAuth GEM
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OAuth
+Upstream-Contact: Blaine Cook, Larry Halff, Pelle Braendgaard
+Source: http://rubygems.org/gems/oauth
 
 Files: *
 Copyright: Copyright (c) 2007 Blaine Cook, Larry Halff, Pelle Braendgaard
-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 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.
+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.
 
 Files: debian/*
 Copyright: Copyright (C) 2010 Taku YASUI <tach at debian.org>
 License: GPL-2+
-    On Debian systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'.
-    Taku YASUI <tach at debian.org> on Sat, 4 Sep 2010 12:09:12 +0900
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+ Taku YASUI <tach at debian.org> on Sat, 4 Sep 2010 12:09:12 +0900
+

-- 
ruby-oauth.git