[jruby-joni] 01/01: fix dep5-copyright-license-name-not-unique

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 9848f46a0df50ae477fc24b5c5afc982f0d052ae
Author: Hideki Yamane <henrich at debian.org>
Date:   Mon Dec 14 06:51:30 2015 +0900

    fix dep5-copyright-license-name-not-unique
---
 debian/changelog |  7 +++++++
 debian/copyright | 20 ++------------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be46a19..9f995bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jruby-joni (2.1.8-3) unstable; urgency=medium
+
+  * debian/copyright
+    - fix "dep5-copyright-license-name-not-unique" warning
+
+ -- Hideki Yamane <henrich at debian.org>  Mon, 14 Dec 2015 06:51:27 +0900
+
 jruby-joni (2.1.8-2) unstable; urgency=medium
 
   * debian/control
diff --git a/debian/copyright b/debian/copyright
index a7103c3..d696af7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,28 +7,13 @@ Files: *
 Copyright: 2008-2012 Marcin Mielżyński
            2008-2012 Thomas E. Enebo <tom.enebo at gmail.com>
 License: MIT
- 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: 2010 Torsten Werner <twerner at debian.org>
            2012 Hideki Yamane <henrich at debian.org>
 License: MIT
+
+License: MIT
  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
@@ -46,4 +31,3 @@ License: MIT
  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-java/jruby-joni.git