[pkg-java] r10756 - trunk/libjgraphx-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-10-03 18:15:16 +0000 (Sat, 03 Oct 2009)
New Revision: 10756

Modified:
   trunk/libjgraphx-java/debian/changelog
   trunk/libjgraphx-java/debian/control
   trunk/libjgraphx-java/debian/rules
Log:
libjgraphx-java (1.0.2.4-2) unstable; urgency=low

  * default-jdk-builddep changed to default-jdk
  * JAVA_HOME_DIRS changed to /usr/lib/jvm/default-java
    Thanks to Michael Koch for the comments

 -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 29 Sep 2009 16:37:09 +0200



Modified: trunk/libjgraphx-java/debian/changelog
===================================================================
--- trunk/libjgraphx-java/debian/changelog	2009-10-03 18:09:29 UTC (rev 10755)
+++ trunk/libjgraphx-java/debian/changelog	2009-10-03 18:15:16 UTC (rev 10756)
@@ -1,3 +1,11 @@
+libjgraphx-java (1.0.2.4-2) unstable; urgency=low
+
+  * default-jdk-builddep changed to default-jdk
+  * JAVA_HOME_DIRS changed to /usr/lib/jvm/default-java
+    Thanks to Michael Koch for the comments
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 29 Sep 2009 16:37:09 +0200
+
 libjgraphx-java (1.0.2.4-1) unstable; urgency=low
 
   * Initial Release (Closes: #548872)

Modified: trunk/libjgraphx-java/debian/control
===================================================================
--- trunk/libjgraphx-java/debian/control	2009-10-03 18:09:29 UTC (rev 10755)
+++ trunk/libjgraphx-java/debian/control	2009-10-03 18:15:16 UTC (rev 10756)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk-builddep
+Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgraphx-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjgraphx-java

Modified: trunk/libjgraphx-java/debian/rules
===================================================================
--- trunk/libjgraphx-java/debian/rules	2009-10-03 18:09:29 UTC (rev 10755)
+++ trunk/libjgraphx-java/debian/rules	2009-10-03 18:15:16 UTC (rev 10756)
@@ -5,10 +5,9 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk \
-	/usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun
 DEB_ANT_BUILD_TARGET := build doc example
 BUILDDIR := lib
+JAVA_HOME := /usr/lib/jvm/default-java
 
 install/libjgraphx-java::
 	install -m 644 -D $(BUILDDIR)/jgraphx.jar debian/libjgraphx-java/usr/share/java/jgraphx-$(DEB_UPSTREAM_VERSION).jar