Sync libcommons-fileupload-java 1.2.1-5 (main) from Debian unstable (main)

[Thierry Carrez]

Please sync libcommons-fileupload-java 1.2.1-5 (main) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
I merged all delta back in Debian, as can be seen in the changelog.

Changelog entries since current maverick version 1.2.1-3ubuntu2:

libcommons-fileupload-java (1.2.1-5) unstable; urgency=low

  * (Build-)Depend on libservlet2.5-java instead of libservlet2.4-java

 -- Thierry Carrez <email address hidden> Fri, 11 Jun 2010 15:19:56 +0200

libcommons-fileupload-java (1.2.1-4) unstable; urgency=low

  [ Thierry Carrez ]
  * Minimal dependency on default-jre-headless | java2-runtime-headless
  * debian/ant.properties: Force Java2 code to match dependency

  [ Damien Raude-Morvan ]
  * Remove Arnaud from Uploaders.
  * Add myself to Uploaders.
  * Bump Standards-Version to 3.8.4: no changes needed
  * Bump debhelper to >= 7
  * Remove version criteria from cdbs B-D (even stable match version)
  * Enable portlet support:
   - Remove debian/patches/04_disable-portlet.patch
   - Add B-D-I on libportlet-api-2.0-spec-java
   - Remove debian/README.Debian
   (Closes: #577474)
  * Convert to source format 3.0 (quilt)
   - Refresh all patches
   - Add DEP3 headers to patches
  * Register in maven repository:
   - B-D-I on maven-repo-helper
   - Use mh_installpoms and mh_installjar

 -- Damien Raude-Morvan <email address hidden> Mon, 12 Apr 2010 12:42:16 +0200

[Jonathan Riddell (jr)]

2010-07-13 17:50:14 INFO libcommons-fileupload-java_1.2.1.orig.tar.gz: already in distro - downloading from librarian
2010-07-13 17:50:14 INFO - <libcommons-fileupload-java_1.2.1.orig.tar.gz: cached>
2010-07-13 17:50:14 INFO - <libcommons-fileupload-java_1.2.1-5.debian.tar.gz: downloading from http://ftp.debian.org/debian/>
[Updating] libcommons-fileupload-java (1.2.1-3ubuntu2 [Ubuntu] < 1.2.1-5 [Debian])
 * Trying to add libcommons-fileupload-java...
2010-07-13 17:50:15 INFO - <libcommons-fileupload-java_1.2.1-5.dsc: downloading from http://ftp.debian.org/debian/>
I: libcommons-fileupload-java [main] -> libcommons-fileupload-java_1.2.1-3ubuntu2 [main].