[fedora-java] [Fwd: Jakarta Commons is now Apache Commons]

Andrew Overholt overholt at redhat.com
Mon Jun 15 15:14:47 UTC 2009


Should we make similar changes in Fedora?

Andrew

-------- Forwarded Message --------
> From: Emmanuel Bourg <ebourg at apache.org>
> To: pkg-java-maintainers at lists.alioth.debian.org,
> debian-java at lists.debian.org
> Subject: Jakarta Commons is now Apache Commons
> Date: Thu, 11 Jun 2009 14:27:29 +0200
> 
> Hi,
> 
> Two years ago the Jakarta Commons projects moved to a top level project 
> at Apache named "Apache Commons Project". Several Debian packages of the 
> Commons components still refer to Jakarta in the copyright, control and 
> watch files. I reviewed the files in SVN and build a patch to reflect 
> the change. I also updated the information about former Jakarta projects 
> that moved to their own top level project (Velocity and Struts)
> 
> Could someone with commit access apply the patch please? It was created 
> against svn://svn.debian.org/pkg-java/trunk
> 
> Thank you,
> 
> Emmanuel Bourg
> Apache Commons Developer
> plain text document attachment (debian-java-jakarta.patch)
> Index: commons-beanutils/debian/copyright
> ===================================================================
> --- commons-beanutils/debian/copyright	(revision 8412)
> +++ commons-beanutils/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Takashi Okamoto <tora at debian.org> on
>  Mon,  5 Nov 2001 08:57:47 +0900.
>  
> -It was downloaded from <http://jakarta.apache.org/commons/>
> +It was downloaded from <http://commons.apache.org/beanutils/>
>  
>  Copyright:
>  
> Index: commons-beanutils/trunk/debian/copyright
> ===================================================================
> --- commons-beanutils/trunk/debian/copyright	(revision 8412)
> +++ commons-beanutils/trunk/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Takashi Okamoto <tora at debian.org> on
>  Mon,  5 Nov 2001 08:57:47 +0900.
>  
> -It was downloaded from <http://jakarta.apache.org/commons/>
> +It was downloaded from <http://commons.apache.org/beanutils/>
>  
>  Copyright:
>  
> Index: commons-csv/debian/control
> ===================================================================
> --- commons-csv/debian/control	(revision 8412)
> +++ commons-csv/debian/control	(working copy)
> @@ -9,7 +9,7 @@
>  Standards-Version: 3.8.0
>  Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-csv
>  Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-csv
> -Homepage: http://jakarta.apache.org/commons/sandbox/csv/
> +Homepage: http://commons.apache.org/sandbox/csv/
>  
>  Package: libcommons-csv-java
>  Architecture: all
> Index: commons-daemon/debian/control
> ===================================================================
> --- commons-daemon/debian/control	(revision 8412)
> +++ commons-daemon/debian/control	(working copy)
> @@ -6,7 +6,7 @@
>  Build-Depends: debhelper (>= 5), autoconf, autotools-dev, java-gcj-compat-dev, xsltproc, docbook-xsl, ant
>  Build-Conflicts: autoconf2.13
>  Standards-Version: 3.7.3
> -Homepage: http://jakarta.apache.org/commons/daemon/
> +Homepage: http://commons.apache.org/daemon/
>  Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon
>  Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/
>  
> @@ -16,7 +16,7 @@
>  Suggests: java-virtual-machine
>  Recommends: jsvc
>  Description: library to launch Java applications as daemons
> - The Daemon package from Jakarta Commons can be used to implement Java
> + The Daemon package from Apache Commons can be used to implement Java
>   applications which can be launched as daemons. For example the
>   program will be notified about a shutdown so that it can perform
>   cleanup tasks before its process of execution is destroyed by the
> Index: commons-daemon/debian/copyright
> ===================================================================
> --- commons-daemon/debian/copyright	(revision 8412)
> +++ commons-daemon/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Sam, 09 Oct 2004 17:46:48 +0200.
>  
> -It was downloaded from <http://jakarta.apache.org/commons/daemon>.
> +It was downloaded from <http://commons.apache.org/daemon>.
>  
>  Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk, Remy
>  Maucherat, Pier Fumagalli, Yoav Shapira.
> Index: commons-daemon/debian/watch
> ===================================================================
> --- commons-daemon/debian/watch	(revision 8412)
> +++ commons-daemon/debian/watch	(working copy)
> @@ -1,3 +1,3 @@
>  version=3
>  opts="dversionmangle=s/1.0.2\~svn.*$/1.0.1/" \
> -http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-(.*)\.tar\.gz
> +http://www.apache.org/dist/commons/daemon/source/daemon-(.*)\.tar\.gz
> Index: commons-io/debian/watch
> ===================================================================
> --- commons-io/debian/watch	(revision 8412)
> +++ commons-io/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=3
> -http://www.apache.org/dist/jakarta/commons/io/source/commons-io-(.*)-src\.tar\.gz debian debian/orig-tar.sh
> +http://www.apache.org/dist/commons/io/source/commons-io-(.*)-src\.tar\.gz debian debian/orig-tar.sh
> Index: commons-pool/commons-pool/debian/control
> ===================================================================
> --- commons-pool/commons-pool/debian/control	(revision 8412)
> +++ commons-pool/commons-pool/debian/control	(working copy)
> @@ -18,4 +18,4 @@
>    2. A toolkit for creating modular object pools.
>    3. Several general purpose pool implementations.
>   .
> -  Homepage: http://jakarta.apache.org/commons/pool/
> +  Homepage: http://commons.apache.org/pool/
> Index: commons-pool/commons-pool/debian/copyright
> ===================================================================
> --- commons-pool/commons-pool/debian/copyright	(revision 8412)
> +++ commons-pool/commons-pool/debian/copyright	(working copy)
> @@ -4,7 +4,7 @@
>  It is currently maintained by the Debian Java Maintainers
>  <pkg-java-maintainers at lists.alioth.debian.org>.
>  
> -The source was downloaded from <http://jakarta.apache.org/commons/pool/>.
> +The source was downloaded from <http://commons.apache.org/pool/>.
>  
>  Upstream authors: Craig McClanahan, David Weinrich, Dirk Verbeeck,
>  Geir Magnusson, Morgan Delagrange, Robert Burrell Donkin, Rodney
> Index: commons-pool/commons-pool/debian/watch
> ===================================================================
> --- commons-pool/commons-pool/debian/watch	(revision 8412)
> +++ commons-pool/commons-pool/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=3
> -http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-(.*)-src.tar.gz
> +http://www.apache.org/dist/commons/pool/source/commons-pool-(.*)-src.tar.gz
> Index: libcommons-cli-java/debian/copyright
> ===================================================================
> --- libcommons-cli-java/debian/copyright	(revision 8412)
> +++ libcommons-cli-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Mon, 27 Oct 2003 15:07:08 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/cli
> +It was downloaded from http://commons.apache.org/cli
>  
>  Upstream Author: Bob McWirther, Peter Donald, John Keyes
>  
> Index: libcommons-cli-java/debian/watch
> ===================================================================
> --- libcommons-cli-java/debian/watch	(revision 8412)
> +++ libcommons-cli-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=3
> -http://www.apache.org/dist/jakarta/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-codec-java/debian/control
> ===================================================================
> --- libcommons-codec-java/debian/control	(revision 8412)
> +++ libcommons-codec-java/debian/control	(working copy)
> @@ -15,5 +15,5 @@
>   used encoders and decoders, the codec package also maintains a
>   collection of phonetic encoding utilities.
>   .
> - This is a part of the Apache Jakarta Project.
> - Home: <http://jakarta.apache.org/commons/codec/>
> + This is a part of the Apache Commons Project.
> + Home: <http://commons.apache.org/codec/>
> Index: libcommons-codec-java/debian/copyright
> ===================================================================
> --- libcommons-codec-java/debian/copyright	(revision 8412)
> +++ libcommons-codec-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Thu, 19 Aug 2004 13:26:48 +0200
>  
> -It was downloaded from http://jakarta.apache.org/commons/codec/
> +It was downloaded from http://commons.apache.org/codec/
>  
>  Upstream Authors: Henri Yandell <bayard at generationjava.com>, Tim OBrien
>                    <tobrien at apache.org>, Scott Sanders
> Index: libcommons-codec-java/debian/watch
> ===================================================================
> --- libcommons-codec-java/debian/watch	(revision 8412)
> +++ libcommons-codec-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=2
> -http://www.apache.org/dist/jakarta/commons/codec/source/commons-codec-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/codec/source/commons-codec-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-collections-java/debian/copyright
> ===================================================================
> --- libcommons-collections-java/debian/copyright	(revision 8412)
> +++ libcommons-collections-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Takashi Okamoto <tora at debian.org> on
>  Mon,  5 Nov 2001 08:15:04 +0900.
>  
> -It was downloaded from http://jakarta.apache.org/commons/
> +It was downloaded from http://commons.apache.org/collections/
>  
>  Upstream Authors: 
>      Peter Donald
> Index: libcommons-collections-java/debian/doc-base
> ===================================================================
> --- libcommons-collections-java/debian/doc-base	(revision 8412)
> +++ libcommons-collections-java/debian/doc-base	(working copy)
> @@ -1,6 +1,6 @@
>  Document: libcommons-collections-java
>  Title: Programmer API for libcommons-collections-java
> -Author: Apache Jakarta Developer Team
> +Author: Apache Commons Developer Team
>  Abstract: Javadocs programmer API of libcommons-collections-java, 
>   a set of abstract data type interfaces and implementations.
>  Section: Programming
> Index: libcommons-collections3-java/debian/copyright
> ===================================================================
> --- libcommons-collections3-java/debian/copyright	(revision 8412)
> +++ libcommons-collections3-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Takashi Okamoto <tora at debian.org> on
>  Mon,  5 Nov 2001 08:15:04 +0900.
>  
> -It was downloaded from <http://jakarta.apache.org/commons/collections/>
> +It was downloaded from <http://commons.apache.org/collections/>
>  
>  Upstream Authors: 
>      Peter Donald
> Index: libcommons-dbcp-java/debian/control
> ===================================================================
> --- libcommons-dbcp-java/debian/control	(revision 8412)
> +++ libcommons-dbcp-java/debian/control	(working copy)
> @@ -22,5 +22,5 @@
>    * Support for PreparedStatement pooling.
>    * XML configuration.
>   .
> - This is a part of the Apache Jakarta Project.
> - Home: <http://jakarta.apache.org/commons/dbcp/>
> + This is a part of the Apache Commons Project.
> + Home: <http://commons.apache.org/dbcp/>
> Index: libcommons-dbcp-java/debian/copyright
> ===================================================================
> --- libcommons-dbcp-java/debian/copyright	(revision 8412)
> +++ libcommons-dbcp-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
>  Sat,  5 Apr 2003 17:48:00 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/dbcp/
> +It was downloaded from http://commons.apache.org/dbcp/
>  
>  Upstream Authors: See STATUS.html
>    * Morgan Delagrange
> Index: libcommons-dbcp-java/debian/watch
> ===================================================================
> --- libcommons-dbcp-java/debian/watch	(revision 8412)
> +++ libcommons-dbcp-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=3
> -http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz
> +http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz
> Index: libcommons-digester-java/debian/copyright
> ===================================================================
> --- libcommons-digester-java/debian/copyright	(revision 8412)
> +++ libcommons-digester-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Takashi Okamoto <tora at debian.org> on
>  Mon,  5 Nov 2001 08:15:04 +0900.
>  
> -It was downloaded from <http://jakarta.apache.org/commons/digester/>
> +It was downloaded from <http://commons.apache.org/digester/>
>  
>  Upstream Authors:	Peter Donald
>  			Geir Magnusson Jr.
> Index: libcommons-discovery-java/debian/copyright
> ===================================================================
> --- libcommons-discovery-java/debian/copyright	(revision 8412)
> +++ libcommons-discovery-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Fri, 12 Mar 2004 23:53:29 +0100.
>  
> -It was downloaded from http://jakarta.apache.org/commons/discovery/
> +It was downloaded from http://commons.apache.org/discovery/
>  
>  Upstream Authors: Richard Sitze, Craig R. McClanahan, Costin
>                    Manolache,  James Strachan <jstrachan at apache.org>,
> Index: libcommons-el-java/debian/control
> ===================================================================
> --- libcommons-el-java/debian/control	(revision 8412)
> +++ libcommons-el-java/debian/control	(working copy)
> @@ -6,7 +6,7 @@
>  Build-Depends: debhelper (>=5), cdbs
>  Build-Depends-Indep: java-gcj-compat-dev, ant, junit (>= 3.8.1), libservlet2.4-java
>  Standards-Version: 3.7.2
> -Homepage: http://jakarta.apache.org/commons/el/
> +Homepage: http://commons.apache.org/el/
>  
>  Package: libcommons-el-java
>  Architecture: all
> Index: libcommons-el-java/debian/copyright
> ===================================================================
> --- libcommons-el-java/debian/copyright	(revision 8412)
> +++ libcommons-el-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
>  Tue,  1 Jul 2003 17:04:27 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/el
> +It was downloaded from http://commons.apache.org/el
>  
>  Upstream Authors: Nathan Abramson <arista at alum.mit.edu>
>                    Shawn Bayern <shawn at apache.org>
> Index: libcommons-el-java/debian/watch
> ===================================================================
> --- libcommons-el-java/debian/watch	(revision 8412)
> +++ libcommons-el-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=2
> -http://www.apache.org/dist/jakarta/commons/el/source/commons-el-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/el/source/commons-el-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-fileupload-java/debian/copyright
> ===================================================================
> --- libcommons-fileupload-java/debian/copyright	(revision 8412)
> +++ libcommons-fileupload-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
>  Sun, 13 Apr 2003 18:45:44 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/fileupload/
> +It was downloaded from http://commons.apache.org/fileupload/
>  
>  Upstream Authors: Martin Cooper <martin.cooper at tumbleweed.com>
>                    dIon Gillard <dion at apache.org>
> Index: libcommons-jexl-java/debian/control
> ===================================================================
> --- libcommons-jexl-java/debian/control	(revision 8412)
> +++ libcommons-jexl-java/debian/control	(working copy)
> @@ -7,7 +7,7 @@
>  Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
>  Build-Depends-Indep: default-jdk, ant, libcommons-logging-java, junit
>  Standards-Version: 3.8.1
> -Homepage: http://jakarta.apache.org/commons/jexl
> +Homepage: http://commons.apache.org/jexl
>  
>  Package: libcommons-jexl-java
>  Architecture: all
> Index: libcommons-jexl-java/debian/copyright
> ===================================================================
> --- libcommons-jexl-java/debian/copyright	(revision 8412)
> +++ libcommons-jexl-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Mon, 27 Oct 2003 17:57:08 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/jexl
> +It was downloaded from http://commons.apache.org/jexl
>  
>  Upstream Author: Geir Magnusson Jr. <geirm at apache.org>,
>                      James Strachan <jstrachan at apache.org>,
> Index: libcommons-jxpath-java/debian/control
> ===================================================================
> --- libcommons-jxpath-java/debian/control	(revision 8412)
> +++ libcommons-jxpath-java/debian/control	(working copy)
> @@ -19,7 +19,7 @@
>   One of the most important feature of the component is the
>   unification of reference syntax between DOM and java. 
>   . 
> - Homepage: http://jakarta.apache.org/commons/
> + Homepage: http://commons.apache.org/jxpath/
>  
>  Package: libcommons-jxpath-java-doc
>  Architecture: all
> Index: libcommons-jxpath-java/debian/copyright
> ===================================================================
> --- libcommons-jxpath-java/debian/copyright	(revision 8412)
> +++ libcommons-jxpath-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Mon, 27 Oct 2003 17:57:08 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/
> +It was downloaded from http://commons.apache.org/jxpath/
>  
>  Upstream Author: Dmitri Plotnikov <dmitri at apache.org>
>  
> Index: libcommons-jxpath-java/debian/watch
> ===================================================================
> --- libcommons-jxpath-java/debian/watch	(revision 8412)
> +++ libcommons-jxpath-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=2
> -http://www.apache.org/dist/jakarta/commons/jxpath/source/commons-jxpath-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-lang-java/debian/control
> ===================================================================
> --- libcommons-lang-java/debian/control	(revision 8412)
> +++ libcommons-lang-java/debian/control	(working copy)
> @@ -8,7 +8,7 @@
>  Standards-Version: 3.7.3
>  Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java
>  Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java
> -Homepage: http://jakarta.apache.org/commons/lang/
> +Homepage: http://commons.apache.org/lang/
>  
>  Package: libcommons-lang-java
>  Architecture: all
> Index: libcommons-lang-java/debian/copyright
> ===================================================================
> --- libcommons-lang-java/debian/copyright	(revision 8412)
> +++ libcommons-lang-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
>  Tue,  1 Jul 2003 14:43:32 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/lang/
> +It was downloaded from http://commons.apache.org/lang/
>  
>  Upstream Authors:  Christopher Elkins <chrise at esha.com>,
>                     Daniel Rall <dlr at collab.net>,
> Index: libcommons-lang-java/debian/watch
> ===================================================================
> --- libcommons-lang-java/debian/watch	(revision 8412)
> +++ libcommons-lang-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=2
> -http://www.apache.org/dist/jakarta/commons/lang/source/commons-lang-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/lang/source/commons-lang-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-launcher-java/debian/control
> ===================================================================
> --- libcommons-launcher-java/debian/control	(revision 8412)
> +++ libcommons-launcher-java/debian/control	(working copy)
> @@ -35,5 +35,5 @@
>      * You want to provide localized error messages which is very tricky
>   to do in batch and shell scripts.
>   .
> - This is a part of the Apache Jakarta Project.
> - Home: <http://jakarta.apache.org/commons/launcher/>
> + This is a part of the Apache Commons Project.
> + Home: <http://commons.apache.org/launcher/>
> Index: libcommons-launcher-java/debian/copyright
> ===================================================================
> --- libcommons-launcher-java/debian/copyright	(revision 8412)
> +++ libcommons-launcher-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Fri, 13 May 2005 17:01:26 +0100.
>  
> -It was downloaded from http://jakarta.apache.org/commons/launcher
> +It was downloaded from http://commons.apache.org/launcher
>  
>  Upstream Authors: Patrick Luby, Costin Manolache, Remy Maucherat,
>                    Jean-Frederic Clere, Dirk Verbeeck
> Index: libcommons-launcher-java/debian/watch
> ===================================================================
> --- libcommons-launcher-java/debian/watch	(revision 8412)
> +++ libcommons-launcher-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=2
> -http://www.apache.org/dist/jakarta/commons/launcher/source/commons-launcher-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/launcher/source/commons-launcher-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-logging-java/debian/copyright
> ===================================================================
> --- libcommons-logging-java/debian/copyright	(revision 8412)
> +++ libcommons-logging-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Takashi Okamoto <tora at debian.org> on
>  Mon,  5 Nov 2001 08:15:04 +0900.
>  
> -It was downloaded from http://jakarta.apache.org/commons/
> +It was downloaded from http://commons.apache.org/logging/
>  
>  Authors: The Apache Commons Logging Developers
>  
> Index: libcommons-logging-java/debian/watch
> ===================================================================
> --- libcommons-logging-java/debian/watch	(revision 8412)
> +++ libcommons-logging-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=3
> -http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-modeler-java/debian/control
> ===================================================================
> --- libcommons-modeler-java/debian/control	(revision 8412)
> +++ libcommons-modeler-java/debian/control	(working copy)
> @@ -7,7 +7,7 @@
>  Build-Depends-Indep: java-gcj-compat-dev, libcommons-logging-java,
>                       libcommons-digester-java, libmx4j-java, junit
>  Standards-Version: 3.7.2
> -Homepage: http://jakarta.apache.org/commons/modeler/
> +Homepage: http://commons.apache.org/modeler/
>  Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-modeler-java
>  Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-modeler-java/
>  
> @@ -18,7 +18,7 @@
>           libmx4j-java, libcommons-logging-java, libcommons-digester-java
>  Suggests: java-virtual-machine
>  Description: convenience library to use Java Management Extensions (JMX)
> - Commons Modeler from the Apache Jakarta project simplifies using the Java
> + Commons Modeler from the Apache Commons project simplifies using the Java
>   Management Extensions (JMX). It provides the following services to
>   application developers who wish to make their applications manageable via JMX:
>    * Reads an XML-based description of the Model MBeans to be provided
> @@ -33,7 +33,7 @@
>  Architecture: all
>  Suggests: libcommons-modeler-java
>  Description: documentation and examples for Commons Modeler
> - Commons Modeler from the Apache Jakarta project simplifies using the Java
> + Commons Modeler from the Apache Commons project simplifies using the Java
>   Management Extensions (JMX).
>   .
>   This package contains the API Javadoc and examples.
> Index: libcommons-modeler-java/debian/copyright
> ===================================================================
> --- libcommons-modeler-java/debian/copyright	(revision 8412)
> +++ libcommons-modeler-java/debian/copyright	(working copy)
> @@ -4,7 +4,7 @@
>  It is currently maintained by the Debian Java Maintainers
>  <pkg-java-maintainers at lists.alioth.debian.org>.
>  
> -It was downloaded from <http://jakarta.apache.org/commons/modeler.html>.
> +It was downloaded from <http://commons.apache.org/modeler>.
>  
>  Upstream Authors: Bill Barker, Costin Manolache, Craig R. McClanahan,
>  Davanum Srinivas, Yoav Shapira
> Index: libcommons-modeler-java/debian/watch
> ===================================================================
> --- libcommons-modeler-java/debian/watch	(revision 8412)
> +++ libcommons-modeler-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=3
> -http://www.apache.org/dist/jakarta/commons/modeler/source/commons-modeler-(.*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/modeler/source/commons-modeler-(.*)-src\.tar\.gz debian uupdate
> Index: libcommons-net-java/debian/control
> ===================================================================
> --- libcommons-net-java/debian/control	(revision 8412)
> +++ libcommons-net-java/debian/control	(working copy)
> @@ -29,5 +29,5 @@
>   expired, it is possible to make the source code freely available under
>   the The Apache Software License.
>   .
> - This is a part of the Apache Jakarta Project.
> - Home: <http://jakarta.apache.org/commons/net/>
> + This is a part of the Apache Commons Project.
> + Home: <http://commons.apache.org/net/>
> Index: libcommons-net-java/debian/copyright
> ===================================================================
> --- libcommons-net-java/debian/copyright	(revision 8412)
> +++ libcommons-net-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
>  Tue, 11 May 2004 17:01:26 +0100.
>  
> -It was downloaded from http://jakarta.apache.org/commons/net/
> +It was downloaded from http://commons.apache.org/net/
>  
>  Upstream Authors: Jeffrey D. Brekke <Jeff.Brekke at qg.com>, Steve Cohen
>                    <scohen at apache.org>, Bruno D'Avanzo
> Index: libcommons-net-java/debian/doc-base
> ===================================================================
> --- libcommons-net-java/debian/doc-base	(revision 8412)
> +++ libcommons-net-java/debian/doc-base	(working copy)
> @@ -1,7 +1,7 @@
>  Document: libcommons-net-java
>  Title: Programmer API for Commons Net
>  Author: Apache Commons Net developers
> -Abstract: Jakarta Commons Net implements the client side of many basic
> +Abstract: Apache Commons Net implements the client side of many basic
>   Internet protocols.
>  Section: Programming
>  
> Index: libcommons-net-java/debian/watch
> ===================================================================
> --- libcommons-net-java/debian/watch	(revision 8412)
> +++ libcommons-net-java/debian/watch	(working copy)
> @@ -1,2 +1,2 @@
>  version=2
> -http://www.apache.org/dist/jakarta/commons/net/source/commons-net-([0-9\.]*)-src\.tar\.gz debian uupdate
> +http://www.apache.org/dist/commons/net/source/commons-net-([0-9\.]*)-src\.tar\.gz debian uupdate
> Index: libcommons-openpgp-java/debian/control
> ===================================================================
> --- libcommons-openpgp-java/debian/control	(revision 8412)
> +++ libcommons-openpgp-java/debian/control	(working copy)
> @@ -25,7 +25,7 @@
>   OpenPGP from these tools. Currently, Maven uses it in its development
>   version to sign libraries released to the repository.
>   .
> -  Homepage: http://jakarta.apache.org/commons/sandbox/openpgp/
> +  Homepage: http://commons.apache.org/sandbox/openpgp/
>  
>  Package: libcommons-openpgp-java-doc
>  Architecture: all
> @@ -43,4 +43,4 @@
>   .
>   This package contains the API documentation for libcommons-openpgp-java
>   .
> -  Homepage: http://jakarta.apache.org/commons/sandbox/openpgp/
> +  Homepage: http://commons.apache.org/sandbox/openpgp/
> Index: libcommons-openpgp-java/debian/copyright
> ===================================================================
> --- libcommons-openpgp-java/debian/copyright	(revision 8412)
> +++ libcommons-openpgp-java/debian/copyright	(working copy)
> @@ -7,7 +7,7 @@
>  '/usr/share/common-licenses/GPL-2'.
>  
> 
> -openpgp was downloaded from http://jakarta.apache.org/commons/sandbox/openpgp/
> +openpgp was downloaded from http://commons.apache.org/sandbox/openpgp/
>  
>  Upstream Authors:  
>  	Brett Porter 	brett at apache.org
> Index: libcommons-openpgp-java/debian/rules
> ===================================================================
> --- libcommons-openpgp-java/debian/rules	(revision 8412)
> +++ libcommons-openpgp-java/debian/rules	(working copy)
> @@ -18,7 +18,7 @@
>  DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
>  #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
>  API_DOCS             := build/doc/api
> -SVN                  := http://svn.apache.org/repos/asf/jakarta/commons/sandbox/openpgp/trunk/
> +SVN                  := http://svn.apache.org/repos/asf/commons/sandbox/openpgp/trunk/
>  REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
>  
> 
> Index: libcommons-validator-java/debian/control
> ===================================================================
> --- libcommons-validator-java/debian/control	(revision 8412)
> +++ libcommons-validator-java/debian/control	(working copy)
> @@ -8,7 +8,7 @@
>  Standards-Version: 3.7.2
>  XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-validator-java
>  XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-validator-java
> -Homepage: http://jakarta.apache.org/commons/validator/
> +Homepage: http://commons.apache.org/validator/
>  
>  Package: libcommons-validator-java
>  Architecture: all
> @@ -21,4 +21,4 @@
>   Validation rules can be defined in an xml file which
>   keeps them abstracted from JavaBean you are validating.
>   .
> - This is a part of the Apache Jakarta Project.
> + This is a part of the Apache Commons Project.
> Index: libcommons-validator-java/debian/copyright
> ===================================================================
> --- libcommons-validator-java/debian/copyright	(revision 8412)
> +++ libcommons-validator-java/debian/copyright	(working copy)
> @@ -1,7 +1,7 @@
>  This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
>  Mon, 30 Jun 2003 15:32:07 +0200.
>  
> -It was downloaded from http://jakarta.apache.org/commons/validator/
> +It was downloaded from http://commons.apache.org/validator/
>  
>  Upstream Authors:  David Winterfeldt <dwinterfeldt at apache.org>,
>                     Craig McClanahan <craigmcc at apache.org>,
> Index: libcommons-validator-java/debian/watch
> ===================================================================
> --- libcommons-validator-java/debian/watch	(revision 8412)
> +++ libcommons-validator-java/debian/watch	(working copy)
> @@ -1,3 +1,3 @@
>  version=3
> -http://www.apache.org/dist/jakarta/commons/validator/source/ \
> +http://www.apache.org/dist/commons/validator/source/ \
>       commons-validator-(.*)-src\.tar\.gz debian debian/orig-tar.sh
> Index: libjamon-java/debian/control
> ===================================================================
> --- libjamon-java/debian/control	(revision 8412)
> +++ libjamon-java/debian/control	(working copy)
> @@ -6,7 +6,7 @@
>  Build-Depends: ant, cdbs, debhelper (>= 5), glassfish-javaee,
>   java-gcj-compat-dev, jetty, libservlet2.4-java
>  Standards-Version: 3.7.3
> -Homepage: http://jakarta.apache.org/commons/attributes/
> +Homepage: http://commons.apache.org/attributes/
>  Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjamon-java/
>  Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjamon-java
>  
> Index: libslf4j-java/debian/control
> ===================================================================
> --- libslf4j-java/debian/control	(revision 8412)
> +++ libslf4j-java/debian/control	(working copy)
> @@ -19,8 +19,8 @@
>   The Simple Logging Facade for Java (or SLF4J) is intended to serve as
>   a simple facade for various logging APIs allowing to the end-user to
>   plug in the desired implementation at deployment time. SLF4J also
> - allows for a gradual migration path away from Jakarta Commons
> - Logging (JCL)
> + allows for a gradual migration path away from Apache Commons
> + Logging (CL)
>   .
>   Logging API implementations can either choose to implement the SLF4J
>   interfaces directly, e.g. logback or SimpleLogger. Alternatively, it
> Index: libstruts1.2-java/debian/control
> ===================================================================
> --- libstruts1.2-java/debian/control	(revision 8412)
> +++ libstruts1.2-java/debian/control	(working copy)
> @@ -14,7 +14,7 @@
>  Description: Java Framework for MVC web applications
>   The core of the Struts framework is a flexible control layer based on standard
>   technologies like Servlets, JavaBeans, ResourceBundles, and Extensible
> - Markup Language (XML), as well as various Jakarta Commons packages. Struts
> + Markup Language (XML), as well as various Apache Commons packages. Struts
>   encourages application architectures based on the Model 2 approach, a
>   variation of the classic Model-View-Controller (MVC) design paradigm.
>   .
> Index: libstruts1.2-java/debian/copyright
> ===================================================================
> --- libstruts1.2-java/debian/copyright	(revision 8412)
> +++ libstruts1.2-java/debian/copyright	(working copy)
> @@ -1,6 +1,6 @@
>  This package was debianized by Stefan Gybas <sgybas at debian.org> on 01-Jul-2003.
>  The source code was downloaded from
> -<http://www.apache.org/dist/jakarta/struts/source/>. 
> +<http://www.apache.org/dist/struts/source/>. 
>  
>  Copyright (BSD-style license):
>  
> Index: libstruts1.3-java/debian/control
> ===================================================================
> --- libstruts1.3-java/debian/control	(revision 8412)
> +++ libstruts1.3-java/debian/control	(working copy)
> @@ -14,7 +14,7 @@
>  Description: Java Framework for MVC web applications
>   The core of the Struts framework is a flexible control layer based on standard
>   technologies like Servlets, JavaBeans, ResourceBundles, and Extensible
> - Markup Language (XML), as well as various Jakarta Commons packages. Struts
> + Markup Language (XML), as well as various Apache Commons packages. Struts
>   encourages application architectures based on the Model 2 approach, a
>   variation of the classic Model-View-Controller (MVC) design paradigm.
>   .
> Index: libstruts1.3-java/debian/copyright
> ===================================================================
> --- libstruts1.3-java/debian/copyright	(revision 8412)
> +++ libstruts1.3-java/debian/copyright	(working copy)
> @@ -1,6 +1,6 @@
>  This package was debianized by Stefan Gybas <sgybas at debian.org> on 01-Jul-2003.
>  The source code was downloaded from
> -<http://www.apache.org/dist/jakarta/struts/source/>. 
> +<http://www.apache.org/dist/struts/source/>. 
>  
>  Copyright (BSD-style license):
>  
> Index: rssowl/debian/copyright
> ===================================================================
> --- rssowl/debian/copyright	(revision 8412)
> +++ rssowl/debian/copyright	(working copy)
> @@ -49,9 +49,9 @@
>    - Apache Xerces: Apache Software License ver. 1.1 (http://www.opensource.org/licenses/apachepl.php)
>    - BlowfishJ: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
>    - iText: Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html)
> -  - Apache Jakarta Commons Codec:  Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
> -  - Apache Jakarta Commons Logging: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
> -  - Apache Jakarta Commons HTTPClient: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
> +  - Apache Commons Codec:  Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
> +  - Apache Commons Logging: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
> +  - Apache HTTPClient: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
>  
>  RSSOwl is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
>  without even the implied waranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
> Index: velocity/debian/copyright
> ===================================================================
> --- velocity/debian/copyright	(revision 8412)
> +++ velocity/debian/copyright	(working copy)
> @@ -3,7 +3,7 @@
>  the license to the Apache Software License, Version 2.0 was debianized
>  by Wolfgang Baer <WBaer at gmx.de> on Sun, 20 Mar 2005 13:59:13 +0100.
>  
> -It was downloaded from <http://jakarta.apache.org/velocity>
> +It was downloaded from <http://velocity.apache.org>
>  
>  Upstream Authors:	Jason van Zyl 	jvanzyl at periapt.com
>  			Jon S. Stevens  jon at latchkey.com
-------------- next part --------------
Index: commons-beanutils/debian/copyright
===================================================================
--- commons-beanutils/debian/copyright	(revision 8412)
+++ commons-beanutils/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Mon,  5 Nov 2001 08:57:47 +0900.
 
