diff -Nru elki-0.5.0~beta2/debian/changelog elki-0.5.0~beta2/debian/changelog
--- elki-0.5.0~beta2/debian/changelog	2012-06-02 21:17:57.000000000 +0530
+++ elki-0.5.0~beta2/debian/changelog	2012-06-28 22:33:37.000000000 +0530
@@ -1,3 +1,13 @@
+elki (0.5.0~beta2-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian Unstable (LP: #1018927). Remaining Changes:
+    - debian/rules: set JAVA_HOME globally.
+    - debian/patches/build.patch: update to also pass "-encoding utf-8" as
+      compiler flags to properly encode German characters in the copyright
+      strings from the source comments.
+
+ -- Vibhav Pant <vibhavp@gmail.com>  Thu, 28 Jun 2012 22:27:39 +0530
+
 elki (0.5.0~beta2-1) unstable; urgency=low
 
   * New upstream beta release.
@@ -21,6 +31,27 @@
 
  -- Erich Schubert <erich@debian.org>  Mon, 30 Jan 2012 21:01:31 +0100
 
+elki (0.4.0-1ubuntu3) precise; urgency=low
+
+  * debian/rules: set JAVA_HOME globally.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 22 Nov 2011 12:23:23 -0500
+
+elki (0.4.0-1ubuntu2) precise; urgency=low
+
+  * debian/rules: specify JAVA_HOME as openjdk-7, since we can't use openjdk-6
+    or depend on default-java.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 22 Nov 2011 11:38:31 -0500
+
+elki (0.4.0-1ubuntu1) precise; urgency=low
+
+  * debian/patches/build.patch: update to also pass "-encoding utf-8" as
+    compiler flags to properly encode German characters in the copyright
+    strings from the source comments.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 18 Nov 2011 22:00:14 -0500
+
 elki (0.4.0-1) unstable; urgency=low
 
   * New upstream release. (0.4.0 final)
diff -Nru elki-0.5.0~beta2/debian/patches/build.patch elki-0.5.0~beta2/debian/patches/build.patch
--- elki-0.5.0~beta2/debian/patches/build.patch	2012-06-02 21:18:15.000000000 +0530
+++ elki-0.5.0~beta2/debian/patches/build.patch	2012-06-28 22:26:59.000000000 +0530
@@ -20,7 +20,7 @@
 +  <target name="compile" depends="init">
 +    <!-- Compile the java code from ${src} into ${build} -->
 +    <javac destdir="${build}" includeantruntime="false" deprecation="false" debug="false" optimize="true" source="1.6" target="1.6" debuglevel="" encoding="UTF-8">
-+      <compilerarg value="-Xlint:all" />
++      <compilerarg line="-Xlint:all -encoding utf-8" />
 +      <classpath>
 +        <pathelement path="${src}" />
 +        <pathelement path="/usr/share/java/batik.jar" />
diff -Nru elki-0.5.0~beta2/debian/rules elki-0.5.0~beta2/debian/rules
--- elki-0.5.0~beta2/debian/rules	2011-08-18 03:52:06.000000000 +0530
+++ elki-0.5.0~beta2/debian/rules	2012-06-28 22:27:23.000000000 +0530
@@ -1,4 +1,9 @@
 #!/usr/bin/make -f
+
+arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-${arch}
+
 %:
 	dh $@