Package: hfsplus
Version: 1.0.4-11
Severity: normal
Tags: patch

With kernel 2.6.17 headers (Ubuntu's kernel), hfsplus FTBFS with

 gcc -DHAVE_CONFIG_H -I. -I. -I../.. -O2 -g -Wall -MT os.lo -MD -MP -MF 
.deps/os.Tpo -c os.c -o os.o >/dev/null 2>&1
if /bin/bash ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. 
-I../..     -O2 -g -Wall -MT unicode.lo -MD -MP -MF ".deps/unicode.Tpo" -c -o 
unicode.lo unicode.c; \
        then mv -f ".deps/unicode.Tpo" ".deps/unicode.Plo"; else rm -f 
".deps/unicode.Tpo"; exit 1; fi
 gcc -DHAVE_CONFIG_H -I. -I. -I../.. -O2 -g -Wall -MT unicode.lo -MD -MP -MF 
.deps/unicode.Tpo -c unicode.c  -fPIC -DPIC -o .libs/unicode.o
unicode.c:19:26: error: linux/string.h: No such file or directory

The #include does not seem necessary, removing it helps.

Thanks for considering,

Martin
-- 
Martin Pitt        http://www.piware.de
Ubuntu Developer   http://www.ubuntu.com
Debian Developer   http://www.debian.org

In a world without walls and fences, who needs Windows and Gates?
diff -u hfsplus-1.0.4/debian/changelog hfsplus-1.0.4/debian/changelog
--- hfsplus-1.0.4/debian/changelog
+++ hfsplus-1.0.4/debian/changelog
@@ -1,3 +1,11 @@
+hfsplus (1.0.4-11ubuntu1) feisty; urgency=low
+
+  * Synchronize to Debian, remaining Ubuntu change:
+    - Fix for FTBFS with 2.6.17 kernel headers.
+      (debian/patches/remove_linux_string_include.dpatch)
+
+ -- Martin Pitt <[EMAIL PROTECTED]>  Mon, 30 Oct 2006 12:11:34 +0100
+
 hfsplus (1.0.4-11) unstable; urgency=low
 
   * New maintainer. (Closes: #387337)
diff -u hfsplus-1.0.4/debian/patches/00list hfsplus-1.0.4/debian/patches/00list
--- hfsplus-1.0.4/debian/patches/00list
+++ hfsplus-1.0.4/debian/patches/00list
@@ -8,0 +9 @@
+remove_linux_string_include
--- hfsplus-1.0.4.orig/debian/patches/remove_linux_string_include.dpatch
+++ hfsplus-1.0.4/debian/patches/remove_linux_string_include.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_linux_string_include.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad hfsplus-1.0.4~/libhfsp/src/unicode.c 
hfsplus-1.0.4/libhfsp/src/unicode.c
+--- hfsplus-1.0.4~/libhfsp/src/unicode.c       2002-03-05 20:50:29.000000000 
+0100
++++ hfsplus-1.0.4/libhfsp/src/unicode.c        2006-10-30 12:01:46.000000000 
+0100
+@@ -16,7 +16,6 @@
+ #include <stdlib.h>
+ #include <endian.h>
+ #include <byteswap.h>
+-#include <linux/string.h>
+ 
+ #define __USE_GNU
+     /* need wcsrtomb */

Attachment: signature.asc
Description: Digital signature

Reply via email to