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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-04-29 21:54:37 +0000 (Tue, 29 Apr 2008)
New Revision: 6347

Modified:
   trunk/ant/debian/
   trunk/ant/debian/changelog
   trunk/ant/debian/control
   trunk/ant/debian/rules
Log:
* Build-Depends on default-jdk-builddep. Closes: #477844



Property changes on: trunk/ant/debian
___________________________________________________________________
Name: svn:ignore
   - ant
ant-doc
ant-gcj
ant-optional
ant-optional-gcj
files
stamp-*
*.debhelper
*.substvars

   + ant
ant-doc
ant-gcj
ant-optional
ant-optional-gcj
files
stamp-*
*.debhelper
*.debhelper.log
*.substvars


Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2008-04-29 21:54:11 UTC (rev 6346)
+++ trunk/ant/debian/changelog	2008-04-29 21:54:37 UTC (rev 6347)
@@ -1,8 +1,9 @@
-ant (1.7.0-6) UNRELEASED; urgency=low
+ant (1.7.0-6) unstable; urgency=low
 
   * Moved ant-bootstrap.jar to /usr/share/ant/etc/. Closes: #353586
+  * Build-Depends on default-jdk-builddep. Closes: #477844
 
- -- Michael Koch <konqueror at gmx.de>  Sun, 20 Apr 2008 07:48:47 +0200
+ -- Michael Koch <konqueror at gmx.de>  Tue, 29 Apr 2008 17:43:04 -0100
 
 ant (1.7.0-5) unstable; urgency=low
 

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2008-04-29 21:54:11 UTC (rev 6346)
+++ trunk/ant/debian/control	2008-04-29 21:54:37 UTC (rev 6347)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), java-gcj-compat-dev, libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), default-jdk-builddep, libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2008-04-29 21:54:11 UTC (rev 6346)
+++ trunk/ant/debian/rules	2008-04-29 21:54:37 UTC (rev 6347)
@@ -12,7 +12,7 @@
 endif
 
 # needs to be exported for direct ant call
-export JAVA_HOME := /usr/lib/jvm/java-gcj
+export JAVA_HOME := /usr/lib/jvm/default-java
 # needed for bootstrap.sh
 export JAVAC=$(JAVA_HOME)/bin/javac
 # needed for bootstrap