[pkg-java] r3800 - trunk/plexus-velocity/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-07-08 00:28:50 +0000 (Sun, 08 Jul 2007)
New Revision: 3800

Modified:
   trunk/plexus-velocity/debian/control
   trunk/plexus-velocity/debian/copyright
Log:
Corrected dependencies.
Noted license problem.
minor tidying up

Modified: trunk/plexus-velocity/debian/control
===================================================================
--- trunk/plexus-velocity/debian/control	2007-07-08 00:16:28 UTC (rev 3799)
+++ trunk/plexus-velocity/debian/control	2007-07-08 00:28:50 UTC (rev 3800)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstol <trygvis at inamo.no>,
            Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java,
+Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libcommons-collections-java,
                      libplexus-container-default-java, velocity, junit, junit-doc,
 		     maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)

Modified: trunk/plexus-velocity/debian/copyright
===================================================================
--- trunk/plexus-velocity/debian/copyright	2007-07-08 00:16:28 UTC (rev 3799)
+++ trunk/plexus-velocity/debian/copyright	2007-07-08 00:28:50 UTC (rev 3800)
@@ -8,8 +8,8 @@
 '/usr/share/common-licenses/GPL-2'.
 
 
-plexus-i18n was downloaded from
-  http://svn.codehaus.org/plexus/tags/plexus-i18n-$(VERSION)
+plexus-velocity was downloaded from
+  http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity
 
 Upstream Authors:  
 	The Apache Software Foundation
@@ -17,23 +17,5 @@
 
 
 COPYRIGHT NOTICES:
-
-	Copyright (c) 2007, Codehaus.org
-
-	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.
+	The software is currently unlicensed, and so can't be uploaded.
+	See http://jira.codehaus.org/browse/PLX-342