[mrrescue] 01/01: deduplicate Zlib licenses in copyright

[Alexandre Detiste]

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

detiste-guest pushed a commit to branch master
in repository mrrescue.

commit ab42409263dcfbaccc7d09ad3c748d5becbbd195
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Feb 29 12:24:31 2016 +0100

    deduplicate Zlib licenses in copyright
---
 debian/changelog |  1 +
 debian/copyright | 24 ++++--------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f6fd77..e5d78bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mrrescue (1.02c-2) UNRELEASED; urgency=medium
   * Use HTTPS for Vcs-* url's
   * Launche script: 'exec' love
   * Use cleaner workaround for #719359 (Closes: #783694)
+  * debian/copyright: de-duplicate zlib licenses, add myself
 
  -- Alexandre Detiste <alexandre.detiste at gmail.com>  Mon, 29 Feb 2016 11:51:08 +0100
 
diff --git a/debian/copyright b/debian/copyright
index decc5ce..3054f99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,28 +5,12 @@ Source: http://tangramgames.dk/games/mrrescue
 Files: *
 Copyright: 2013 Tangram Games
 License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
-   1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
- .
-   2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
- .
-   3. This notice may not be removed or altered from any source
-   distribution.
 
-  
 Files: debian/*
 Copyright: 2014 Steven Hamilton
+  2016 Alexandre Detiste
+License: Zlib
+
 License: Zlib
  This software is provided 'as-is', without any express or implied
  warranty. In no event will the authors be held liable for any damages
@@ -481,7 +465,7 @@ License: Expat
 
 Files: mrrescue/TSerial.lua
 Copyright: 2011 Matthias Richter
-License: Zlib
+License: Zlib-with-exception
  This software is provided 'as-is', without any express or implied
  warranty. In no event will the authors be held liable for any damages
  arising from the use of this software.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mrrescue.git