[pkg-java] r8592 - trunk/libcommons-fileupload-java/debian

[Marcus Better]

Author: marcusb-guest
Date: 2009-06-23 14:30:37 +0000 (Tue, 23 Jun 2009)
New Revision: 8592

Modified:
   trunk/libcommons-fileupload-java/debian/copyright
Log:
Update copyright and remove full text of the Apache license (patch from Emmanuel Bourg <ebourg at apache.org>).

Modified: trunk/libcommons-fileupload-java/debian/copyright
===================================================================
--- trunk/libcommons-fileupload-java/debian/copyright	2009-06-23 14:29:55 UTC (rev 8591)
+++ trunk/libcommons-fileupload-java/debian/copyright	2009-06-23 14:30:37 UTC (rev 8592)
@@ -3,68 +3,25 @@
 
 It was downloaded from http://commons.apache.org/fileupload/
 
-Upstream Authors: Martin Cooper <martin.cooper at tumbleweed.com>
-                  dIon Gillard <dion at apache.org>
-                  John McNally <jmcnally at collab.net>
-                  Daniel Rall <dlr at finemaltcoding.com>
-                  Jason van Zyl <jason at zenplex.com>
-                  Robert Burrell Donkin <rdonkin at apache.org>
+Upstream Authors: Martin Cooper <martinc at apache.org>
+                  dIon Gillard <dion at apache.org>,
+                  John McNally <jmcnally at collab.net>,
+                  Daniel Rall <dlr at finemaltcoding.com>,
+                  Jason van Zyl <jason at zenplex.com>,
+                  Robert Burrell Donkin <rdonkin at apache.org>,
+                  Sean C. Sullivan <sean at seansullivan.com>,
+                  Jochen Wiedmann <jochen.wiedmann at gmail.com>,
+                  Aaron Freeman <aaron at sendthisfile.com>,
+                  Gary Gregory <ggregory at seagullsw.com>,
+                  Michael Macaluso <michael.public at wavecorp.com>,
+                  Amichai Rothman <amichai2 at amichais.net>,
+                  Alexander Sova <bird at noir.crocodile.org>,
+                  Thomas Vandahl <tv at apache.org>,
+                  Henry Yandell <bayard at apache.org>
 
-Copyright:
+Copyright: © 2002-2008 The Apache Software Foundation
 
-====================================================================
+License: Apache 2.0
 
-The Apache Software License, Version 1.1
-
-Copyright (c) 2001 The Apache Software Foundation.  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 end-user documentation included with the redistribution, if
-   any, must include the following acknowlegement:  
-      "This product includes software developed by the 
-       Apache Software Foundation (http://www.apache.org/)."
-   Alternately, this acknowlegement may appear in the software itself,
-   if and wherever such third-party acknowlegements normally appear.
-
-4. The names "The Jakarta Project", "Commons", and "Apache Software
-   Foundation" must not be used to endorse or promote products derived
-   from this software without prior written permission. For written 
-   permission, please contact apache at apache.org.
-
-5. Products derived from this software may not be called "Apache",
-   "Velocity" nor may "Apache" appear in their names without prior 
-   written permission of the Apache Group.
-
-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 APACHE SOFTWARE FOUNDATION 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 Apache Software Foundation.  For more
-information on the Apache Software Foundation, please see
-<http://www.apache.org/>.
-
-
-
+On Debian systems the full text of the Apache License can be found
+in `/usr/share/common-licenses/Apache-2.0'.