[pkg-java] r14952 - trunk/lucene2/debian

[Benjamin Drung]

Author: bdrung
Date: 2011-09-19 19:33:55 +0000 (Mon, 19 Sep 2011)
New Revision: 14952

Modified:
   trunk/lucene2/debian/control
   trunk/lucene2/debian/rules
Log:
Build with default-jdk instead of openjdk-6-jdk.

Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control	2011-09-19 19:30:43 UTC (rev 14951)
+++ trunk/lucene2/debian/control	2011-09-19 19:33:55 UTC (rev 14952)
@@ -14,10 +14,10 @@
                ant-optional (>= 1.8),
                cdbs (>= 0.4.49),
                debhelper (>= 6),
+               default-jdk,
                dpatch (>= 2.0),
                javacc,
-               junit,
-               openjdk-6-jdk
+               junit
 Build-Depends-Indep: libcommons-beanutils-java (>= 1.7.0),
                      libcommons-collections3-java (>= 3.1),
                      libcommons-compress-java (>= 1.0),

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2011-09-19 19:30:43 UTC (rev 14951)
+++ trunk/lucene2/debian/rules	2011-09-19 19:33:55 UTC (rev 14952)
@@ -10,8 +10,7 @@
 
 DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt
 
-# Build with OpenJDK
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
 DEB_ANT_CHECK_TARGET := test