-It was downloaded from <http://jakarta.apache.org/commons/>
+It was downloaded from <http://commons.apache.org/beanutils/>
 
 Copyright:
 
Index: commons-beanutils/trunk/debian/copyright
===================================================================
--- commons-beanutils/trunk/debian/copyright	(revision 8412)
+++ commons-beanutils/trunk/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Mon,  5 Nov 2001 08:57:47 +0900.
 
-It was downloaded from <http://jakarta.apache.org/commons/>
+It was downloaded from <http://commons.apache.org/beanutils/>
 
 Copyright:
 
Index: commons-csv/debian/control
===================================================================
--- commons-csv/debian/control	(revision 8412)
+++ commons-csv/debian/control	(working copy)
@@ -9,7 +9,7 @@
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-csv
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-csv
-Homepage: http://jakarta.apache.org/commons/sandbox/csv/
+Homepage: http://commons.apache.org/sandbox/csv/
 
 Package: libcommons-csv-java
 Architecture: all
Index: commons-daemon/debian/control
===================================================================
--- commons-daemon/debian/control	(revision 8412)
+++ commons-daemon/debian/control	(working copy)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5), autoconf, autotools-dev, java-gcj-compat-dev, xsltproc, docbook-xsl, ant
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.7.3
-Homepage: http://jakarta.apache.org/commons/daemon/
+Homepage: http://commons.apache.org/daemon/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/
 
