The following commit has been merged in the master branch:
commit c6946a2807439d0d205c65d5cca833b720aac9cc
Author: James Page <james.p...@canonical.com>
Date: Tue Nov 29 09:03:24 2011 +0000
Tidied copyright and remove local-options
diff --git a/debian/copyright b/debian/copyright
index ce76b87..7f8532a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,7 +31,8 @@ License: PSF-2.4 and Apache-2
Files:
contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/KStemData*.java
-Copyright: 2003 Center for Intelligent Information Retrieval
+Copyright: 2003 Center for Intelligent Information Retrieval,
+ University of Massachusetts, Amherst.
License: CIIR and Apache-2
Files: contrib/analyzers/common/src/java/org/tartarus/snowball/*.java
@@ -58,12 +59,12 @@ License: Apache-2
License: PSF-2.4
PSF LICENSE AGREEMENT FOR PYTHON 2.4
------------------------------------
-
+ .
1. This LICENSE AGREEMENT is between the Python Software Foundation
("PSF"), and the Individual or Organization ("Licensee") accessing and
otherwise using Python 2.4 software in source or binary form and its
associated documentation.
-
+ .
2. Subject to the terms and conditions of this License Agreement, PSF
hereby grants Licensee a nonexclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display publicly,
@@ -73,41 +74,41 @@ License: PSF-2.4
2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
are retained in Python 2.4 alone or in any derivative version prepared
by Licensee.
-
+ .
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python 2.4 or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python 2.4.
-
+ .
4. PSF is making Python 2.4 available to Licensee on an "AS IS"
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
-
+ .
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
+ .
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
-
+ .
7. Nothing in this License Agreement shall be deemed to create any
relationship of agency, partnership, or joint venture between PSF and
Licensee. This License Agreement does not grant permission to use PSF
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
-
+ .
8. By copying, installing or otherwise using Python 2.4, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
License: Unicode
Disclaimer
-
+ .
This source code is provided as is by Unicode, Inc. No claims are
made as to fitness for any particular purpose. No warranties of any
kind are expressed or implied. The recipient agrees to determine
@@ -115,9 +116,9 @@ License: Unicode
purchased on magnetic or optical media from Unicode, Inc., the
sole remedy for any claim will be exchange of defective media
within 90 days of receipt.
-
+ .
Limitations on Rights to Redistribute This Code
-
+ .
Unicode, Inc. hereby grants the right to freely use the information
supplied in this file in the creation of products supporting the
Unicode Standard, and to make copies of this file in any form
@@ -125,9 +126,6 @@ License: Unicode
remains attached.
License: ICU
- Copyright (C) 1999-2010, International Business Machines
- Corporation and others. All Rights Reserved.
-
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
@@ -136,7 +134,7 @@ License: ICU
provided that the above copyright notice(s) and this permission notice appear
in all copies of the Software and that both the above copyright notice(s) and
this permission notice appear in supporting documentation.
-
+ .
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 OF THIRD PARTY RIGHTS.
@@ -145,33 +143,28 @@ License: ICU
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+ .
Except as contained in this notice, the name of a copyright holder shall not
be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization of the
copyright holder.
License: CIIR
- Copyright © 2003,
- Center for Intelligent Information Retrieval,
- University of Massachusetts, Amherst.
- All rights reserved.
-
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, this
list of conditions and the following disclaimer.
-
+ .
2. 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.
-
+ .
3. The names "Center for Intelligent Information Retrieval" and
"University of Massachusetts" must not be used to endorse or promote products
derived from this software without prior written permission. To obtain
permission, contact i...@ciir.cs.umass.edu.
-
+ .
THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF MASSACHUSETTS AND OTHER
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
@@ -185,13 +178,9 @@ License: CIIR
SUCH DAMAGE.
License: Snowball
- Copyright (c) 2001, Dr Martin Porter
- Copyright (c) 2002, Richard Boulton
- All rights reserved.
-
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
@@ -200,7 +189,7 @@ License: Snowball
* 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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches
--
Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
