Merge lp:~james-page/ubuntu/oneiric/libstruts1.2-java/universe-housekeeping into lp:ubuntu/oneiric/libstruts1.2-java

[James Page]

[Matthias Klose (doko)]

thanks, looks fine

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-09 23:59:32 +0000
+++ debian/changelog	2011-09-09 14:30:33 +0000
@@ -1,3 +1,13 @@
+libstruts1.2-java (1.2.9-4ubuntu3) oneiric; urgency=low
+
+  * Update to support removal of libcommons-fileupload-java-universe from
+    archive (LP: #845541):
+    - debian/control: Drop references to libcommons-fileupload-java-universe.
+  * Switch back to using ant instead of ant1.7 as ant >= 1.8.2 
+    resolves FTBFS.
+
+ -- James Page <[e-mail]>  Fri, 09 Sep 2011 13:04:41 +0100
+
 libstruts1.2-java (1.2.9-4ubuntu2) natty; urgency=low
 
   * Build-depend on ant1.7 instead of ant.
 
=== modified file 'debian/control'
--- debian/control	2011-04-09 23:59:32 +0000
+++ debian/control	2011-09-09 14:30:33 +0000
@@ -1,16 +1,17 @@
 Source: libstruts1.2-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Arnaud Vandyck <[e-mail]>, Stefan Gybas <[e-mail]>, Michael Koch <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk, ant1.7, ant1.7-optional, libxerces2-java, libxalan2-java, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java-universe | libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java, antlr
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk, ant, ant-optional, libxerces2-java, libxalan2-java, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java, antlr
 Standards-Version: 3.8.4
 Homepage: http://struts.apache.org/
 
 Package: libstruts1.2-java
 Architecture: all
 Priority: optional
-Depends: ${misc:Depends}, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java-universe | libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java
+Depends: ${misc:Depends}, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java
 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