diff -Nru tuxguitar-0.9.1/debian/changelog tuxguitar-0.9.1/debian/changelog
--- tuxguitar-0.9.1/debian/changelog	2008-04-05 21:27:56.000000000 +0300
+++ tuxguitar-0.9.1/debian/changelog	2008-04-05 21:27:56.000000000 +0300
@@ -1,3 +1,11 @@
+tuxguitar (0.9.1-4ubuntu2) hardy; urgency=low
+
+  * debian/control: made openjdk our preferred java interpreter
+  * debian/control: removed java2-runtime from dependencies
+  * debian/rules: added support for openjdk
+
+ -- Teemu Heinämäki (Hippu) <teemu.heinamaki@gmail.com>  Sat, 05 Apr 2008 19:16:25 +0300
+
 tuxguitar (0.9.1-4ubuntu1) hardy; urgency=low
 
   * Put .desktop to right category (LP: #197367)
diff -Nru /tmp/2CzkDXgQSo/tuxguitar-0.9.1/debian/control /tmp/TFwtpBVh47/tuxguitar-0.9.1/debian/control
--- tuxguitar-0.9.1/debian/control	2008-04-05 21:27:56.000000000 +0300
+++ tuxguitar-0.9.1/debian/control	2008-04-05 21:27:56.000000000 +0300
@@ -5,14 +5,14 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: sun-java6-jdk | java2-compiler, libswt3.2-gtk-java, libitext-java, docbook-to-man , docbook-utils 
+Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk, libswt3.2-gtk-java, libitext-java, docbook-to-man , docbook-utils 
 Standards-Version: 3.7.3
 Homepage: http://www.tuxguitar.com.ar 
 
 Package: tuxguitar
 Architecture: all
 Section: contrib/sound
-Depends: sun-java6-jre | java2-runtime, libswt3.2-gtk-java, libitext-java
+Depends: openjdk-6-jre | sun-java6-jre, libswt3.2-gtk-java, libitext-java
 Description: Multitrack guitar tablature editor and player (gp3 to gp5)
  TuxGuitar is a multitrack Guitar tablature editor and player.
  It can open GP3, GP4, and GP5 files and exports in MIDI and PDF.
diff -Nru /tmp/2CzkDXgQSo/tuxguitar-0.9.1/debian/rules /tmp/TFwtpBVh47/tuxguitar-0.9.1/debian/rules
--- tuxguitar-0.9.1/debian/rules	2008-04-05 21:27:56.000000000 +0300
+++ tuxguitar-0.9.1/debian/rules	2008-04-05 21:27:56.000000000 +0300
@@ -9,7 +9,7 @@
 
 JAVA_HOME?=$(shell echo \
  `( t=/usr/lib/jvm/java-6-sun && test -d $$t && echo $$t ) \
- || ( t=/usr/lib/jvm/java-1.5.0-sun && test -d $$t && echo $$t )` \
+ || ( t=/usr/lib/jvm/java-6-openjdk && test -d $$t && echo $$t )` \
 )
 
 JAVA?=${JAVA_HOME}/jre/bin/java