[pkg-java] r7069 - trunk/libnsuml-java/debian

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2008-09-30 07:48:29 +0000 (Tue, 30 Sep 2008)
New Revision: 7069

Modified:
   trunk/libnsuml-java/debian/changelog
   trunk/libnsuml-java/debian/control
   trunk/libnsuml-java/debian/rules
Log:
update dependency to libjdom1-java, replaced kaffe and jikes-kaffe with default-jdk-builddep; replaced java-runtime with java-virtual-machine; but it does not work at the moment

Modified: trunk/libnsuml-java/debian/changelog
===================================================================
--- trunk/libnsuml-java/debian/changelog	2008-09-29 21:33:42 UTC (rev 7068)
+++ trunk/libnsuml-java/debian/changelog	2008-09-30 07:48:29 UTC (rev 7069)
@@ -1,3 +1,11 @@
+libnsuml-java (0.4.20-13) UNRELEASE; urgency=medium
+
+  * Update dependency to libjdom1-java
+  * Replaced kaffe and jikes-kaffe with default-jdk-builddep
+  * Replaced java-runtime dependency with java-virtual-machine
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon, 29 Sep 2008 12:32:35 +0200
+
 libnsuml-java (0.4.20-12.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: trunk/libnsuml-java/debian/control
===================================================================
--- trunk/libnsuml-java/debian/control	2008-09-29 21:33:42 UTC (rev 7068)
+++ trunk/libnsuml-java/debian/control	2008-09-30 07:48:29 UTC (rev 7069)
@@ -3,13 +3,15 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.21), kaffe (>= 2:1.1.5), ant
-Build-Depends-Indep: jikes-kaffe (>= 2:1.1.5), libdtdparser-java (>= 1.21), libjdom0-java (>= 0.7b.20020216-3)
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.21), ant
+Build-Depends-Indep: default-jdk-builddep, libdtdparser-java (>= 1.21), libjdom1-java
 Standards-Version: 3.7.2
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjdom1-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjdom1-java
 
 Package: libnsuml-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime, libjdom0-java
+Depends: java-virtual-machine, libjdom1-java
 Description: Novosoft UML (Unified Modeling Language) library
  Library for UML 1.4 metamodel. It could be used for constructing applciations
  based on UML 1.4.

Modified: trunk/libnsuml-java/debian/rules
===================================================================
--- trunk/libnsuml-java/debian/rules	2008-09-29 21:33:42 UTC (rev 7068)
+++ trunk/libnsuml-java/debian/rules	2008-09-30 07:48:29 UTC (rev 7069)
@@ -10,10 +10,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME       := /usr/lib/kaffe
+JAVA_HOME	:= /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
-DEB_JARS             := dtdparser jdom0 $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_COMPILER     := jikes
+DEB_JARS             := dtdparser jdom1 ant ant-launcher.jar
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_CLEAN_TARGET := main
 ANT_OPTS := -Dversion=0.4.20