@@ -16,7 +16,7 @@
 Suggests: java-virtual-machine
 Recommends: jsvc
 Description: library to launch Java applications as daemons
- The Daemon package from Jakarta Commons can be used to implement Java
+ The Daemon package from Apache Commons can be used to implement Java
  applications which can be launched as daemons. For example the
  program will be notified about a shutdown so that it can perform
  cleanup tasks before its process of execution is destroyed by the
Index: commons-daemon/debian/copyright
===================================================================
--- commons-daemon/debian/copyright	(revision 8412)
+++ commons-daemon/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Sam, 09 Oct 2004 17:46:48 +0200.
 
-It was downloaded from <http://jakarta.apache.org/commons/daemon>.
+It was downloaded from <http://commons.apache.org/daemon>.
 
 Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk, Remy
 Maucherat, Pier Fumagalli, Yoav Shapira.
Index: commons-daemon/debian/watch
===================================================================
--- commons-daemon/debian/watch	(revision 8412)
+++ commons-daemon/debian/watch	(working copy)
@@ -1,3 +1,3 @@
 version=3
 opts="dversionmangle=s/1.0.2\~svn.*$/1.0.1/" \
-http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-(.*)\.tar\.gz
+http://www.apache.org/dist/commons/daemon/source/daemon-(.*)\.tar\.gz
Index: commons-io/debian/watch
===================================================================
--- commons-io/debian/watch	(revision 8412)
+++ commons-io/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/jakarta/commons/io/source/commons-io-(.*)-src\.tar\.gz debian debian/orig-tar.sh
+http://www.apache.org/dist/commons/io/source/commons-io-(.*)-src\.tar\.gz debian debian/orig-tar.sh
Index: commons-pool/commons-pool/debian/control
===================================================================
--- commons-pool/commons-pool/debian/control	(revision 8412)
+++ commons-pool/commons-pool/debian/control	(working copy)
@@ -18,4 +18,4 @@
   2. A toolkit for creating modular object pools.
   3. Several general purpose pool implementations.
  .
