diff -u subversion-1.6.1dfsg/debian/control subversion-1.6.1dfsg/debian/control
--- subversion-1.6.1dfsg/debian/control
+++ subversion-1.6.1dfsg/debian/control
@@ -5,14 +5,14 @@
 XSBC-Original-Maintainer: Peter Samuelson <peter@p12n.org>
 Uploaders: Troy Heber <troyh@debian.org>,
            Guilherme de S. Pastore <gpastore@debian.org>
-Build-Depends: debhelper, libneon27-gnutls-dev, zlib1g-dev,
-               libapr1-dev, libaprutil1-dev, libdb4.7-dev,
+Build-Depends: debhelper, libneon27-dev, zlib1g-dev,
+               libapr1-dev, libaprutil1-dev, libdb4.6-dev,
                libsasl2-dev, apache2-threaded-dev,
                libsqlite3-dev (>= 3.4), libgnome-keyring-dev, libdbus-1-dev,
                quilt, doxygen, autotools-dev, autoconf, libtool, swig,
                python-all-dev, python-all-dbg, python-support,
                perl, libperl-dev, ruby1.8, ruby1.8-dev,
-               default-jdk [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386],
+               java-gcj-compat-dev [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386],
                junit [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386]
 Build-Conflicts: libsvn-dev (<< 1.5)
 XS-Python-Version: 2.5, 2.6
@@ -25,7 +25,7 @@
 Section: devel
 Architecture: any
 Depends: libsvn1 (= ${binary:Version}), ${shlibs:Depends}
-Suggests: subversion-tools, db4.7-util, patch
+Suggests: subversion-tools, db4.6-util, patch
 Description: Advanced version control system
  Subversion, also known as svn, is a version control system much like
  the Concurrent Versions System (CVS).  Version control systems allow
@@ -52,7 +52,7 @@
 Priority: extra
 Architecture: any
 Depends: libsvn1 (= ${binary:Version}), libapr1-dev, libaprutil1-dev
-Suggests: libsvn-doc, zlib1g-dev, libneon27-gnutls-dev
+Suggests: libsvn-doc, zlib1g-dev, libneon27-dev
 Conflicts: libsvn0-dev
 Replaces: libsvn0-dev
 Description: Development files for Subversion libraries
@@ -74,7 +74,7 @@
 Section: net
 Architecture: any
 Depends: apache2.2-common, ${shlibs:Depends}
-Suggests: db4.7-util
+Suggests: db4.6-util
 Description: Subversion server modules for Apache
  This package provides the mod_dav_svn and mod_authz_svn modules for
  the Apache 2.2 web server.  These modules provide Subversion's WebDAV
@@ -146,7 +146,7 @@
 Provides: libsvn-javahl
 Section: devel
 Architecture: any
-Depends: default-jre-headless | java5-runtime-headless, libsvn1 (= ${binary:Version})
+Depends: gij | java5-runtime-headless, libsvn1 (= ${binary:Version})
 Description: Java bindings for Subversion
  This is a set of Java classes which provide the functionality of
  libsvn, the Subversion libraries.  It is useful if you want to, for
diff -u subversion-1.6.1dfsg/debian/changelog subversion-1.6.1dfsg/debian/changelog
--- subversion-1.6.1dfsg/debian/changelog
+++ subversion-1.6.1dfsg/debian/changelog
@@ -1,3 +1,19 @@
+subversion (1.6.1dfsg-1ubuntu2~hardy1) hardy; urgency=low
+
+  * Backport to Hardy.  (LP: #382048)
+    - Build-Depend libdb4.6-dev instead of libdb4.7-dev.
+    - Change back to Hardy Java package structure:
+      - debian/control: Change build-dep from default-jdk to
+        java-gcj-compat-dev and libsvn-java dep from default-jre to gij
+      - debian/rules: Change from /usr/lib/jvm/default-jdk to
+        /usr/lib/jvm/java-gcj
+      - Renable java-build patch in debian/patches/series
+    - Switched libneon-gnutls-dev to libneon-dev to fix issues with
+      openssl and SSL certificates.  This matches the configuration of
+      Subversion in hardy (LP: #265065)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Thu, 09 Jul 2009 10:45:05 -0400
+
 subversion (1.6.1dfsg-1ubuntu2) karmic; urgency=low
 
   * debian/rules: Manually create the doxygen output directory, otherwise
diff -u subversion-1.6.1dfsg/debian/rules subversion-1.6.1dfsg/debian/rules
--- subversion-1.6.1dfsg/debian/rules
+++ subversion-1.6.1dfsg/debian/rules
@@ -100,7 +100,7 @@
 ifdef DEB_OPT_WITH_JAVAHL
   # jikes 1.22 cannot compile javahl.
   confflags += --enable-javahl --without-jikes \
-               --with-jdk=/usr/lib/jvm/default-java \
+               --with-jdk=/usr/lib/jvm/java-gcj \
                --with-junit=/usr/share/java/junit.jar
 else
   DH_OPTIONS += -Nlibsvn-java
diff -u subversion-1.6.1dfsg/debian/patches/series subversion-1.6.1dfsg/debian/patches/series
--- subversion-1.6.1dfsg/debian/patches/series
+++ subversion-1.6.1dfsg/debian/patches/series
@@ -1,5 +1,6 @@
 build-fixes
 entropy
+java-build
 last-changed-date-charset
 no-extra-libs
 no-extra-libs-2