[pkg-java] r12333 - trunk/ow-util-ant-tasks/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-07 22:00:15 +0000 (Fri, 07 May 2010)
New Revision: 12333

Modified:
   trunk/ow-util-ant-tasks/debian/changelog
   trunk/ow-util-ant-tasks/debian/control
   trunk/ow-util-ant-tasks/debian/rules
Log:
* debian/control, debian/rules: Build with default-jdk. Added libasm2-java
  as a build dependency as OpenJDK doesn't provide ASM classes.
* debian/control: Depend on default-jre-headless | java2-runtime-headless
* debian/control: Set section to java

Modified: trunk/ow-util-ant-tasks/debian/changelog
===================================================================
--- trunk/ow-util-ant-tasks/debian/changelog	2010-05-06 21:00:35 UTC (rev 12332)
+++ trunk/ow-util-ant-tasks/debian/changelog	2010-05-07 22:00:15 UTC (rev 12333)
@@ -1,3 +1,12 @@
+ow-util-ant-tasks (1.3.2-2ubuntu1) karmic; urgency=low
+
+  * debian/control, debian/rules: Build with default-jdk. Added libasm2-java
+    as a build dependency as OpenJDK doesn't provide ASM classes.
+  * debian/control: Depend on default-jre-headless | java2-runtime-headless
+  * debian/control: Set section to java
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Wed, 29 Jul 2009 11:18:36 +0200
+
 ow-util-ant-tasks (1.3.2-2) unstable; urgency=low
 
   * Make libow-util-ant-tasks-java an arch:all package.

Modified: trunk/ow-util-ant-tasks/debian/control
===================================================================
--- trunk/ow-util-ant-tasks/debian/control	2010-05-06 21:00:35 UTC (rev 12332)
+++ trunk/ow-util-ant-tasks/debian/control	2010-05-07 22:00:15 UTC (rev 12333)
@@ -1,15 +1,15 @@
 Source: ow-util-ant-tasks
-Section: libdevel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Barry Hawkins <barry at alltc.com>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.14)
-Build-Depends-Indep: java-gcj-compat-dev, ant (>= 1.7), junit, libxalan2-java
+Build-Depends-Indep: default-jdk, ant (>= 1.7), junit, libxalan2-java, libasm2-java
 Standards-Version: 3.7.2
 
 Package: libow-util-ant-tasks-java
 Architecture: all
-Depends: ant (>= 1.7), java-gcj-compat | java1-runtime | java2-runtime
+Depends: ant (>= 1.7), default-jre-headless | java2-runtime-headless
 Description: ObjectWeb utility Ant tasks library
  This library is used in the build process of several key frameworks
  developed by ObjectWeb, among them the ObjectWeb ASM bytecode manipulation

Modified: trunk/ow-util-ant-tasks/debian/rules
===================================================================
--- trunk/ow-util-ant-tasks/debian/rules	2010-05-06 21:00:35 UTC (rev 12332)
+++ trunk/ow-util-ant-tasks/debian/rules	2010-05-07 22:00:15 UTC (rev 12333)
@@ -14,7 +14,7 @@
 TEMPDIR=debian/libow-util-ant-tasks-java
 
 # Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/lib/jvm/java-gcj
+JAVA_HOME=/usr/lib/jvm/default-java
 
 # Set the invocation of the java command;
 JAVACMD=$(JAVA_HOME)/bin/java
@@ -24,7 +24,7 @@
 # class path) to ensure the same build results in all cases
 JAVA_LIB=/usr/share/java
 ANT_HOME=/usr/share/ant
-ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar:$(JAVA_HOME)/lib/tools.jar
+ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar:$(JAVA_LIB)/asm2.jar:$(JAVA_HOME)/lib/tools.jar
 
 # Set path to Ant properties file
 ANT_PROPS=debian/ant.properties