[Debootloaders-devel] r228 - in /trunk/silo/debian: changelog patches/series patches/silo-linux-types.patch

[jurij at alioth.debian.org]

Author: jurij
Date: Sat Jan 30 13:53:46 2010
New Revision: 228

URL: http://svn.debian.org/wsvn/debootloaders/?sc=1&rev=228
Log:
Add silo-linux-types.patch to fix an FTBFS caused by changes in
the headers, which are now defining _LINUX_TYPES again.

Added:
    trunk/silo/debian/patches/silo-linux-types.patch
Modified:
    trunk/silo/debian/changelog
    trunk/silo/debian/patches/series

Modified: trunk/silo/debian/changelog
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/changelog?rev=228&op=diff
==============================================================================
--- trunk/silo/debian/changelog (original)
+++ trunk/silo/debian/changelog Sat Jan 30 13:53:46 2010
@@ -8,6 +8,8 @@
       (merged as f820825406a49fea6b166377ec637b2dedb9ba2e)
     - silo.git-eb6151388752b52804f80ff27e90ec2dbde71339.patch
     - silo.git-a55764ceef83086d00b5f7b8b3027b517fc4ca23.patch
+  * Add silo-linux-types.patch to fix an FTBFS caused by changes in
+    the headers, which are now defining _LINUX_TYPES again.
 
  -- Jurij Smakov <jurij at debian.org>  Sat, 30 Jan 2010 13:37:25 +0000
 

Modified: trunk/silo/debian/patches/series
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/series?rev=228&op=diff
==============================================================================
--- trunk/silo/debian/patches/series (original)
+++ trunk/silo/debian/patches/series Sat Jan 30 13:53:46 2010
@@ -1,0 +1,1 @@
+silo-linux-types.patch

Added: trunk/silo/debian/patches/silo-linux-types.patch
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/silo-linux-types.patch?rev=228&op=file
==============================================================================
--- trunk/silo/debian/patches/silo-linux-types.patch (added)
+++ trunk/silo/debian/patches/silo-linux-types.patch Sat Jan 30 13:53:46 2010
@@ -1,0 +1,25 @@
+diff -aur a/include/ext2fs/ext2fs.h b/include/ext2fs/ext2fs.h
+--- a/include/ext2fs/ext2fs.h	2010-01-30 13:40:56.000000000 +0000
++++ b/include/ext2fs/ext2fs.h	2010-01-30 13:47:54.000000000 +0000
+@@ -39,7 +39,7 @@
+  */
+ #define EXT2_LIB_CURRENT_REV	0
+ 
+-#if defined(HAVE_SYS_TYPES_H) && !defined(_LINUX_TYPES_H)
++#if defined(HAVE_SYS_TYPES_H)
+ #include <sys/types.h>
+ #endif
+ 
+diff -aur a/include/stringops.h b/include/stringops.h
+--- a/include/stringops.h	2010-01-30 13:40:56.000000000 +0000
++++ b/include/stringops.h	2010-01-30 13:47:25.000000000 +0000
+@@ -7,9 +7,7 @@
+ #ifndef __SIZE_TYPE__
+ #define __SIZE_TYPE__ long unsigned int
+ #endif
+-#ifndef _LINUX_TYPES_H
+ typedef __SIZE_TYPE__ size_t;
+-#endif
+ 
+ /* stringops1.c */
+ char *strcpy(char *, const char *);