[Pkg-utopia-commits] r192 - packages/networkmanager/trunk/debian/patches

Thom May thom@costa.debian.org
Mon, 11 Apr 2005 03:21:14 +0000


Author: thom
Date: 2005-04-11 03:21:14 +0000 (Mon, 11 Apr 2005)
New Revision: 192

Removed:
   packages/networkmanager/trunk/debian/patches/10_correct_arping_path.dpatch
Modified:
   packages/networkmanager/trunk/debian/patches/00list
Log:
delete no longer necessary patch

Modified: packages/networkmanager/trunk/debian/patches/00list
===================================================================
--- packages/networkmanager/trunk/debian/patches/00list	2005-04-11 03:10:33 UTC (rev 191)
+++ packages/networkmanager/trunk/debian/patches/00list	2005-04-11 03:21:14 UTC (rev 192)
@@ -1,2 +1 @@
-10_correct_arping_path.dpatch
 99_fake_config_info

Deleted: packages/networkmanager/trunk/debian/patches/10_correct_arping_path.dpatch
===================================================================
--- packages/networkmanager/trunk/debian/patches/10_correct_arping_path.dpatch	2005-04-11 03:10:33 UTC (rev 191)
+++ packages/networkmanager/trunk/debian/patches/10_correct_arping_path.dpatch	2005-04-11 03:21:14 UTC (rev 192)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_correct_arping_path.dpatch by Thom May <thom@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c /tmp/dpep.4pO7G2/network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c
---- network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c	2004-10-19 10:51:09.000000000 +0100
-+++ /tmp/dpep.4pO7G2/network-manager-0.3.1+cvs20041108/src/backends/NetworkManagerDebian.c	2004-11-08 14:37:45.990357744 +0000
-@@ -218,7 +218,7 @@
-          * using RFC 2131 Duplicate Address Detection
-          */
-         temp_addr.s_addr = addr;
--        buf = g_strdup_printf ("/sbin/arping -q -D -c 1 -I %s %s", 
-+        buf = g_strdup_printf ("/usr/sbin/arping -q -D -c 1 -I %s %s", 
-                                iface, inet_ntoa (temp_addr));
-         if ((err = nm_spawn_process (buf)))
-         {
-@@ -248,12 +248,12 @@
- 
-         /* Alert other computers of our new address */
-         temp_addr.s_addr = addr;
--        buf = g_strdup_printf ("/sbin/arping -q -A -c 1 -I %s %s", iface,
-+        buf = g_strdup_printf ("/usr/sbin/arping -q -A -c 1 -I %s %s", iface,
-                                inet_ntoa (temp_addr));
-         nm_spawn_process (buf);
-         g_free (buf);
-         g_usleep (G_USEC_PER_SEC * 2);
--        buf = g_strdup_printf ("/sbin/arping -q -U -c 1 -I %s %s", iface,
-+        buf = g_strdup_printf ("/usr/sbin/arping -q -U -c 1 -I %s %s", iface,
-                                 inet_ntoa (temp_addr));
-         nm_spawn_process (buf);
-         g_free (buf);