-  Homepage: http://jakarta.apache.org/commons/pool/
+  Homepage: http://commons.apache.org/pool/
Index: commons-pool/commons-pool/debian/copyright
===================================================================
--- commons-pool/commons-pool/debian/copyright	(revision 8412)
+++ commons-pool/commons-pool/debian/copyright	(working copy)
@@ -4,7 +4,7 @@
 It is currently maintained by the Debian Java Maintainers
 <pkg-java-maintainers at lists.alioth.debian.org>.
 
-The source was downloaded from <http://jakarta.apache.org/commons/pool/>.
+The source was downloaded from <http://commons.apache.org/pool/>.
 
 Upstream authors: Craig McClanahan, David Weinrich, Dirk Verbeeck,
 Geir Magnusson, Morgan Delagrange, Robert Burrell Donkin, Rodney
Index: commons-pool/commons-pool/debian/watch
===================================================================
--- commons-pool/commons-pool/debian/watch	(revision 8412)
+++ commons-pool/commons-pool/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-(.*)-src.tar.gz
+http://www.apache.org/dist/commons/pool/source/commons-pool-(.*)-src.tar.gz
Index: libcommons-cli-java/debian/copyright
===================================================================
--- libcommons-cli-java/debian/copyright	(revision 8412)
+++ libcommons-cli-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Mon, 27 Oct 2003 15:07:08 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/cli
+It was downloaded from http://commons.apache.org/cli
 
 Upstream Author: Bob McWirther, Peter Donald, John Keyes
 
