[DRE-commits] [SCM] ruby-mustache.git branch, master, updated. upstream/0.99.4-18-gb08d4ac

[Martin Ueding]

The following commit has been merged in the master branch:
commit b08d4ac7b0b608a7616723a50a93e143a9673003
Author: Martin Ueding <dev at martin-ueding.de>
Date:   Fri Oct 14 22:04:50 2011 +0200

    Only state Expat license once

diff --git a/debian/copyright b/debian/copyright
index c2565dc..d16f2c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,28 +5,12 @@ Source: https://github.com/defunkt/mustache
 Files: *
 Copyright: 2009 Chris Wanstrath
 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.
 
 Files: debian/*
 Copyright: 2011 Martin Ueding <dev at martin-ueding.de>
 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

-- 
ruby-mustache.git