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

[Robert Millan]

Author: rmh
Date: 2013-11-06 10:29:43 +0000 (Wed, 06 Nov 2013)
New Revision: 5127

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/12_usb.diff
Log:
Remove unnecessary bits from 04_libkvm.diff and 12_usb.diff.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-11-05 13:36:30 UTC (rev 5126)
+++ trunk/freebsd-libs/debian/changelog	2013-11-06 10:29:43 UTC (rev 5127)
@@ -1,3 +1,9 @@
+freebsd-libs (9.2+ds1-7) UNRELEASED; urgency=low
+
+  * Remove unnecessary bits from 04_libkvm.diff and 12_usb.diff.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 06 Nov 2013 11:29:34 +0100
+
 freebsd-libs (9.2+ds1-6) unstable; urgency=low
 
   * Bump freebsd-glue Build-Depends on 0.1.14.

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2013-11-05 13:36:30 UTC (rev 5126)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2013-11-06 10:29:43 UTC (rev 5127)
@@ -1,12 +1,10 @@
 --- a/lib/libkvm/Makefile
 +++ b/lib/libkvm/Makefile
-@@ -2,8 +2,8 @@
- # $FreeBSD$
- 
+@@ -4,6 +4,7 @@
  LIB=	kvm
-+LDADD= -lbsd
  SHLIBDIR?= /lib
--CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
+ CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
++LDADD= -lbsd
  
  .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
  KVM_ARCH=${MACHINE_ARCH}

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2013-11-05 13:36:30 UTC (rev 5126)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2013-11-06 10:29:43 UTC (rev 5127)
@@ -1,14 +1,3 @@
---- a/lib/libusb/usb.h
-+++ b/lib/libusb/usb.h
-@@ -28,7 +28,7 @@
- #define	_LIBUSB20_COMPAT_01_H_
- 
- #include <sys/param.h>
--#include <sys/endian.h>
-+#include <endian.h>
- 
- #include <stdint.h>
- 
 --- a/lib/libusb/Makefile
 +++ b/lib/libusb/Makefile
 @@ -19,7 +19,7 @@