[Glibc-bsd-commits] r1866 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2007-01-12 15:26:58 +0100 (Fri, 12 Jan 2007)
New Revision: 1866

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
* kfreebsd-kernel-headers based on kfreebsd-source-6.2



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2007-01-12 14:13:20 UTC (rev 1865)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2007-01-12 14:26:58 UTC (rev 1866)
@@ -1,6 +1,7 @@
 kfreebsd-kernel-headers (0.26) UNRELEASED; urgency=low
 
   [ Petr Salinger ]
+  * based on kfreebsd-source-6.2
   * export <sys/tree.h> and <net/pfvar.h>, needed by pf
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Jan 2007 23:23:37 +0100

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2007-01-12 14:13:20 UTC (rev 1865)
+++ trunk/kfreebsd-kernel-headers/debian/control	2007-01-12 14:26:58 UTC (rev 1866)
@@ -3,7 +3,7 @@
 Priority: standard
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-6.1 (>= 6.1-3)
+Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-6.2
 Standards-Version: 3.7.2
 
 Package: kfreebsd-kernel-headers

Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2007-01-12 14:13:20 UTC (rev 1865)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2007-01-12 14:26:58 UTC (rev 1866)
@@ -58,7 +58,7 @@
 diff -ur sys.old/sys/_timeval.h sys/sys/_timeval.h
 --- sys.old/sys/_timeval.h	2005-08-17 16:32:17.000000000 +0200
 +++ sys/sys/_timeval.h	2005-08-22 23:13:47.000000000 +0200
-@@ -41,12 +41,6 @@
+@@ -41,16 +41,6 @@
  #define	_TIME_T_DECLARED
  #endif
  
@@ -66,7 +66,11 @@
 - * Structure returned by gettimeofday(2) system call, and used in other calls.
 - */
 -struct timeval {
+-#ifdef __arm__
+-	time_t		tv_sec;
+-#else
 -	long		tv_sec;		/* seconds (XXX should be time_t) */
+-#endif
 -	suseconds_t	tv_usec;	/* and microseconds */
 -};
 +#include <sys/time.h>

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2007-01-12 14:13:20 UTC (rev 1865)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2007-01-12 14:26:58 UTC (rev 1866)
@@ -8,8 +8,8 @@
 kfreebsd_cpu	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-kernel-headers
-SRC_TAR		:= /usr/src/kfreebsd-source-6.1.tar.bz2
-SRC_DIR		:= kfreebsd-source-6.1
+SRC_TAR		:= /usr/src/kfreebsd-source-6.2.tar.bz2
+SRC_DIR		:= kfreebsd-source-6.2
 
 clean:
 	dh_testdir