[pkg-java] r8928 - trunk/ant/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-07 22:00:26 +0000 (Tue, 07 Jul 2009)
New Revision: 8928

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
Log:
* Merge with latest version from Ubuntu

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2009-07-07 21:50:47 UTC (rev 8927)
+++ trunk/ant/debian/changelog	2009-07-07 22:00:26 UTC (rev 8928)
@@ -14,6 +14,10 @@
     Maven repository
   * Remove the full text of the Apache 2.0 license
 
+  [Colin Watson]
+  * Drop JDK recommendation to a Suggests to make it feasible to fit ant on
+    the server CD (thanks, Thierry Carrez; LP: #389470).
+
   [Richard A. Johnson]
   * Added 11_ant_underscore_dash_fix.patch fixes - to _ conversion LP: #296409
 

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2009-07-07 21:50:47 UTC (rev 8927)
+++ trunk/ant/debian/control	2009-07-07 22:00:26 UTC (rev 8928)
@@ -14,8 +14,8 @@
 Architecture: all
 Priority: optional
 Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libxerces2-java
-Recommends: ant-optional, default-jdk | java-compiler | java-sdk
-Suggests: ant-doc, ant-gcj 
+Recommends: ant-optional, ant-gcj
+Suggests: default-jdk | java-compiler | java-sdk, ant-doc
 Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
 Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
 Description: Java based build tool like make