[pkg-java] r11047 - trunk/javassist/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2009-11-10 12:29:24 +0000 (Tue, 10 Nov 2009)
New Revision: 11047

Modified:
   trunk/javassist/debian/changelog
   trunk/javassist/debian/control
   trunk/javassist/debian/rules
Log:
* debian/control: Runtime depend on java5-runtime-headless since java5 code
  is generated
* debian/control, debian/rules: Build-depend on default-jdk

Modified: trunk/javassist/debian/changelog
===================================================================
--- trunk/javassist/debian/changelog	2009-11-10 11:09:21 UTC (rev 11046)
+++ trunk/javassist/debian/changelog	2009-11-10 12:29:24 UTC (rev 11047)
@@ -1,3 +1,11 @@
+javassist (1:3.11-2) UNRELEASED; urgency=low
+
+  * debian/control: Runtime depend on java5-runtime-headless since java5 code
+    is generated
+  * debian/control, debian/rules: Build-depend on default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 10 Nov 2009 12:13:44 +0100
+
 javassist (1:3.11-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/javassist/debian/control
===================================================================
--- trunk/javassist/debian/control	2009-11-10 11:09:21 UTC (rev 11046)
+++ trunk/javassist/debian/control	2009-11-10 12:29:24 UTC (rev 11047)
@@ -5,7 +5,7 @@
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Varun Hiremath <varun at debian.org>,
  Torsten Werner <twerner at debian.org>, Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 6), cdbs
-Build-Depends-Indep: ant, openjdk-6-jdk
+Build-Depends-Indep: ant, default-jdk
 Standards-Version: 3.8.3
 Homepage: http://www.csg.is.titech.ac.jp/~chiba/javassist/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javassist
@@ -13,7 +13,7 @@
 
 Package: libjavassist-java
 Architecture: all
-Depends: openjdk-6-jre | java1-runtime | java2-runtime, ${misc:Depends}
+Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
 Description: library for editing bytecodes in Java
  This library makes Java bytecode manipulation simple. It enables Java
  programs to define a new class at runtime and to modify a class file

Modified: trunk/javassist/debian/rules
===================================================================
--- trunk/javassist/debian/rules	2009-11-10 11:09:21 UTC (rev 11046)
+++ trunk/javassist/debian/rules	2009-11-10 12:29:24 UTC (rev 11047)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-6-openjdk
+JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= jar javadocs
 ANT_OPTS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5