diff -Nru xtell-2.10.5+nmu1/debian/changelog xtell-2.10.5+nmu1ubuntu1/debian/changelog
--- xtell-2.10.5+nmu1/debian/changelog	2008-04-02 12:32:19.000000000 +0200
+++ xtell-2.10.5+nmu1ubuntu1/debian/changelog	2008-08-13 14:35:26.000000000 +0200
@@ -1,3 +1,12 @@
+xtell (2.10.5+nmu1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #257574)
+  * Moved update-inetd and adduser to Pre-Depends as it is used
+    in the preinst & postinst script.
+  * Updated Standards-Version.
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Wed, 13 Aug 2008 14:34:40 +0200
+
 xtell (2.10.5+nmu1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -5,12 +14,27 @@
 
  -- Peter Eisentraut <petere@debian.org>  Wed, 02 Apr 2008 12:32:01 +0200
 
+xtell (2.10.5ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: Add update-inetd to xtell's dependencies
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 18 Feb 2007 12:23:05 +0100
+
 xtell (2.10.5) unstable; urgency=low
 
   * add Portuguese debconf template (closes: #383390)
 
  -- Radovan Garabík <garabik@kassiopeia.juls.savba.sk>  Sat, 17 Feb 2007 17:27:17 +0100
 
+xtell (2.10.4ubuntu1) feisty; urgency=low
+
+  * debian/control: Add update-inetd to xtell's dependencies
+    (Closes Ubuntu: #76171).
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 17 Dec 2006 16:51:32 +0100
+
 xtell (2.10.4) unstable; urgency=low
 
   * fixed debconf dependency (closes: #332161)
@@ -34,7 +58,7 @@
   * depend on adduser
 
  -- Radovan Garabík <garabik@kassiopeia.juls.savba.sk>  Mon, 29 Aug 2005 17:47:58 +0200
- 
+
 xtell (2.10.1-0.1) unstable; urgency=low
 
   * Non-maintainer upload for fixing l10n issues
@@ -284,3 +308,4 @@
 Local variables:
 mode: debian-changelog
 End:
+
diff -Nru xtell-2.10.5+nmu1/debian/control xtell-2.10.5+nmu1ubuntu1/debian/control
--- xtell-2.10.5+nmu1/debian/control	2007-02-17 18:43:09.000000000 +0200
+++ xtell-2.10.5+nmu1ubuntu1/debian/control	2008-08-13 14:32:08.000000000 +0200
@@ -1,13 +1,15 @@
 Source: xtell
 Section: net
 Priority: optional
-Maintainer: Radovan Garabík <garabik@kassiopeia.juls.savba.sk>
-Standards-Version: 3.7.2
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Radovan Garabík <garabik@kassiopeia.juls.savba.sk>
+Standards-Version: 3.8.0
 Build-Depends: libreadline5-dev | libreadline-dev, libident-dev, debhelper (>= 4.1.16), po-debconf
 
 Package: xtell
 Architecture: any
-Depends: ${shlibs:Depends}, netbase (>= 4.06), debconf | debconf-2.0, adduser
+Depends: ${shlibs:Depends}, netbase (>= 4.06), debconf | debconf-2.0
+Pre-Depends: update-inetd, adduser
 Description: Simple messaging client and server, sort of networked write
  Simple messaging client and server, allowing you to send messages
  from computer running xtell client to computer running xtelld server.