diff -u tuxguitar-1.1/debian/control tuxguitar-1.1/debian/control
--- tuxguitar-1.1/debian/control
+++ tuxguitar-1.1/debian/control
@@ -1,7 +1,8 @@
 Source: tuxguitar
 Section: sound
 Priority: optional
-Maintainer: Philippe Coval <rzr@gna.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Philippe Coval <rzr@gna.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 5.0.0), docbook-to-man, docbook-utils, ant, default-jdk | java2-compiler, libswt-gtk-3.4-java, libitext-java, libasound2-dev, libfluidsynth-dev
 Standards-Version: 3.8.1
@@ -12,9 +13,9 @@
 Package: tuxguitar
 Architecture: all
 Section: sound
-Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3.4-java, libswt-cairo-gtk-3.4-jni , libswt-mozilla-gtk-3.4-jni, xulrunner-1.9
-Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version})
-Suggests: tuxguitar-jsa (= ${source:Version}), lilypond
+Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3.4-java, libswt-cairo-gtk-3.4-jni , libswt-mozilla-gtk-3.4-jni, xulrunner-1.9.1
+Recommends: tuxguitar-jsa (= ${source:Version})
+Suggests: lilypond
 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 -u tuxguitar-1.1/debian/changelog tuxguitar-1.1/debian/changelog
--- tuxguitar-1.1/debian/changelog
+++ tuxguitar-1.1/debian/changelog
@@ -1,3 +1,11 @@
+tuxguitar (1.1-1ubuntu1) jaunty; urgency=low
+
+  * Use Java Sound API and Gervill by default (LP: #311319)
+  * Changed maintainer to MOTU developers
+  * Depend on xulrunner 1.9.1 instead of 1.9 (LP: #424727)
+
+ -- Teemu Heinämäki <teemu.heinamaki@gmail.com>  Wed, 5 Sep 2009 11:39:51 +0300
+
 tuxguitar (1.1-1) unstable; urgency=low
 
   * New Upstream Release (Closes: #489859) (LP: #366476)
diff -u tuxguitar-1.1/misc/tuxguitar.sh tuxguitar-1.1/misc/tuxguitar.sh
--- tuxguitar-1.1/misc/tuxguitar.sh
+++ tuxguitar-1.1/misc/tuxguitar.sh
@@ -89,9 +89,7 @@
     test -r "$t/libxpcom.so" && d="$t"
     t="/usr/lib/xulrunner"
     test -r "$t/libxpcom.so" && d="$t"
-    t="/usr/lib/xulrunner-1.9"
-    test -r "$t/libxpcom.so" && d="$t"
-    t="`dpkg -L xulrunner-1.9 |grep libxpcom.so|cut -d '/' -f-4`"
+    t="/usr/lib/xulrunner-`xulrunner-1.9.1 --gre-version`"
     test -r "$t/libxpcom.so" && d="$t"
     echo "$d"
 }
only in patch2:
unchanged:
--- tuxguitar-1.1.orig/TuxGuitar/dist/config.dist
+++ tuxguitar-1.1/TuxGuitar/dist/config.dist
@@ -1,7 +1,7 @@
 skin=Lavender
-midi.port=Java Sound Synthesizer
+midi.port=Gervill
 midi.sequencer=Real Time Sequencer
 
 
 ## Needed for MacOs releases
-#painter.force-os-defaults=true
\ No newline at end of file
+#painter.force-os-defaults=true