r15072 - in /trunk/libnet-arp-perl: arp_lookup_linux.c debian/changelog get_mac_bsd.c

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Sun Feb 17 17:31:37 2008
New Revision: 15072

URL: http://svn.debian.org/wsvn/?sc=1&rev=15072
Log:
* Fix remains of merging errors from integrating the new upstream release.

Modified:
    trunk/libnet-arp-perl/arp_lookup_linux.c
    trunk/libnet-arp-perl/debian/changelog
    trunk/libnet-arp-perl/get_mac_bsd.c

Modified: trunk/libnet-arp-perl/arp_lookup_linux.c
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/arp_lookup_linux.c?rev=15072&op=diff
==============================================================================
--- trunk/libnet-arp-perl/arp_lookup_linux.c (original)
+++ trunk/libnet-arp-perl/arp_lookup_linux.c Sun Feb 17 17:31:37 2008
@@ -19,6 +19,7 @@
 */
 
 #include <stdio.h>
+#include <string.h>
 
 #define _PATH_PROCNET_ARP "/proc/net/arp"
 

Modified: trunk/libnet-arp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/changelog?rev=15072&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/changelog (original)
+++ trunk/libnet-arp-perl/debian/changelog Sun Feb 17 17:31:37 2008
@@ -1,8 +1,4 @@
 libnet-arp-perl (1.0.2-1) UNRELEASED; urgency=low
-
-    XXX: This package is not ready.  It touches files not in debian/ and it
-    also has some wacky changes.  Just look at lines 46 to 56 of get_mac_bsd.c
-    for an idea of what has crept in.
 
   [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -23,6 +19,9 @@
 
   [ Roberto C. Sanchez ]
   * Update to debhelper compatibility level 6.
+
+  [ Niko Tyni ]
+  * Fix remains of merging errors from integrating the new upstream release.
 
  -- Roberto C. Sanchez <roberto at connexer.com>  Wed, 09 Jan 2008 23:48:47 -0500
 

Modified: trunk/libnet-arp-perl/get_mac_bsd.c
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/get_mac_bsd.c?rev=15072&op=diff
==============================================================================
--- trunk/libnet-arp-perl/get_mac_bsd.c (original)
+++ trunk/libnet-arp-perl/get_mac_bsd.c Sun Feb 17 17:31:37 2008
@@ -43,17 +43,11 @@
   if(strlen(dev) == 0)
     return -1;
 
-<<<<<<< .working
-  strcpy(mac,"unknown");
-  getifaddrs(&iface);
-  
-=======
   strcpy(mac,"unknown");
   if (getifaddrs(&iface))
     return -1;
 
   iffirst = iface;
->>>>>>> .merge-right.r12260
   while(iface->ifa_next != NULL)
     {
       if(!strcmp(iface->ifa_name,dev))