[DRE-commits] [ruby-merb-haml] 06/09: Fix machine-readable copyright file syntax

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-merb-haml.

commit 9f1c3f3f31b42a9d389ff4ba19a73be67f3c0c34
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jul 9 07:28:47 2014 +0200

    Fix machine-readable copyright file syntax
---
 debian/changelog | 1 +
 debian/copyright | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43b8d49..c30f358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ruby-merb-haml (1.1.3-3) UNRELEASED; urgency=medium
     debian patch to rspec_rubygems.patch, adapted to remove an RSpec
     deprecation warning
   * Drop transitional packages (Closes: #735721)
+  * Fix machine-readable copyright file syntax
 
  -- Cédric Boutillier <boutil at debian.org>  Wed, 09 Jul 2014 06:48:12 +0200
 
diff --git a/debian/copyright b/debian/copyright
index cdabdee..e16bc62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: merb-haml
 Source: http://www.merbivore.com/
 
 Files: *
-Copyright (c) 2008 Yehuda Katz
-License: MIT
+Copyright: 2008 Yehuda Katz
+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
@@ -22,4 +22,4 @@ License: MIT
  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.
\ No newline at end of file
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-merb-haml.git