[pkg-java] r9920 - trunk/libjdic-java/debian

[Varun Hiremath]

Author: varun
Date: 2009-08-10 07:56:49 +0000 (Mon, 10 Aug 2009)
New Revision: 9920

Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/control
   trunk/libjdic-java/debian/rules
Log:
* Move all Build-Depends-Indep to Build-Depends
* Set JAVA_HOME in debian/rules

Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2009-08-10 06:59:52 UTC (rev 9919)
+++ trunk/libjdic-java/debian/changelog	2009-08-10 07:56:49 UTC (rev 9920)
@@ -1,3 +1,10 @@
+libjdic-java (0.9.5-5) unstable; urgency=low
+
+  * Move all Build-Depends-Indep to Build-Depends
+  * Set JAVA_HOME in debian/rules
+
+ -- Varun Hiremath <varun at debian.org>  Mon, 10 Aug 2009 03:40:10 -0400
+
 libjdic-java (0.9.5-4) unstable; urgency=low
 
   * Add patches/Tray.diff to:

Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control	2009-08-10 06:59:52 UTC (rev 9919)
+++ trunk/libjdic-java/debian/control	2009-08-10 07:56:49 UTC (rev 9920)
@@ -5,8 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, ant, pkg-config,
  libgnome2-dev, libgtk2.0-dev, libxt-dev, xulrunner-dev, libx11-dev,
- openjdk-6-jre-headless
-Build-Depends-Indep: openjdk-6-jdk, libnetx-java
+ openjdk-6-jre-headless, openjdk-6-jdk, libnetx-java
 Standards-Version: 3.8.2
 Homepage: https://jdic.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjdic-java/

Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2009-08-10 06:59:52 UTC (rev 9919)
+++ trunk/libjdic-java/debian/rules	2009-08-10 07:56:49 UTC (rev 9920)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export GECKO_SDK=/usr/lib/xulrunner-devel-1.9
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -17,6 +18,7 @@
 
 common-binary-arch:: debian/stamp-binary-arch
 debian/stamp-binary-arch:
+	export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 	ant -f jdic/build.xml buildunixjni buildunixembed
 	touch $@