[SCM] omegat-plugin-tokenizer packaging branch, master, updated. 0d36c04db41b9813f6de84c02d47830f93c3febb

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit d070a0e9ad1566ff55dee112c8393416ef3d6ec4
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sat Oct 22 15:40:37 2011 -0430

    Switch to default-jdk
    
    * Team upload.
    * Switch to default-jdk. (Closes: #643539).
    * Add missing Build-Depends on liblucene2-java.

diff --git a/debian/changelog b/debian/changelog
index 89cb802..c4870de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+omegat-plugin-tokenizer (0.4.2+dfsg-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #643539).
+  * Add missing Build-Depends on liblucene2-java.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sat, 22 Oct 2011 15:24:14 -0430
+
 omegat-plugin-tokenizer (0.4.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #630492)
diff --git a/debian/control b/debian/control
index ab4f850..8204a53 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Tiago Saboga <tiagosaboga at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: openjdk-6-jdk, javahelper (>= 0.37), ant
+Build-Depends-Indep: default-jdk, javahelper (>= 0.37), ant, liblucene2-java
 Standards-Version: 3.9.2
 Homepage: http://omegat-plugins.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-java/omegat-plugin-tokenizer.git
diff --git a/debian/rules b/debian/rules
index d7a9cd8..8828d30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 export CLASSPATH=/usr/share/java/lucene-analyzers.jar:\
                  /usr/share/java/lucene-core.jar:\

-- 
omegat-plugin-tokenizer packaging