Index: libcommons-cli-java/debian/watch
===================================================================
--- libcommons-cli-java/debian/watch	(revision 8412)
+++ libcommons-cli-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/jakarta/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-codec-java/debian/control
===================================================================
--- libcommons-codec-java/debian/control	(revision 8412)
+++ libcommons-codec-java/debian/control	(working copy)
@@ -15,5 +15,5 @@
  used encoders and decoders, the codec package also maintains a
  collection of phonetic encoding utilities.
  .
- This is a part of the Apache Jakarta Project.
- Home: <http://jakarta.apache.org/commons/codec/>
+ This is a part of the Apache Commons Project.
+ Home: <http://commons.apache.org/codec/>
Index: libcommons-codec-java/debian/copyright
===================================================================
--- libcommons-codec-java/debian/copyright	(revision 8412)
+++ libcommons-codec-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Thu, 19 Aug 2004 13:26:48 +0200
 
-It was downloaded from http://jakarta.apache.org/commons/codec/
+It was downloaded from http://commons.apache.org/codec/
 
 Upstream Authors: Henri Yandell <bayard at generationjava.com>, Tim OBrien
                   <tobrien at apache.org>, Scott Sanders
Index: libcommons-codec-java/debian/watch
===================================================================
--- libcommons-codec-java/debian/watch	(revision 8412)
+++ libcommons-codec-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=2
-http://www.apache.org/dist/jakarta/commons/codec/source/commons-codec-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/codec/source/commons-codec-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-collections-java/debian/copyright
===================================================================
--- libcommons-collections-java/debian/copyright	(revision 8412)
+++ libcommons-collections-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Mon,  5 Nov 2001 08:15:04 +0900.
 
