diff -u midentd-2.3.1/debian/control midentd-2.3.1/debian/control
--- midentd-2.3.1/debian/control
+++ midentd-2.3.1/debian/control
@@ -1,13 +1,14 @@
 Source: midentd
 Section: net
 Priority: extra
-Maintainer: Turbo Fredriksson <turbo@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Turbo Fredriksson <turbo@debian.org>
 Build-Depends: debhelper
 Standards-Version: 3.5.6
 
 Package: midentd
 Architecture: all
-Depends: netbase, adduser, dpkg (>= 1.9.21), update-inetd
+Depends: netbase, adduser, dpkg (>= 1.9.21), update-inetd, openbsd-inetd | inet-superserver
 Conflicts: pidentd
 Replaces: pidentd
 Description: An ident replacement with masquerading support.
diff -u midentd-2.3.1/debian/changelog midentd-2.3.1/debian/changelog
--- midentd-2.3.1/debian/changelog
+++ midentd-2.3.1/debian/changelog
@@ -1,3 +1,12 @@
+midentd (2.3.1-3.2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. (LP: #186025) remaining changes:
+    - debian/control: Add openbsd-inetd | inet-superserver dependencies
+      as midentd needs an inet server to work
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Sat, 26 Jan 2008 10:46:27 +0100
+
 midentd (2.3.1-3.2) unstable; urgency=low
 
   * Set 'arch: all' instead of 'any' - it's a perl script.
@@ -18,6 +27,15 @@
 
  -- Turbo Fredriksson <turbo@debian.org>  Thu, 22 Nov 2007 07:56:46 +0000
 
+midentd (2.3.1-3.1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/control: Add openbsd-inetd | inet-superserver dependencies
+      as midentd needs an inet server to work
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Kjell Braden <fnord@pentabarf.de>  Fri, 18 May 2007 12:25:29 +0200
+
 midentd (2.3.1-3.1) unstable; urgency=high
 
   * Non-maintainer upload during BSP.
@@ -26,6 +44,15 @@
 
  -- Luk Claes <luk@debian.org>  Thu, 17 May 2007 01:52:09 +0200
 
+midentd (2.3.1-3ubuntu1) feisty; urgency=low
+
+  * debian/control: Add update-inetd to midentd's dependencies
+    (Closes Ubuntu: #76114).
+  * debian/control: Add openbsd-inetd | inet-superserver dependencies
+    as midentd needs an inet server to work
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 17 Dec 2006 12:13:48 +0100
+
 midentd (2.3.1-3) unstable; urgency=low
 
   * Before trying to remove an override, see if there IS one.