diff -Nru iputils-20100418/debian/changelog iputils-20100418/debian/changelog
--- iputils-20100418/debian/changelog	2010-07-24 10:02:24.000000000 +0530
+++ iputils-20100418/debian/changelog	2010-07-26 11:41:35.000000000 +0530
@@ -1,3 +1,11 @@
+iputils (3:20100418-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable(LP: #609952). Remaining changes:
+     + debian/patches/fix-tracepath-doc-typos.diff:
+      - Fixes typo in tracepath man page. 
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 26 Jul 2010 11:04:47 +0530
+
 iputils (3:20100418-2) unstable; urgency=high
 
   * Fix CVE-2010-2529 - resource consumption triggered by specially crafted
@@ -5,6 +13,14 @@
 
  -- Noah Meyerhans <noahm@debian.org>  Fri, 23 Jul 2010 21:30:40 -0700
 
+iputils (3:20100418-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable, remaining changes: (LP: #591029)
+    + debian/patches/fix-tracepath-doc-typos.diff:
+      - Fixes typo in tracepath man page.
+
+ -- Artur Rona <ari-tczew@tlen.pl>  Tue, 08 Jun 2010 01:10:13 +0200
+
 iputils (3:20100418-1) unstable; urgency=low
 
   * New upstream release.
@@ -22,6 +38,29 @@
 
  -- Noah Meyerhans <noahm@debian.org>  Sun, 04 Apr 2010 00:26:37 -0700
 
+iputils (3:20071127-2ubuntu1) lucid; urgency=low
+
+  * Fixes typo in tracepath man page (LP: #512227)
+
+ -- arky <rakesh_ambati@yahoo.com>  Wed, 10 Feb 2010 18:33:02 +0530
+
+iputils (3:20071127-2) unstable; urgency=low
+
+  * switch to debhelper 7
+  * Add lintian overrides for lintian's warnings about setuid binaries.
+  * Add a README.source to document the use of quilt and keep lintian 
+    happy.
+  * Fix the iputils-arping package description (Thanks Peder Chr.
+    Nørgaard <pcn@pogt.dk>) (Closes: #489746)
+  * Stop building the netkit-ping transitional package.
+  * Add patch from Neil Williams <codehelp@debian.org> to allow
+    cross-building (Closes: #451181)
+  * Update to standards version 3.8.3.0
+  * Use /usr/share/quilt/quilt.make to handle applying/de-applying 
+    quilt patches.
+
+ -- Noah Meyerhans <noahm@debian.org>  Thu, 27 Aug 2009 22:41:22 -0400
+
 iputils (3:20071127-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru iputils-20100418/debian/control iputils-20100418/debian/control
--- iputils-20100418/debian/control	2010-05-08 12:54:58.000000000 +0530
+++ iputils-20100418/debian/control	2010-07-25 22:54:06.000000000 +0530
@@ -1,7 +1,8 @@
 Source: iputils
 Section: net
 Priority: extra
-Maintainer: Noah Meyerhans <noahm@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Noah Meyerhans <noahm@debian.org>
 Standards-Version: 3.8.4.0
 Build-Depends: debhelper (>= 7), sp, sgmlspl, docbook, libsysfs-dev, libssl-dev
 Vcs-Svn: svn+https://svn.csail.mit.edu/iputils
diff -Nru iputils-20100418/debian/patches/fix-tracepath-doc-typos.diff iputils-20100418/debian/patches/fix-tracepath-doc-typos.diff
--- iputils-20100418/debian/patches/fix-tracepath-doc-typos.diff	1970-01-01 05:30:00.000000000 +0530
+++ iputils-20100418/debian/patches/fix-tracepath-doc-typos.diff	2010-06-20 01:13:19.000000000 +0530
@@ -0,0 +1,32 @@
+Description: Fix some small typos in tracepath.sgml
+Author: Seth Arnold
+Last-Update: 2010-03-11
+Origin: http://launchpadlibrarian.net/38354506/tracepath-manpage-typo.diff
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/iputils/+bug/512227
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570166
+Forwarded, upstream: http://www.linux-ipv6.org/gitweb/gitweb.cgi?p=gitroot/iputils.git;a=commit;h=ed9f48b4466ae7e6c128301a665122c41e8cc5eb
+Reviewed-by: James Westby <james.westby@ubuntu.com>
+
+=== modified file 'doc/tracepath.sgml'
+Index: iputils/doc/tracepath.sgml
+===================================================================
+--- iputils.orig/doc/tracepath.sgml
++++ iputils/doc/tracepath.sgml
+@@ -27,7 +27,7 @@
+ <para>
+ It traces path to <replaceable/destination/ discovering MTU along this path.
+ It uses UDP port <replaceable/port/ or some random port.
+-It is similar to <command/traceroute/, only does not not require superuser
++It is similar to <command/traceroute/, only does not require superuser
+ privileges and has no fancy options.
+ </para>
+ 
+@@ -101,7 +101,7 @@
+ If the path is asymmetric
+ or the probe finishes before it reach prescribed hop, difference
+ between number of hops in forward and backward direction is shown
+-folloing keyword <literal/async/. This information is not reliable.
++following keyword <literal/async/. This information is not reliable.
+ F.e. the third line shows asymmetry of 1, it is because the first probe
+ with TTL of 2 was rejected at the first hop due to Path MTU Discovery.
+ </para>
diff -Nru iputils-20100418/debian/patches/series iputils-20100418/debian/patches/series
--- iputils-20100418/debian/patches/series	2010-07-24 09:56:48.000000000 +0530
+++ iputils-20100418/debian/patches/series	2010-07-26 11:03:01.000000000 +0530
@@ -5,4 +5,6 @@
 targets.diff
 fix-tracepath-docs.diff
 fix-arping-timeouts.diff
+fix-tracepath-doc-typos.diff
 CVE-2010-2529.diff
+