[plexus-velocity] 05/25: Corrected dependencies. Noted license problem. minor tidying up

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-velocity.

commit 03a704af1e15508c8d0e1a913777fc2c6c85ea45
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Sun Jul 8 00:28:50 2007 +0000

    Corrected dependencies.
    Noted license problem.
    minor tidying up
---
 debian/control   |  2 +-
 debian/copyright | 26 ++++----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/debian/control b/debian/control
index c17cd93..b15eae7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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)
diff --git a/debian/copyright b/debian/copyright
index b2fd7b6..0a45e69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,8 +8,8 @@ of the GNU General Public License version 2 can be found in
 '/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 @@ Upstream Authors:
 
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-velocity.git