diff -Nru libjspeex-java-0.9.7/debian/changelog libjspeex-java-0.9.7/debian/changelog
--- libjspeex-java-0.9.7/debian/changelog	2011-10-17 14:12:37.000000000 +0000
+++ libjspeex-java-0.9.7/debian/changelog	2011-08-15 20:49:01.000000000 +0000
@@ -1,3 +1,14 @@
+libjspeex-java (0.9.7-3) unstable; urgency=low
+
+  * Switch to default-jdk.
+  * Switch to source format 3.0.
+  * Change Section: java.
+  * Clean up Depends.
+  * Update Standards-Version: 3.9.1.
+  * Enable tests.
+
+ -- Torsten Werner <twerner@debian.org>  Mon, 15 Aug 2011 22:41:04 +0200
+
 libjspeex-java (0.9.7-2) unstable; urgency=low
 
   * Move the package to pkg-java svn.
diff -Nru libjspeex-java-0.9.7/debian/control libjspeex-java-0.9.7/debian/control
--- libjspeex-java-0.9.7/debian/control	2011-10-17 14:12:37.000000000 +0000
+++ libjspeex-java-0.9.7/debian/control	2011-08-15 20:49:01.000000000 +0000
@@ -1,18 +1,18 @@
 Source: libjspeex-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun@debian.org>, Torsten Werner <twerner@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, junit, java-gcj-compat-dev
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: ant-optional, junit, default-jdk
+Standards-Version: 3.9.1
 Homepage: http://jspeex.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjspeex-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjspeex-java
 
 Package: libjspeex-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
 Description: Java Implementation of Speex
  JSpeex is a Java port of the Speex speech codec (Open Source/Free
  Software patent-free audio compression format designed for
diff -Nru libjspeex-java-0.9.7/debian/rules libjspeex-java-0.9.7/debian/rules
--- libjspeex-java-0.9.7/debian/rules	2011-10-17 14:12:37.000000000 +0000
+++ libjspeex-java-0.9.7/debian/rules	2011-08-15 20:49:01.000000000 +0000
@@ -2,10 +2,11 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_CHECK_TARGET := test
+DEB_JARS             := ant-junit junit
 
 install/libjspeex-java::
 	install -m 644 -D dist/jspeex.jar $(DEB_DESTDIR)/usr/share/java/jspeex-$(DEB_UPSTREAM_VERSION).jar
diff -Nru libjspeex-java-0.9.7/debian/source/format libjspeex-java-0.9.7/debian/source/format
--- libjspeex-java-0.9.7/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ libjspeex-java-0.9.7/debian/source/format	2011-10-17 14:12:37.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)