-It was downloaded from http://jakarta.apache.org/commons/
+It was downloaded from http://commons.apache.org/collections/
 
 Upstream Authors: 
     Peter Donald
Index: libcommons-collections-java/debian/doc-base
===================================================================
--- libcommons-collections-java/debian/doc-base	(revision 8412)
+++ libcommons-collections-java/debian/doc-base	(working copy)
@@ -1,6 +1,6 @@
 Document: libcommons-collections-java
 Title: Programmer API for libcommons-collections-java
-Author: Apache Jakarta Developer Team
+Author: Apache Commons Developer Team
 Abstract: Javadocs programmer API of libcommons-collections-java, 
  a set of abstract data type interfaces and implementations.
 Section: Programming
Index: libcommons-collections3-java/debian/copyright
===================================================================
--- libcommons-collections3-java/debian/copyright	(revision 8412)
+++ libcommons-collections3-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Mon,  5 Nov 2001 08:15:04 +0900.
 
-It was downloaded from <http://jakarta.apache.org/commons/collections/>
+It was downloaded from <http://commons.apache.org/collections/>
 
 Upstream Authors: 
     Peter Donald
Index: libcommons-dbcp-java/debian/control
===================================================================
--- libcommons-dbcp-java/debian/control	(revision 8412)
+++ libcommons-dbcp-java/debian/control	(working copy)
@@ -22,5 +22,5 @@
   * Support for PreparedStatement pooling.
   * XML configuration.
  .
- This is a part of the Apache Jakarta Project.
- Home: <http://jakarta.apache.org/commons/dbcp/>
+ This is a part of the Apache Commons Project.
+ Home: <http://commons.apache.org/dbcp/>
Index: libcommons-dbcp-java/debian/copyright
===================================================================
--- libcommons-dbcp-java/debian/copyright	(revision 8412)
+++ libcommons-dbcp-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
 Sat,  5 Apr 2003 17:48:00 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/dbcp/
+It was downloaded from http://commons.apache.org/dbcp/
 
 Upstream Authors: See STATUS.html
   * Morgan Delagrange
Index: libcommons-dbcp-java/debian/watch
===================================================================
--- libcommons-dbcp-java/debian/watch	(revision 8412)
+++ libcommons-dbcp-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=3
-http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz
+http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz
Index: libcommons-digester-java/debian/copyright
===================================================================
--- libcommons-digester-java/debian/copyright	(revision 8412)
+++ libcommons-digester-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Mon,  5 Nov 2001 08:15:04 +0900.
 
-It was downloaded from <http://jakarta.apache.org/commons/digester/>
+It was downloaded from <http://commons.apache.org/digester/>
 
 Upstream Authors:	Peter Donald
 			Geir Magnusson Jr.
Index: libcommons-discovery-java/debian/copyright
===================================================================
--- libcommons-discovery-java/debian/copyright	(revision 8412)
+++ libcommons-discovery-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Fri, 12 Mar 2004 23:53:29 +0100.
 
-It was downloaded from http://jakarta.apache.org/commons/discovery/
+It was downloaded from http://commons.apache.org/discovery/
 
 Upstream Authors: Richard Sitze, Craig R. McClanahan, Costin
                   Manolache,  James Strachan <jstrachan at apache.org>,
Index: libcommons-el-java/debian/control
===================================================================
--- libcommons-el-java/debian/control	(revision 8412)
+++ libcommons-el-java/debian/control	(working copy)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>=5), cdbs
 Build-Depends-Indep: java-gcj-compat-dev, ant, junit (>= 3.8.1), libservlet2.4-java
 Standards-Version: 3.7.2
-Homepage: http://jakarta.apache.org/commons/el/
+Homepage: http://commons.apache.org/el/
 
 Package: libcommons-el-java
 Architecture: all
Index: libcommons-el-java/debian/copyright
===================================================================
--- libcommons-el-java/debian/copyright	(revision 8412)
+++ libcommons-el-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
 Tue,  1 Jul 2003 17:04:27 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/el
+It was downloaded from http://commons.apache.org/el
 
 Upstream Authors: Nathan Abramson <arista at alum.mit.edu>
                   Shawn Bayern <shawn at apache.org>
Index: libcommons-el-java/debian/watch
===================================================================
--- libcommons-el-java/debian/watch	(revision 8412)
+++ libcommons-el-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=2
-http://www.apache.org/dist/jakarta/commons/el/source/commons-el-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/el/source/commons-el-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-fileupload-java/debian/copyright
===================================================================
--- libcommons-fileupload-java/debian/copyright	(revision 8412)
+++ libcommons-fileupload-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
 Sun, 13 Apr 2003 18:45:44 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/fileupload/
+It was downloaded from http://commons.apache.org/fileupload/
 
 Upstream Authors: Martin Cooper <martin.cooper at tumbleweed.com>
                   dIon Gillard <dion at apache.org>
Index: libcommons-jexl-java/debian/control
===================================================================
--- libcommons-jexl-java/debian/control	(revision 8412)
+++ libcommons-jexl-java/debian/control	(working copy)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
 Build-Depends-Indep: default-jdk, ant, libcommons-logging-java, junit
 Standards-Version: 3.8.1
-Homepage: http://jakarta.apache.org/commons/jexl
+Homepage: http://commons.apache.org/jexl
 
 Package: libcommons-jexl-java
 Architecture: all
Index: libcommons-jexl-java/debian/copyright
===================================================================
--- libcommons-jexl-java/debian/copyright	(revision 8412)
+++ libcommons-jexl-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Mon, 27 Oct 2003 17:57:08 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/jexl
+It was downloaded from http://commons.apache.org/jexl
 
 Upstream Author: Geir Magnusson Jr. <geirm at apache.org>,
                     James Strachan <jstrachan at apache.org>,
Index: libcommons-jxpath-java/debian/control
===================================================================
--- libcommons-jxpath-java/debian/control	(revision 8412)
+++ libcommons-jxpath-java/debian/control	(working copy)
@@ -19,7 +19,7 @@
  One of the most important feature of the component is the
  unification of reference syntax between DOM and java. 
  . 
- Homepage: http://jakarta.apache.org/commons/
+ Homepage: http://commons.apache.org/jxpath/
 
 Package: libcommons-jxpath-java-doc
 Architecture: all
Index: libcommons-jxpath-java/debian/copyright
===================================================================
--- libcommons-jxpath-java/debian/copyright	(revision 8412)
+++ libcommons-jxpath-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Mon, 27 Oct 2003 17:57:08 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/
+It was downloaded from http://commons.apache.org/jxpath/
 
 Upstream Author: Dmitri Plotnikov <dmitri at apache.org>
 
Index: libcommons-jxpath-java/debian/watch
===================================================================
--- libcommons-jxpath-java/debian/watch	(revision 8412)
+++ libcommons-jxpath-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=2
-http://www.apache.org/dist/jakarta/commons/jxpath/source/commons-jxpath-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-lang-java/debian/control
===================================================================
--- libcommons-lang-java/debian/control	(revision 8412)
+++ libcommons-lang-java/debian/control	(working copy)
@@ -8,7 +8,7 @@
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java
-Homepage: http://jakarta.apache.org/commons/lang/
+Homepage: http://commons.apache.org/lang/
 
 Package: libcommons-lang-java
 Architecture: all
