[Glibc-bsd-commits] r3267 - in trunk/freebsd-libs/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2011-02-17 09:20:52 +0000 (Thu, 17 Feb 2011)
New Revision: 3267

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/12_usb.diff
   trunk/freebsd-libs/debian/rules
Log:
freebsd-libs based on 8.2


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-02-17 09:17:54 UTC (rev 3266)
+++ trunk/freebsd-libs/debian/changelog	2011-02-17 09:20:52 UTC (rev 3267)
@@ -1,4 +1,4 @@
-freebsd-libs (8.1-6) UNRELEASED; urgency=low
+freebsd-libs (8.2-1) UNRELEASED; urgency=low
 
   * Build libsbuf-dev on non-kFreeBSD systems.  (Closes: #602766)
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2011-02-17 09:17:54 UTC (rev 3266)
+++ trunk/freebsd-libs/debian/control	2011-02-17 09:20:52 UTC (rev 3267)
@@ -7,7 +7,7 @@
  libbsd-dev (>= 0.1.4) [kfreebsd-any],
  libc0.1-dev (>= 2.10) [kfreebsd-any],
  libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 0.51) [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 0.54) [kfreebsd-any],
  libexpat-dev [kfreebsd-any]
 # libexpat-dev: aka bsdxml. needed by libgeom
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-libs/

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2011-02-17 09:17:54 UTC (rev 3266)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2011-02-17 09:20:52 UTC (rev 3267)
@@ -1,16 +1,14 @@
 --- a/lib/libusb/usb.h
 +++ b/lib/libusb/usb.h
-@@ -27,8 +27,8 @@
- #ifndef _LIBUSB20_COMPAT_01_H_
+@@ -28,7 +28,7 @@
  #define	_LIBUSB20_COMPAT_01_H_
  
--#include <sys/stdint.h>
+ #include <sys/param.h>
 -#include <sys/endian.h>
-+#include <stdint.h>
 +#include <endian.h>
- #include <sys/types.h>
- #include <sys/param.h>
  
+ #include <stdint.h>
+ 
 --- a/lib/libusb/Makefile
 +++ b/lib/libusb/Makefile
 @@ -15,6 +15,7 @@
@@ -23,7 +21,7 @@
  
 --- a/lib/libusb/libusb20.c
 +++ b/lib/libusb/libusb20.c
-@@ -1166,7 +1166,7 @@ libusb20_be_alloc_ugen20(void)
+@@ -1167,7 +1167,7 @@
  {
  	struct libusb20_backend *pbe;
  

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2011-02-17 09:17:54 UTC (rev 3266)
+++ trunk/freebsd-libs/debian/rules	2011-02-17 09:20:52 UTC (rev 3267)
@@ -9,7 +9,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0