[pkg-java] r7478 - trunk/plexus-containers/debian

Sun Nov 30 10:22:11 UTC 2008

Author: twerner
Date: 2008-11-30 10:22:11 +0000 (Sun, 30 Nov 2008)
New Revision: 7478

Modified:
   trunk/plexus-containers/debian/changelog
   trunk/plexus-containers/debian/copyright
Log:
Fix debian/copyright.

Modified: trunk/plexus-containers/debian/changelog
===================================================================

--- trunk/plexus-containers/debian/changelog	2008-11-30 02:02:23 UTC (rev 7477)
+++ trunk/plexus-containers/debian/changelog	2008-11-30 10:22:11 UTC (rev 7478)
@@ -1,3 +1,9 @@
+plexus-containers (1.0~beta2-2) unstable; urgency=low
+
+  * Fix debian/copyright.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 30 Nov 2008 11:21:37 +0100
+
 plexus-containers (1.0~beta2-1) unstable; urgency=low
 
   * Initial release. (Closes: #507272)

Modified: trunk/plexus-containers/debian/copyright
===================================================================
--- trunk/plexus-containers/debian/copyright	2008-11-30 02:02:23 UTC (rev 7477)
+++ trunk/plexus-containers/debian/copyright	2008-11-30 10:22:11 UTC (rev 7478)
@@ -1,97 +1,61 @@
 This package was debianized by Torsten Werner<twerner at debian.org>
 Sat Nov 29 17:33:45 CET 2008
 
-plex-containers was downloaded from http://plexus.codehaus.org/
+plex-containers was downloaded from http://plexus.codehaus.org
 
-FIXME
+Copyright: 2001-2008 Codehaus Foundation
 
-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
+License:
 
+   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.
 
-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):
+The full text of the license can be found in
+'/usr/share/common-licenses/Apache-2.0'.
 
- [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
+----------
 
-COPYRIGHT NOTICES:
-	Copyright 2002 (C) The Werken Company. All Rights Reserved.
+Files:
 
-	Redistribution and use of this software and associated documentation
-	("Software"), with or without modification, are permitted provided
-	that the following conditions are met:
+plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/*
+plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/merge/*
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/*
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ComponentGleanerException.java
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriter.java
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultMetadataGenerator.java
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorWriteException.java
+plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorWriter.java
+plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/*
 
-	1. Redistributions of source code must retain copyright
-	statements and notices.  Redistributions must also contain a
-	copy of this document.
+Copyright: 2001-2008 Codehaus Foundation
 
-	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.
+License: The MIT license
 
-	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.
+  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 to
+  use, copy, modify, merge, publish, distribute, sublicense, 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 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. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
 
-	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.
-


