[pkg-java] r7476 - trunk/libxbean-java/debian

Sun Nov 30 01:59:12 UTC 2008

Author: twerner
Date: 2008-11-30 01:59:12 +0000 (Sun, 30 Nov 2008)
New Revision: 7476

Modified:
   trunk/libxbean-java/debian/changelog
   trunk/libxbean-java/debian/copyright
Log:
Fix debian/copyright.

Modified: trunk/libxbean-java/debian/changelog
===================================================================

--- trunk/libxbean-java/debian/changelog	2008-11-30 01:52:59 UTC (rev 7475)
+++ trunk/libxbean-java/debian/changelog	2008-11-30 01:59:12 UTC (rev 7476)
@@ -1,3 +1,9 @@
+libxbean-java (3.4.3-2) unstable; urgency=low
+
+  * Fix debian/copyright.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 30 Nov 2008 02:59:00 +0100
+
 libxbean-java (3.4.3-1) unstable; urgency=low
 
   * Initial release. (Closes: #507284)

Modified: trunk/libxbean-java/debian/copyright
===================================================================
--- trunk/libxbean-java/debian/copyright	2008-11-30 01:52:59 UTC (rev 7475)
+++ trunk/libxbean-java/debian/copyright	2008-11-30 01:59:12 UTC (rev 7476)
@@ -3,95 +3,25 @@
 
 xbean was downloaded from http://geronimo.apache.org/xbean/
 
-FIXME
-
 Upstream Authors:  
-	Andrew Williams
-	Avalon Development Team
-	Ben Walding
-	Berin Loritsch
-	Bert van Brakel
-	Brett Porter
-	Dan Diephouse
-	Jason van Zyl
-	John Casey
-	Kenney Westerhof
-	Leo Sutic
-	Mark H. Wilkinson
-	Michal Maczka
-	Peter Donald
-	Ran Tene
-	Trygve Laugstl
+  David Blevins, Alan Cabrera, Hiram Chirino, Guillaume Nodet, Rob Davies,
+  Aaron Mulder, James Strachan, Dain Sundstrom
 
+Copyright: 2005-2008 The Apache Software Foundation
 
-There is one source file without a license header. This has been brought to
-upstream's attention who have confirmed that they will add the license
-information (see IRC log extract below):
+License:
 
- [Sat Apr 21 2007] [13:06:51] <paulcager> Source file for class
-  org.codehaus.plexus.component.configurator.converters.ComponentValueSetter
-  doesn't have any License information at
- [Sat Apr 21 2007] [13:07:45] <paulcager> the top. I'm packaging it for Debian,
-  and I wondered if anyone could add the appropriate license block?
- [Sat Apr 21 2007] [13:22:22] <cobalt-60> kenney, your name is there,
-  and it looks it all your fault :)
- [Sat Apr 21 2007] [15:19:52] <trygvis> paulcager: I'll take care of it ..
-  was supposed to do it, but got busy
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-COPYRIGHT NOTICES:
-	Copyright 2002 (C) The Werken Company. All Rights Reserved.
+       http://www.apache.org/licenses/LICENSE-2.0
 
-	Redistribution and use of this software and associated documentation
-	("Software"), with or without modification, are permitted provided
-	that the following conditions are met:
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
-	1. Redistributions of source code must retain copyright
-	statements and notices.  Redistributions must also contain a
-	copy of this document.
-
-	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 name "classworlds" must not be used to endorse or promote
-	products derived from this Software without prior written
-	permission of The Werken Company.  For written permission,
-	please contact bob at werken.com.
-
-	4. Products derived from this Software may not be called "classworlds"
-	nor may "classworlds" appear in their names without prior written
-	permission of The Werken Company. "classworlds" is a registered
-	trademark of The Werken Company.
-
-	5. Due credit should be given to The Werken Company.
-	(http://classworlds.werken.com/).
-
-	THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
-	``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 WERKEN COMPANY 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.
-
-
-	* Copyright 2001-2006 Codehaus Foundation.
-	*
-	* Licensed under the Apache License, Version 2.0 (the "License");
-	* you may not use this file except in compliance with the License.
-	* You may obtain a copy of the License at
-	*
-	*      http://www.apache.org/licenses/LICENSE-2.0
-	*
-	* Unless required by applicable law or agreed to in writing, software
-	* distributed under the License is distributed on an "AS IS" BASIS,
-	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	* See the License for the specific language governing permissions and
-	* limitations under the License.
-
+The full text of the license can be found in
+'/usr/share/common-licenses/Apache-2.0'.


