[DRE-commits] [SCM] ruby-gherkin.git branch, master, updated. debian/2.4.6-1-11-g7fd0c38

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 9c158a6d4e9572f452d714e18705e7157e4c6e34
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Jun 20 11:01:44 2012 +0200

    Update copyright file to DEP-5 copyright-format/1.0 standard

diff --git a/debian/copyright b/debian/copyright
index f8ac367..a084d30 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: gherkin
 Source: https://github.com/cucumber/gherkin
 
 Files: *
-Copyright: Copyright (c) 2009-2011 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy
-License: MIT
+Copyright: Copyright (c) 2009-2012 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy
+License: Expat
+
+Files: debian/*
+Copyright: Copyright © 2011 Antonio Terceiro <terceiro 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 restriction, including
@@ -24,8 +30,3 @@ License: MIT
  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 © 2011 Antonio Terceiro <terceiro at debian.org>
-License:
- The Debian packaging files are licensed under the sames terms as the original
- package.

-- 
ruby-gherkin.git