diff -u rbot-0.9.10/debian/changelog rbot-0.9.10/debian/changelog
--- rbot-0.9.10/debian/changelog
+++ rbot-0.9.10/debian/changelog
@@ -1,9 +1,24 @@
+rbot (0.9.10-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #230914)
+   + Rebuild for libdb4.3 -> libdb4.6 migration.
+   + Update maintainer field in debian/control
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Fri, 16 May 2008 03:29:51 +0200
+
 rbot (0.9.10-3) unstable; urgency=low
 
   * Minor 'debian/rules' cleanup.
 
  -- Marc Dequènes (Duck) <Duck@DuckCorp.org>  Fri, 21 Mar 2008 01:29:39 +0100
 
+rbot (0.9.10-2ubuntu1) hardy; urgency=low
+
+  * Rebuild for libdb4.3 -> libdb4.6 migration.
+  * Set maintainer to MOTU. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 07 Mar 2008 10:50:01 -0500
+
 rbot (0.9.10-2) unstable; urgency=high
 
   * Fixed ruby dependency as the versioning scheme changed and version
diff -u rbot-0.9.10/debian/control.in rbot-0.9.10/debian/control.in
--- rbot-0.9.10/debian/control.in
+++ rbot-0.9.10/debian/control.in
@@ -1,7 +1,8 @@
 Source: rbot
 Section: net
 Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
 Build-Depends: @cdbs@, ruby (>= 1.8)
 Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
 Standards-Version: 3.7.3.0
@@ -9,7 +10,7 @@
 
 Package: rbot
 Architecture: all
-Depends: ruby, libdb4.3-ruby1.8 | libdb4.2-ruby1.8, libopenssl-ruby1.8
+Depends: ruby, libdb4.6-ruby1.8, libopenssl-ruby1.8
 Recommends: librexml-ruby (>= 1.8.1), host, aspell, bsdmainutils, fortune-mod | fortune
 Description: IRC bot written in ruby
  Rbot is very extensible thanks to a well designed plugin
diff -u rbot-0.9.10/debian/control rbot-0.9.10/debian/control
--- rbot-0.9.10/debian/control
+++ rbot-0.9.10/debian/control
@@ -1,7 +1,8 @@
 Source: rbot
 Section: net
 Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
 Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), ruby (>= 1.8)
 Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
 Standards-Version: 3.7.3.0
@@ -9,7 +10,7 @@
 
 Package: rbot
 Architecture: all
-Depends: ruby, libdb4.3-ruby1.8 | libdb4.2-ruby1.8, libopenssl-ruby1.8
+Depends: ruby, libdb4.6-ruby1.8, libopenssl-ruby1.8
 Recommends: librexml-ruby (>= 1.8.1), host, aspell, bsdmainutils, fortune-mod | fortune
 Description: IRC bot written in ruby
  Rbot is very extensible thanks to a well designed plugin