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

[Niels Thykier]

Author: nthykier-guest
Date: 2010-06-29 20:20:49 +0000 (Tue, 29 Jun 2010)
New Revision: 12699

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
Log:
default-jdk-builddep trainsition and bumped S-V.

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2010-06-29 19:37:04 UTC (rev 12698)
+++ trunk/ant/debian/changelog	2010-06-29 20:20:49 UTC (rev 12699)
@@ -1,3 +1,12 @@
+ant (1.8.0-5) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Replaced default-jdk-builddep with gcj-native-helper and default-jdk.
+  * Bumped Standards-Versions to 3.9.0.
+    - Reduced a Conflicts to a Breaks.
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 29 Jun 2010 22:17:51 +0200
+
 ant (1.8.0-4) unstable; urgency=low
 
   * Convert patches to dep3 format.

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2010-06-29 19:37:04 UTC (rev 12698)
+++ trunk/ant/debian/control	2010-06-29 20:20:49 UTC (rev 12699)
@@ -5,11 +5,11 @@
 Uploaders: Stefan Gybas <sgybas at debian.org>, Michael Koch <konqueror at gmx.de>,
  Matthias Klose <doko at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
  Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk-builddep, maven-repo-helper (>> 1.0),
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk, maven-repo-helper (>> 1.0),
  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, libjaxp1.3-java,
- libstylebook-java
+ libstylebook-java, gcj-native-helper
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant/
@@ -22,8 +22,9 @@
  java6-runtime-headless, libxerces2-java
 Recommends: ant-optional
 Suggests: default-jdk | java-compiler | java-sdk, ant-gcj, ant-doc
-Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
+Conflicts: libant1.6-java
 Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
+Breaks: ant-doc (<= 1.6.5-1)
 Description: Java based build tool like make
  A system independent (i.e. not shell based) build tool that uses XML
  files as "Makefiles". This package contains the scripts and the core