[DRE-commits] [SCM] ruby-dataobjects.git branch, master, updated. upstream/0.10.6-15-g9c78a60

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit f7dc5e262fce46ab52e01dd7c0be00edf9b8c614
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Oct 17 12:41:42 2011 +0200

    convert copyright to DEP-5

diff --git a/debian/copyright b/debian/copyright
index 83f6d9b..d628ac1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,33 @@
-This work was packaged for Debian by:
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: data_objects
+Source: http://github.com/datamapper/do
 
-    Deepak Tripathi <deepak at debian.org> on Sat, 08 May 2010 01:46:15 +0530
+Files: *
+Copyright: 2007-2011 Yehuda Katz <wycats at gmail.com>
+           2007-2011 Dirkjan Bussink <d.bussink at gmail.com>
+License: Expat
 
-It was downloaded from <URL:http://github.com/datamapper/do
+Files: debian/*
+Copyright: 2011 Deepak Tripathi <deepak at debian.org>
+           2011 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: Expat
 
-Upstream Authors: Copyright (c) 2007-2011 Yehuda Katz, Dirkjan Bussink
-
-Copyright:
-
-  Copyright (c) 2007-2011 Yehuda Katz, Dirkjan Bussink
-  License usder the MIT license, read below for more information.
-  
-  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.
-  
- The Debian packaging is:
-  Copyright (C) 2011 Deepak Tripathi <deepak at debian.org> and is licensed
-  under the GPL, see `/usr/share/common-licenses/GPL-2'.
+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.

-- 
ruby-dataobjects.git