[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0+dfsg-38-gc4c5b00

[James Page]

The following commit has been merged in the master branch:
commit c4c5b0060497103d60b34f6853256ce753575ea0
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jun 19 09:27:14 2012 +0100

    Updates to copyright after initial sponsor review

diff --git a/debian/copyright b/debian/copyright
index e77afe8..eacddbc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,6 +41,15 @@ License:
  This script can be used freely as long as all copyright messages are
  intact.
 
+Files: lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/*
+Copyright: 1997-2004 Leo Galambos,
+           2002-2004 "Egothor developers"
+License: Egothor-1.00
+
+Files: solr/client/ruby/flare/vendor/plugins/engines/*
+Copyright: 2007 James Adam
+License: MIT
+
 Files: solr/example/solr/conf/velocity/jquery.autocomplete.js
 Copyright: 2007 Dylan Verheul, 
            2007 Dan G. Switzer, 
@@ -81,8 +90,8 @@ License: MIT
  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 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,
@@ -248,3 +257,52 @@ License: Snowball
  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.
+
+License: Egothor-1.00
+  This  software  is  copyrighted  by  the "Egothor developers". If this
+  license applies to a single file or document, the "Egothor developers"
+  are the people or entities mentioned as copyright holders in that file
+  or  document.  If  this  license  applies  to the Egothor project as a
+  whole,  the  copyright holders are the people or entities mentioned in
+  the  file CREDITS. This file can be found in the same location as this
+  license in the distribution.
+  .
+  Redistribution  and  use  in  source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+   1. Redistributions  of  source  code  must retain the above copyright
+      notice, the list of contributors, this list of conditions, and the
+      following disclaimer.
+   2. Redistributions  in binary form must reproduce the above copyright
+      notice, the list of contributors, this list of conditions, and the
+      disclaimer  that  follows  these  conditions  in the documentation
+      and/or other materials provided with the distribution.
+   3. The name "Egothor" must not be used to endorse or promote products
+      derived  from  this software without prior written permission. For
+      written permission, please contact Leo.G at seznam.cz
+   4. Products  derived  from this software may not be called "Egothor",
+      nor  may  "Egothor"  appear  in  their name, without prior written
+      permission from Leo.G at seznam.cz.
+  .
+  In addition, we request that you include in the end-user documentation
+  provided  with  the  redistribution  and/or  in the software itself an
+  acknowledgement equivalent to the following:
+  .
+   "This product includes software developed by the Egothor Project.
+    http://egothor.sf.net/"
+  .
+  THIS  SOFTWARE  IS  PROVIDED  ``AS  IS''  AND ANY EXPRESSED 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 EGOTHOR PROJECT OR ITS 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.
+  .
+  This  software  consists  of  voluntary  contributions  made  by  many
+  individuals  on  behalf  of  the  Egothor  Project  and was originally
+  created by Leo Galambos (Leo.G at seznam.cz).

-- 
lucene-solr packaging