tags 428929 + patch thanks Hi,
Attached is the diff for my ipmitool 1.8.8-3.1 NMU. Cheers, Julien
diff -u ipmitool-1.8.8/debian/changelog ipmitool-1.8.8/debian/changelog --- ipmitool-1.8.8/debian/changelog +++ ipmitool-1.8.8/debian/changelog @@ -1,3 +1,12 @@ +ipmitool (1.8.8-3.1) unstable; urgency=high + + * Non-maintainer upload. + * High urgency for RC bug fix. + * Fix build with linux-libc-dev (closes: #428929). + * Fix debian/rules to not rerun configure in the binary target. + + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 20 Jul 2007 16:29:18 +0200 + ipmitool (1.8.8-3) unstable; urgency=low * Ported fix to ipmievd from upstream version 1.8.9 (Closes: #408536): diff -u ipmitool-1.8.8/debian/rules ipmitool-1.8.8/debian/rules --- ipmitool-1.8.8/debian/rules +++ ipmitool-1.8.8/debian/rules @@ -16,7 +16,7 @@ endif configure: configure-stamp -configure-stamp: patch +configure-stamp: patch-stamp dh_testdir ./configure --prefix=/usr \ --with-kerneldir \ @@ -31,9 +31,11 @@ # Add here commands to compile the arch part of the package. $(MAKE) + touch build-arch-stamp build-indep: build-indep-stamp build-indep-stamp: configure-stamp + touch build-indep-stamp # Add here commands to compile the indep part of the package. #$(MAKE) doc @@ -112,5 +114,5 @@ binary: binary-arch #binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-indep install-arch configure include /usr/share/dpatch/dpatch.make diff -u ipmitool-1.8.8/debian/patches/00list ipmitool-1.8.8/debian/patches/00list --- ipmitool-1.8.8/debian/patches/00list +++ ipmitool-1.8.8/debian/patches/00list @@ -1,0 +2 @@ +20-linux-libc-dev.dpatch only in patch2: unchanged: --- ipmitool-1.8.8.orig/debian/patches/20-linux-libc-dev.dpatch +++ ipmitool-1.8.8/debian/patches/20-linux-libc-dev.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-linux-libc-dev.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +diff -urNad ipmitool-1.8.8~/src/ipmievd.c ipmitool-1.8.8/src/ipmievd.c +--- ipmitool-1.8.8~/src/ipmievd.c 2007-07-20 16:01:43.000000000 +0200 ++++ ipmitool-1.8.8/src/ipmievd.c 2007-07-20 16:02:14.000000000 +0200 +@@ -54,7 +54,6 @@ + + #ifdef IPMI_INTF_OPEN + # if defined(HAVE_OPENIPMI_H) +-# include <linux/compiler.h> + # include <linux/ipmi.h> + # elif defined(HAVE_FREEBSD_IPMI_H) + # include <sys/ipmi.h> +diff -urNad ipmitool-1.8.8~/src/plugins/open/open.c ipmitool-1.8.8/src/plugins/open/open.c +--- ipmitool-1.8.8~/src/plugins/open/open.c 2007-07-20 16:01:21.000000000 +0200 ++++ ipmitool-1.8.8/src/plugins/open/open.c 2007-07-20 16:01:43.000000000 +0200 +@@ -50,7 +50,6 @@ + #endif + + #if defined(HAVE_OPENIPMI_H) +-# include <linux/compiler.h> + # include <linux/ipmi.h> + #elif defined(HAVE_FREEBSD_IPMI_H) + /* FreeBSD OpenIPMI-compatible header */
signature.asc
Description: Digital signature
