diff -u netatalk-2.0.4~beta2/debian/control.in netatalk-2.0.4~beta2/debian/control.in
--- netatalk-2.0.4~beta2/debian/control.in
+++ netatalk-2.0.4~beta2/debian/control.in
@@ -1,7 +1,8 @@
 Source: netatalk
 Section: net
 Priority: extra
-Maintainer: Jonas Smedegaard <dr@jones.dk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
 Build-Depends: @cdbs@
 Build-Conflicts: libavahi-compat-libdnssd-dev
 Uploaders: Sebastian Rittau <srittau@debian.org>, Jonas Smedegaard <dr@jones.dk>
diff -u netatalk-2.0.4~beta2/debian/control netatalk-2.0.4~beta2/debian/control
--- netatalk-2.0.4~beta2/debian/control
+++ netatalk-2.0.4~beta2/debian/control
@@ -1,8 +1,9 @@
 Source: netatalk
 Section: net
 Priority: extra
-Maintainer: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.39), autotools-dev, debhelper (>= 5.0.44), quilt, patchutils (>= 0.2.25), dh-buildinfo, devscripts (>= 2.10.7), libdb-dev, libwrap0-dev, libpam0g-dev, libavahi-client-dev (>= 0.6), libcupsys2-dev, libkrb5-dev, libltdl3-dev, libgcrypt11-dev | libgcrypt-dev, cracklib-dev, d-shlibs (>> 0.19)
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
+Build-Depends: cdbs (>= 0.4.39), autotools-dev, debhelper (>= 5.0.44), quilt, patchutils (>= 0.2.25), dh-buildinfo, devscripts (>= 2.10.7), libdb4.6-dev, libwrap0-dev, libpam0g-dev, libavahi-client-dev (>= 0.6), libcupsys2-dev, libkrb5-dev, libltdl7-dev, libgcrypt11-dev | libgcrypt-dev, cracklib-dev, d-shlibs (>> 0.19)
 Build-Conflicts: libavahi-compat-libdnssd-dev
 Uploaders: Sebastian Rittau <srittau@debian.org>, Jonas Smedegaard <dr@jones.dk>
 Vcs-Git: git://git.debian.org/git/collab-maint/netatalk.git
@@ -14,7 +15,7 @@
 Section: net
 Architecture: any
 Depends: netbase, libpam-modules, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
-Recommends: lsof, rc, db4.2-util, procps, ${ssl:Recommends}
+Recommends: lsof, rc, db4.6-util, procps, ${ssl:Recommends}
 Suggests: tetex-bin, quota, timeout
 Description: AppleTalk user binaries
  Netatalk is an implementation of the AppleTalk Protocol Suite for
diff -u netatalk-2.0.4~beta2/debian/changelog netatalk-2.0.4~beta2/debian/changelog
--- netatalk-2.0.4~beta2/debian/changelog
+++ netatalk-2.0.4~beta2/debian/changelog
@@ -1,3 +1,17 @@
+netatalk (2.0.4~beta2-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #318665
+    - Changed dependency from libdb-dev to libdb4.6-dev to correct
+      FTBFS due to an issue caused by mismatches on installed binaries
+      and development headers (db4.7 is installed under a different soname
+      which breaks a check in netatalk) (LP: #262991)
+    - debian/control:
+      + Replace libltdl3-dev with libltdl7-dev.
+      + Recommend db4.6-util instead of db4.2-util as we build netatalk with
+        db4.6.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 19 Jan 2009 14:18:05 +0530
+
 netatalk (2.0.4~beta2-1) unstable; urgency=high
 
   * New upstream prerelease:
@@ -36,6 +50,22 @@
 
  -- Jonas Smedegaard <dr@jones.dk>  Fri, 09 Jan 2009 05:52:18 +0100
 
+netatalk (2.0.3-11ubuntu1) intrepid; urgency=low
+
+  [ Michael Casadevall ]
+  * Changed dependency from libdb-dev to libdb4.6-dev to correct
+    FTBFS due to an issue caused by mismatches on installed binaries
+    and development headers (db4.7 is installed under a different soname
+    which breaks a check in netatalk) (LP: #262991)
+
+  [ Michael Bienia ]
+  * debian/control:
+    + Replace libltdl3-dev with libltdl7-dev.
+    + Recommend db4.6-util instead of db4.2-util as we build netatalk with
+      db4.6.
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 30 Aug 2008 17:16:21 +0200
+
 netatalk (2.0.3-11) unstable; urgency=medium
 
   * Add patch 001 from upstream CVS to fix LFS test for cross
+