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

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2007-06-02 16:45:36 +0000 (Sat, 02 Jun 2007)
New Revision: 3566

Modified:
   trunk/ant/debian/build.xml.5
   trunk/ant/debian/changelog
   trunk/ant/debian/control
Log:
fixed the buid.xml.5 manpage and commit correction from the last upload

Modified: trunk/ant/debian/build.xml.5
===================================================================
--- trunk/ant/debian/build.xml.5	2007-06-02 13:09:44 UTC (rev 3565)
+++ trunk/ant/debian/build.xml.5	2007-06-02 16:45:36 UTC (rev 3566)
@@ -20,7 +20,7 @@
 <project default="compile">
   
   <target name="compile">
-    <javac srcdir="src">
+    <javac srcdir="src"/>
   </target>
 
 </project>

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2007-06-02 13:09:44 UTC (rev 3565)
+++ trunk/ant/debian/changelog	2007-06-02 16:45:36 UTC (rev 3566)
@@ -1,3 +1,21 @@
+ant (1.6.5-8) UNRELEASED; urgency=low
+
+  Arnaud Vandyck:
+  * debian/build.xml.5: correction of an exemple, thanks to LI Daobing
+    (closes: #426345)
+
+ --
+
+ant (1.6.5-7) unstable; urgency=low
+
+  * debian/control: depends on java-gcj-compat-dev as it needs the
+    tools.jar file (closes: #397045). So it does not recommends jikes |
+    java-compiler no more.
+  * debian/control: ant-optional does not depend on a virtual machine
+    because it depends on ant.
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon,  6 Nov 2006 13:21:52 +0100
+
 ant (1.6.5-6) unstable; urgency=low
 
   * debian/patches/03_SplashTaskPatch_a.patch: Fixed to apply the new file

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2007-06-02 13:09:44 UTC (rev 3565)
+++ trunk/ant/debian/control	2007-06-02 16:45:36 UTC (rev 3566)
@@ -11,8 +11,8 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: java-gcj-compat | java-virtual-machine, java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java
-Recommends: ant-optional, jikes | java-compiler
+Depends: java-gcj-compat-dev | java-virtual-machine, java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java
+Recommends: ant-optional
 Suggests: ant-doc 
 Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
 Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
@@ -27,7 +27,7 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: java-gcj-compat | java1-runtime | java2-runtime, ant (= ${Source-Version})
+Depends: ant (= ${Source-Version})
 Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
 Conflicts: libant1.6-java
 Replaces: libant1.6-java