diff -u iproute-20071016/debian/patches/00list iproute-20071016/debian/patches/00list
--- iproute-20071016/debian/patches/00list
+++ iproute-20071016/debian/patches/00list
@@ -14,0 +15 @@
+tc_action_parsing.dpatch
diff -u iproute-20071016/debian/changelog iproute-20071016/debian/changelog
--- iproute-20071016/debian/changelog
+++ iproute-20071016/debian/changelog
@@ -1,3 +1,9 @@
+iproute (20071016-2ubuntu2) hardy-proposed; urgency=low
+
+  * Revert "TC action parsing bug fix" (LP: #194623).
+
+ -- Mathias Gug <mathiaz@ubuntu.com>  Mon, 16 Jun 2008 13:56:28 -0400
+
 iproute (20071016-2ubuntu1) hardy; urgency=low
 
   * Cherry-picked merge from Debian unstable, remaining changes:
only in patch2:
unchanged:
--- iproute-20071016.orig/debian/patches/tc_action_parsing.dpatch
+++ iproute-20071016/debian/patches/tc_action_parsing.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## tc_action_parsing.dpatch by Mathias Gug <mathiaz@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Revert Revert "TC action parsing bug fix".
+## DP: Patch taken from 20071016-3 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=458539
+## DP: https://bugs.launchpad.net/ubuntu/+source/iproute/+bug/194623
+## DP: upstream commit - http://git.kernel.org/?p=linux/kernel/git/shemminger/iproute2.git;a=commit;h=ef1d6f97ec725e5e942f092ab4f5a4ceff17bb9c
+
+@DPATCH@
+diff -urNad iproute-20071016~/tc/m_police.c iproute-20071016/tc/m_police.c
+--- iproute-20071016~/tc/m_police.c	2007-10-16 17:26:51.000000000 -0400
++++ iproute-20071016/tc/m_police.c	2008-06-16 14:01:41.000000000 -0400
+@@ -37,7 +37,7 @@
+ 	fprintf(stderr, "Usage: ... police rate BPS burst BYTES[/BYTES] [ mtu BYTES[/BYTES] ]\n");
+ 	fprintf(stderr, "                [ peakrate BPS ] [ avrate BPS ]\n");
+ 	fprintf(stderr, "                [ ACTIONTERM ]\n");
+-	fprintf(stderr, "Old Syntax ACTIONTERM := <EXCEEDACT>[/NOTEXCEEDACT] \n");
++	fprintf(stderr, "Old Syntax ACTIONTERM := action <EXCEEDACT>[/NOTEXCEEDACT] \n");
+ 	fprintf(stderr, "New Syntax ACTIONTERM := conform-exceed <EXCEEDACT>[/NOTEXCEEDACT] \n");
+ 	fprintf(stderr, "Where: *EXCEEDACT := pipe | ok | reclassify | drop | continue \n");
+ 	fprintf(stderr, "Where:  pipe is only valid for new syntax \n");
+@@ -237,8 +237,7 @@
+ 		} else if (strcmp(*argv, "help") == 0) {
+ 			usage();
+ 		} else {
+-			fprintf(stderr, "What is \"%s\"?\n", *argv);
+-			return -1;
++			break;
+ 		}
+ 		ok++;
+ 		argc--; argv++;