diff -Nru uucp-1.07/debian/changelog uucp-1.07/debian/changelog
--- uucp-1.07/debian/changelog	2007-03-22 00:21:44.000000000 +0100
+++ uucp-1.07/debian/changelog	2007-03-22 00:21:45.000000000 +0100
@@ -1,3 +1,11 @@
+uucp (1.07-19.1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Depend on update-inetd
+    - Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 17 Feb 2007 22:21:35 +0000
+
 uucp (1.07-19.1) unstable; urgency=low
 
   * Non-maintainer upload to fix pending debconf l10n bugs.
@@ -6,6 +14,12 @@
 
  -- Christian Perrier <bubulle@debian.org>  Fri, 16 Feb 2007 07:56:00 +0100
 
+uucp (1.07-19ubuntu1) feisty; urgency=low
+
+  * Depend on update-inetd.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 14 Dec 2006 11:19:39 +0100
+
 uucp (1.07-19) unstable; urgency=low
 
   * Only call update-inetd --remove in postrm purge when a
diff -Nru uucp-1.07/debian/control uucp-1.07/debian/control
--- uucp-1.07/debian/control	2007-03-22 00:21:44.000000000 +0100
+++ uucp-1.07/debian/control	2007-03-22 00:21:45.000000000 +0100
@@ -1,13 +1,14 @@
 Source: uucp
 Section: comm
 Priority: extra
-Maintainer: Peter Palfrader <weasel@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Peter Palfrader <weasel@debian.org>
 Build-Depends: debhelper (>= 4.1.16), texinfo, libpam-dev
 Standards-Version: 3.7.2
 
 Package: uucp
 Architecture: any
-Depends: ${shlibs:Depends}, cron (>=3.0pl1-42), mailx, debconf | debconf-2.0, logrotate, libpam-runtime (>= 0.76-13.1), cu (= ${Source-Version}), netbase
+Depends: ${shlibs:Depends}, cron (>=3.0pl1-42), mailx, debconf | debconf-2.0, logrotate, libpam-runtime (>= 0.76-13.1), cu (= ${Source-Version}), netbase, update-inetd
 Recommends: postfix | exim4 | exim | smail | courier-mta | zmailer | rmail
 Conflicts: tua (<< 4.3-3)
 Description: Unix to Unix Copy Program