[DRE-commits] [SCM] ruby-peach.git branch, master, updated. upstream/0.4-7-g2541105

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit a4f9223d81c933e919aca2da2b78f7113f40c873
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Jun 29 23:46:49 2012 +0200

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

diff --git a/debian/copyright b/debian/copyright
index 3ac9a69..9809ae5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,16 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: peach
 Source: http://peach.rubyforge.org/
 
 Files: *
 Copyright: Copyright (c) 2008 Ben Hughes
-License:
+License: Expat
+
+Files: debian/*
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at debian.org>
+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
@@ -13,10 +19,10 @@ License:
  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
@@ -26,6 +32,3 @@ License:
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
 
-Files: debian/*
-Copyright: Copyright 2011 Lucas Nussbaum <lucas at debian.org>
-License: same as upstream

-- 
ruby-peach.git