tags 451432 +patch thanks Adapting a patch from Ubuntu (which was likely tested on AMD64). I don't have a non-i386 sid, it would be good if someone can give this a spin and comment here. Please feel free to do an NMU if you can test this (not just for the FTBFS, but an 'install and use' test).
Giridhar On 07/11/15 17:26 -0500, Daniel Schepler said ... > In file included from interface.c:27: > /usr/include/sys/types.h:46: error: conflicting types for 'loff_t' > /usr/include/linux/types.h:30: error: previous declaration of 'loff_t' was > here -- Y Giridhar Appaji Nag | http://www.appaji.net/
diff -Nur original/ifplugd-0.28/debian/control ifplugd/ifplugd-0.28/debian/control
--- original/ifplugd-0.28/debian/control 2007-11-21 15:59:07.000000000 +0530
+++ ifplugd/ifplugd-0.28/debian/control 2007-11-22 12:31:56.518739000 +0530
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Oliver Kurth <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.1.16), libdaemon-dev (>= 0.7), lynx | lynx-ssl, pkg-config, po-debconf
+Build-Depends: debhelper (>> 4.1.16), dpatch, libdaemon-dev (>= 0.7), lynx | lynx-ssl, pkg-config, po-debconf
Standards-Version: 3.6.1
Package: ifplugd
diff -Nur original/ifplugd-0.28/debian/patches/00list ifplugd/ifplugd-0.28/debian/patches/00list
--- original/ifplugd-0.28/debian/patches/00list 1970-01-01 05:30:00.000000000 +0530
+++ ifplugd/ifplugd-0.28/debian/patches/00list 2007-11-22 12:39:39.752920000 +0530
@@ -0,0 +1 @@
+01_loff_t_dev_t_conflict
diff -Nur original/ifplugd-0.28/debian/patches/01_loff_t_dev_t_conflict.dpatch ifplugd/ifplugd-0.28/debian/patches/01_loff_t_dev_t_conflict.dpatch
--- original/ifplugd-0.28/debian/patches/01_loff_t_dev_t_conflict.dpatch 1970-01-01 05:30:00.000000000 +0530
+++ ifplugd/ifplugd-0.28/debian/patches/01_loff_t_dev_t_conflict.dpatch 2007-11-22 12:40:55.946870000 +0530
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_loff_t_dev_t_conflict.dpatch from Jeremie Corbier <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS: Conflict between sys/types.h linux/types.h loff_t/dev_t
+
[EMAIL PROTECTED]@
+diff -urNad ifplugd-0.28~/src/interface.c ifplugd-0.28/src/interface.c
+--- ifplugd-0.28~/src/interface.c 2005-01-04 16:25:31.000000000 -0800
++++ ifplugd-0.28/src/interface.c 2007-01-12 19:19:14.000000000 -0800
+@@ -23,7 +23,6 @@
+ #endif
+
+ #include <linux/sockios.h>
+-#include <linux/if_ether.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+diff -urNad ifplugd-0.28~/src/interface.h ifplugd-0.28/src/interface.h
+--- ifplugd-0.28~/src/interface.h 2004-05-09 16:20:56.000000000 -0700
++++ ifplugd-0.28/src/interface.h 2007-01-12 19:19:45.000000000 -0800
+@@ -21,6 +21,9 @@
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
++/* From <linux/if_ether.h> */
++#define ETH_ALEN 6
++
+ int interface_auto_up;
+ int interface_do_message;
+
diff -Nur original/ifplugd-0.28/debian/rules ifplugd/ifplugd-0.28/debian/rules
--- original/ifplugd-0.28/debian/rules 2007-11-21 15:59:07.000000000 +0530
+++ ifplugd/ifplugd-0.28/debian/rules 2007-11-22 12:09:59.116953000 +0530
@@ -5,6 +5,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -21,7 +23,7 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+config.status: patch configure
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc
@@ -43,7 +45,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
signature.asc
Description: Digital signature
