[lucene4.10] 05/11: debian/copyright: Fixed a non unique license name

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository lucene4.10.

commit e0da54f463bd04c1cbf8363fb976c6aa6e3a313c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 17 15:59:43 2016 +0100

    debian/copyright: Fixed a non unique license name
---
 debian/changelog |  1 +
 debian/copyright | 28 +++-------------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e121913..2e77d24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lucene4.10 (4.10.4+dfsg-2) UNRELEASED; urgency=medium
   * Build with ivy-debian-helper
   * Standards-Version updated to 3.9.7 (no changes)
   * Use canonical URLs for the Vcs-* fields
+  * debian/copyright: Fixed a non unique license name
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 17 Feb 2016 15:44:03 +0100
 
diff --git a/debian/copyright b/debian/copyright
index eb1d6d2..781985e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -60,7 +60,7 @@ License: other
 Files: analysis/common/src/java/org/apache/lucene/analysis/en/KStemData*.java
 Copyright: 2003, Center for Intelligent Information Retrieval,
            University of Massachusetts, Amherst.
-License: BSD-3-Clause
+License: BSD-3-Clause-umass
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -167,30 +167,6 @@ Files: analysis/common/src/java/org/tartarus/snowball/*
 Copyright: 2001 Dr Martin Porter
            2002 Richard Boulton
 License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: expressions/src/java/org/apache/lucene/expressions/js/Javascript.g
 Copyright: 2008-2010 Xebic Reasearch BV
@@ -252,6 +228,8 @@ License: BSD-3-Clause-hodgepodge
 Files: suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
 Copyright: 2005 Bruno Martins
 License: BSD-3-Clause
+
+License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git