[DRE-commits] [ruby-flexmock] 08/11: improve debian/copyright

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-flexmock.

commit 335d3609e291c3326f79ed73eae30139f7fa3b79
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Sep 15 13:37:52 2015 -0300

    improve debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 678b1dc..74af07f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ ruby-flexmock (2.0.0~rc1-1) UNRELEASED; urgency=medium
   * debian/watch: point at github
   * Update packaging with a new dh-make-ruby run
   * added debian/patches/0001-gemspec-skip-git-usage.patch
+  * improve debian/copyright
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 15 Sep 2015 13:26:51 -0300
 
diff --git a/debian/copyright b/debian/copyright
index 8fbfc2b..4923137 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,32 @@ Source: https://github.com/jimweirich/flexmock
 
 Files: *
 Copyright: 2003-2011 Jim Weirich <jim.weirich at gmail.com>
-License:
- Permission is granted for use, copying, modification, distribution, and
- distribution of modified versions of this work as long as the above copyright
- notice is included.
+ Copyright 2014- by Sylvain Joyeux (sylvain.joyeux at m4x.org)
+License: Expat
 
 Files: debian/*
 Copyright: 2008 Roberto C. Sanchez <roberto at connexer.com>
            2011 Antonio Terceiro <terceiro at debian.org>
-License:
+License: Expat
+Comment:
  The Debian packaging is distributed under the same terms as the original
  package.
+
+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.

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