=== modified file 'debian/changelog'
--- debian/changelog	2013-05-19 23:36:33 +0000
+++ debian/changelog	2013-05-19 23:37:29 +0000
@@ -1,3 +1,15 @@
+java-atk-wrapper (0.30.4-4) UNRELEASED; urgency=low
+
+  * Merge with Ubuntu (Closes: #708985)
+    - debian/control:
+      - Depend on default-jre | java2-runtime
+    - Ensure backwards compatible bytecode is built (LP: #1049777):
+      + d/p/autoconf-enable-javacflags.patch: Update autoconf configuration
+        to support use of JAVACFLAGS during build process.
+      +  d/rules: Supply JAVACFLAGS to ensure source/target is set to 1.5. 
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 19 May 2013 18:42:08 -0400
+
 java-atk-wrapper (0.30.4-3) unstable; urgency=low
 
   * Document that accessibility is disabled by default in openjdk, how to

=== modified file 'debian/control'
--- debian/control	2013-05-19 23:36:33 +0000
+++ debian/control	2013-05-19 23:36:46 +0000
@@ -12,7 +12,7 @@
 Package: libatk-wrapper-java
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, default-jre | java2-runtime
 Recommends: libatk-wrapper-java-jni
 Description: ATK implementation for Java using JNI
  Java ATK Wrapper is an implementation of ATK by using JNI. It
@@ -23,7 +23,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libatk-wrapper-java (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, libatk-wrapper-java (>= ${source:Version})
 Description: ATK implementation for Java using JNI (JNI bindings)
  Java ATK Wrapper is an implementation of ATK by using JNI. It
  converts Java Swing events into ATK events, and send these events to

=== added file 'debian/patches/autoconf-enable-javacflags.patch'
--- debian/patches/autoconf-enable-javacflags.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/autoconf-enable-javacflags.patch	2013-05-19 23:36:46 +0000
@@ -0,0 +1,49 @@
+Description: Support use of JAVACFLAGS
+ This patch supports the use of JAVACFLAGS during the build
+ process and was specifically written to allow java-atk-wrapper
+ to be built with backwards compatible bytecode to support
+ use with both openjdk-6 and openjdk-7 in Ubuntu.
+Author: James Page <james.page@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1049777
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=684442
+
+---
+ configure.in                                |    4 +++-
+ wrapper/org/GNOME/Accessibility/Makefile.am |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ef9585b..953f272 100644
+--- a/configure.in
++++ b/configure.in
+@@ -78,6 +78,8 @@
+ fi
+ AC_SUBST(JAVAH)
+ 
++AC_SUBST(JAVACFLAGS)
++
+ AC_PATH_PROG(JAR,jar,,${JAVA_PATH})
+ if test -z "$JAR"; then
+   AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
+@@ -94,7 +96,7 @@
+ 	CUR_DIR=`pwd`
+ 	SRC_DIR=`dirname $0`
+ 	SRC_DIR=`cd $SRC_DIR;pwd;cd $CUR_DIR`
+-	$JAVAC $SRC_DIR/JavaInfo.java
++	$JAVAC $JAVACFLAGS $SRC_DIR/JavaInfo.java
+ 	JDK_HOME="`CLASSPATH=$SRC_DIR $JAVA JavaInfo`"
+ else
+ 	if test -z "$JDK_HOME"; then
+diff --git a/wrapper/org/GNOME/Accessibility/Makefile.am b/wrapper/org/GNOME/Accessibility/Makefile.am
+index 55c6165..8e4b9e5 100644
+--- a/wrapper/org/GNOME/Accessibility/Makefile.am
++++ b/wrapper/org/GNOME/Accessibility/Makefile.am
+@@ -11,7 +11,7 @@
+ 		< $< >$@
+
+ %.class : %.java
+-	CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) -d $(top_builddir)/wrapper $<
++	CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $JAVACFLAGS -d $(top_builddir)/wrapper $<
+
+ clean-local:
+ 	$(RM) *.class

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-19 23:36:33 +0000
+++ debian/patches/series	2013-05-19 23:36:46 +0000
@@ -1,1 +1,2 @@
 gconf
+autoconf-enable-javacflags.patch

=== modified file 'debian/rules'
--- debian/rules	2013-05-19 23:36:33 +0000
+++ debian/rules	2013-05-19 23:36:46 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+JAVACFLAGS=-source 1.5 -target 1.5
 
 %:
 	dh $@ --with autoreconf
@@ -10,4 +11,4 @@
 	rm -f JavaInfo.class
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/jni/
+	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/jni/