Index: libcommons-lang-java/debian/copyright
===================================================================
--- libcommons-lang-java/debian/copyright	(revision 8412)
+++ libcommons-lang-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
 Tue,  1 Jul 2003 14:43:32 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/lang/
+It was downloaded from http://commons.apache.org/lang/
 
 Upstream Authors:  Christopher Elkins <chrise at esha.com>,
                    Daniel Rall <dlr at collab.net>,
Index: libcommons-lang-java/debian/watch
===================================================================
--- libcommons-lang-java/debian/watch	(revision 8412)
+++ libcommons-lang-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=2
-http://www.apache.org/dist/jakarta/commons/lang/source/commons-lang-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/lang/source/commons-lang-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-launcher-java/debian/control
===================================================================
--- libcommons-launcher-java/debian/control	(revision 8412)
+++ libcommons-launcher-java/debian/control	(working copy)
@@ -35,5 +35,5 @@
     * You want to provide localized error messages which is very tricky
  to do in batch and shell scripts.
  .
- This is a part of the Apache Jakarta Project.
- Home: <http://jakarta.apache.org/commons/launcher/>
+ This is a part of the Apache Commons Project.
+ Home: <http://commons.apache.org/launcher/>
Index: libcommons-launcher-java/debian/copyright
===================================================================
--- libcommons-launcher-java/debian/copyright	(revision 8412)
+++ libcommons-launcher-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Fri, 13 May 2005 17:01:26 +0100.
 
-It was downloaded from http://jakarta.apache.org/commons/launcher
+It was downloaded from http://commons.apache.org/launcher
 
 Upstream Authors: Patrick Luby, Costin Manolache, Remy Maucherat,
                   Jean-Frederic Clere, Dirk Verbeeck
Index: libcommons-launcher-java/debian/watch
===================================================================
--- libcommons-launcher-java/debian/watch	(revision 8412)
+++ libcommons-launcher-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=2
-http://www.apache.org/dist/jakarta/commons/launcher/source/commons-launcher-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/launcher/source/commons-launcher-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-logging-java/debian/copyright
===================================================================
--- libcommons-logging-java/debian/copyright	(revision 8412)
+++ libcommons-logging-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Mon,  5 Nov 2001 08:15:04 +0900.
 
-It was downloaded from http://jakarta.apache.org/commons/
+It was downloaded from http://commons.apache.org/logging/
 
 Authors: The Apache Commons Logging Developers
 
Index: libcommons-logging-java/debian/watch
===================================================================
--- libcommons-logging-java/debian/watch	(revision 8412)
+++ libcommons-logging-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-modeler-java/debian/control
===================================================================
--- libcommons-modeler-java/debian/control	(revision 8412)
+++ libcommons-modeler-java/debian/control	(working copy)
@@ -7,7 +7,7 @@
 Build-Depends-Indep: java-gcj-compat-dev, libcommons-logging-java,
                      libcommons-digester-java, libmx4j-java, junit
 Standards-Version: 3.7.2
-Homepage: http://jakarta.apache.org/commons/modeler/
+Homepage: http://commons.apache.org/modeler/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-modeler-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-modeler-java/
 
@@ -18,7 +18,7 @@
          libmx4j-java, libcommons-logging-java, libcommons-digester-java
 Suggests: java-virtual-machine
 Description: convenience library to use Java Management Extensions (JMX)
- Commons Modeler from the Apache Jakarta project simplifies using the Java
+ Commons Modeler from the Apache Commons project simplifies using the Java
  Management Extensions (JMX). It provides the following services to
  application developers who wish to make their applications manageable via JMX:
   * Reads an XML-based description of the Model MBeans to be provided
@@ -33,7 +33,7 @@
 Architecture: all
 Suggests: libcommons-modeler-java
 Description: documentation and examples for Commons Modeler
- Commons Modeler from the Apache Jakarta project simplifies using the Java
+ Commons Modeler from the Apache Commons project simplifies using the Java
  Management Extensions (JMX).
  .
  This package contains the API Javadoc and examples.
Index: libcommons-modeler-java/debian/copyright
===================================================================
--- libcommons-modeler-java/debian/copyright	(revision 8412)
+++ libcommons-modeler-java/debian/copyright	(working copy)
@@ -4,7 +4,7 @@
 It is currently maintained by the Debian Java Maintainers
 <pkg-java-maintainers at lists.alioth.debian.org>.
 
-It was downloaded from <http://jakarta.apache.org/commons/modeler.html>.
+It was downloaded from <http://commons.apache.org/modeler>.
 
 Upstream Authors: Bill Barker, Costin Manolache, Craig R. McClanahan,
 Davanum Srinivas, Yoav Shapira
Index: libcommons-modeler-java/debian/watch
===================================================================
--- libcommons-modeler-java/debian/watch	(revision 8412)
+++ libcommons-modeler-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/jakarta/commons/modeler/source/commons-modeler-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/modeler/source/commons-modeler-(.*)-src\.tar\.gz debian uupdate
Index: libcommons-net-java/debian/control
===================================================================
--- libcommons-net-java/debian/control	(revision 8412)
+++ libcommons-net-java/debian/control	(working copy)
@@ -29,5 +29,5 @@
  expired, it is possible to make the source code freely available under
  the The Apache Software License.
  .
- This is a part of the Apache Jakarta Project.
- Home: <http://jakarta.apache.org/commons/net/>
+ This is a part of the Apache Commons Project.
+ Home: <http://commons.apache.org/net/>
Index: libcommons-net-java/debian/copyright
===================================================================
--- libcommons-net-java/debian/copyright	(revision 8412)
+++ libcommons-net-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 Tue, 11 May 2004 17:01:26 +0100.
 
-It was downloaded from http://jakarta.apache.org/commons/net/
+It was downloaded from http://commons.apache.org/net/
 
 Upstream Authors: Jeffrey D. Brekke <Jeff.Brekke at qg.com>, Steve Cohen
                   <scohen at apache.org>, Bruno D'Avanzo
Index: libcommons-net-java/debian/doc-base
===================================================================
--- libcommons-net-java/debian/doc-base	(revision 8412)
+++ libcommons-net-java/debian/doc-base	(working copy)
@@ -1,7 +1,7 @@
 Document: libcommons-net-java
 Title: Programmer API for Commons Net
 Author: Apache Commons Net developers
-Abstract: Jakarta Commons Net implements the client side of many basic
+Abstract: Apache Commons Net implements the client side of many basic
  Internet protocols.
 Section: Programming
 
Index: libcommons-net-java/debian/watch
===================================================================
--- libcommons-net-java/debian/watch	(revision 8412)
+++ libcommons-net-java/debian/watch	(working copy)
@@ -1,2 +1,2 @@
 version=2
-http://www.apache.org/dist/jakarta/commons/net/source/commons-net-([0-9\.]*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/commons/net/source/commons-net-([0-9\.]*)-src\.tar\.gz debian uupdate
Index: libcommons-openpgp-java/debian/control
===================================================================
--- libcommons-openpgp-java/debian/control	(revision 8412)
+++ libcommons-openpgp-java/debian/control	(working copy)
@@ -25,7 +25,7 @@
  OpenPGP from these tools. Currently, Maven uses it in its development
  version to sign libraries released to the repository.
  .
-  Homepage: http://jakarta.apache.org/commons/sandbox/openpgp/
+  Homepage: http://commons.apache.org/sandbox/openpgp/
 
 Package: libcommons-openpgp-java-doc
 Architecture: all
@@ -43,4 +43,4 @@
  .
  This package contains the API documentation for libcommons-openpgp-java
  .
-  Homepage: http://jakarta.apache.org/commons/sandbox/openpgp/
+  Homepage: http://commons.apache.org/sandbox/openpgp/
Index: libcommons-openpgp-java/debian/copyright
===================================================================
--- libcommons-openpgp-java/debian/copyright	(revision 8412)
+++ libcommons-openpgp-java/debian/copyright	(working copy)
@@ -7,7 +7,7 @@
 '/usr/share/common-licenses/GPL-2'.
 
 
-openpgp was downloaded from http://jakarta.apache.org/commons/sandbox/openpgp/
+openpgp was downloaded from http://commons.apache.org/sandbox/openpgp/
 
 Upstream Authors:  
 	Brett Porter 	brett at apache.org
Index: libcommons-openpgp-java/debian/rules
===================================================================
--- libcommons-openpgp-java/debian/rules	(revision 8412)
+++ libcommons-openpgp-java/debian/rules	(working copy)
@@ -18,7 +18,7 @@
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/doc/api
-SVN                  := http://svn.apache.org/repos/asf/jakarta/commons/sandbox/openpgp/trunk/
+SVN                  := http://svn.apache.org/repos/asf/commons/sandbox/openpgp/trunk/
 REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
 
 
Index: libcommons-validator-java/debian/control
===================================================================
--- libcommons-validator-java/debian/control	(revision 8412)
+++ libcommons-validator-java/debian/control	(working copy)
@@ -8,7 +8,7 @@
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-validator-java
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-validator-java
-Homepage: http://jakarta.apache.org/commons/validator/
+Homepage: http://commons.apache.org/validator/
 
 Package: libcommons-validator-java
 Architecture: all
@@ -21,4 +21,4 @@
  Validation rules can be defined in an xml file which
  keeps them abstracted from JavaBean you are validating.
  .
- This is a part of the Apache Jakarta Project.
+ This is a part of the Apache Commons Project.
Index: libcommons-validator-java/debian/copyright
===================================================================
--- libcommons-validator-java/debian/copyright	(revision 8412)
+++ libcommons-validator-java/debian/copyright	(working copy)
@@ -1,7 +1,7 @@
 This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
 Mon, 30 Jun 2003 15:32:07 +0200.
 
-It was downloaded from http://jakarta.apache.org/commons/validator/
+It was downloaded from http://commons.apache.org/validator/
 
 Upstream Authors:  David Winterfeldt <dwinterfeldt at apache.org>,
                    Craig McClanahan <craigmcc at apache.org>,
Index: libcommons-validator-java/debian/watch
===================================================================
--- libcommons-validator-java/debian/watch	(revision 8412)
+++ libcommons-validator-java/debian/watch	(working copy)
@@ -1,3 +1,3 @@
 version=3
-http://www.apache.org/dist/jakarta/commons/validator/source/ \
+http://www.apache.org/dist/commons/validator/source/ \
      commons-validator-(.*)-src\.tar\.gz debian debian/orig-tar.sh
Index: libjamon-java/debian/control
===================================================================
--- libjamon-java/debian/control	(revision 8412)
+++ libjamon-java/debian/control	(working copy)
@@ -6,7 +6,7 @@
 Build-Depends: ant, cdbs, debhelper (>= 5), glassfish-javaee,
  java-gcj-compat-dev, jetty, libservlet2.4-java
 Standards-Version: 3.7.3
-Homepage: http://jakarta.apache.org/commons/attributes/
+Homepage: http://commons.apache.org/attributes/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjamon-java/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjamon-java
 
Index: libslf4j-java/debian/control
===================================================================
--- libslf4j-java/debian/control	(revision 8412)
+++ libslf4j-java/debian/control	(working copy)
@@ -19,8 +19,8 @@
  The Simple Logging Facade for Java (or SLF4J) is intended to serve as
  a simple facade for various logging APIs allowing to the end-user to
  plug in the desired implementation at deployment time. SLF4J also
- allows for a gradual migration path away from Jakarta Commons
- Logging (JCL)
+ allows for a gradual migration path away from Apache Commons
+ Logging (CL)
  .
  Logging API implementations can either choose to implement the SLF4J
  interfaces directly, e.g. logback or SimpleLogger. Alternatively, it
Index: libstruts1.2-java/debian/control
===================================================================
--- libstruts1.2-java/debian/control	(revision 8412)
+++ libstruts1.2-java/debian/control	(working copy)
@@ -14,7 +14,7 @@
 Description: Java Framework for MVC web applications
  The core of the Struts framework is a flexible control layer based on standard
  technologies like Servlets, JavaBeans, ResourceBundles, and Extensible
- Markup Language (XML), as well as various Jakarta Commons packages. Struts
+ Markup Language (XML), as well as various Apache Commons packages. Struts
  encourages application architectures based on the Model 2 approach, a
  variation of the classic Model-View-Controller (MVC) design paradigm.
  .
Index: libstruts1.2-java/debian/copyright
===================================================================
--- libstruts1.2-java/debian/copyright	(revision 8412)
+++ libstruts1.2-java/debian/copyright	(working copy)
@@ -1,6 +1,6 @@
 This package was debianized by Stefan Gybas <sgybas at debian.org> on 01-Jul-2003.
 The source code was downloaded from
-<http://www.apache.org/dist/jakarta/struts/source/>. 
+<http://www.apache.org/dist/struts/source/>. 
 
 Copyright (BSD-style license):
 
Index: libstruts1.3-java/debian/control
===================================================================
--- libstruts1.3-java/debian/control	(revision 8412)
+++ libstruts1.3-java/debian/control	(working copy)
@@ -14,7 +14,7 @@
 Description: Java Framework for MVC web applications
  The core of the Struts framework is a flexible control layer based on standard
  technologies like Servlets, JavaBeans, ResourceBundles, and Extensible
- Markup Language (XML), as well as various Jakarta Commons packages. Struts
+ Markup Language (XML), as well as various Apache Commons packages. Struts
  encourages application architectures based on the Model 2 approach, a
  variation of the classic Model-View-Controller (MVC) design paradigm.
  .
Index: libstruts1.3-java/debian/copyright
===================================================================
--- libstruts1.3-java/debian/copyright	(revision 8412)
+++ libstruts1.3-java/debian/copyright	(working copy)
@@ -1,6 +1,6 @@
 This package was debianized by Stefan Gybas <sgybas at debian.org> on 01-Jul-2003.
 The source code was downloaded from
-<http://www.apache.org/dist/jakarta/struts/source/>. 
+<http://www.apache.org/dist/struts/source/>. 
 
 Copyright (BSD-style license):
 
Index: rssowl/debian/copyright
===================================================================
--- rssowl/debian/copyright	(revision 8412)
+++ rssowl/debian/copyright	(working copy)
@@ -49,9 +49,9 @@
   - Apache Xerces: Apache Software License ver. 1.1 (http://www.opensource.org/licenses/apachepl.php)
   - BlowfishJ: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
   - iText: Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html)
-  - Apache Jakarta Commons Codec:  Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
-  - Apache Jakarta Commons Logging: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
-  - Apache Jakarta Commons HTTPClient: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
+  - Apache Commons Codec:  Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
+  - Apache Commons Logging: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
+  - Apache HTTPClient: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php)
 
 RSSOwl is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
 without even the implied waranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
Index: velocity/debian/copyright
===================================================================
--- velocity/debian/copyright	(revision 8412)
+++ velocity/debian/copyright	(working copy)
@@ -3,7 +3,7 @@
 the license to the Apache Software License, Version 2.0 was debianized
 by Wolfgang Baer <WBaer at gmx.de> on Sun, 20 Mar 2005 13:59:13 +0100.
 
-It was downloaded from <http://jakarta.apache.org/velocity>
+It was downloaded from <http://velocity.apache.org>
 
 Upstream Authors:	Jason van Zyl 	jvanzyl at periapt.com
 			Jon S. Stevens  jon at latchkey.com


More information about the fedora-devel-java-list mailing list