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

[Petr Salinger]

Author: ps-guest
Date: 2009-12-04 09:18:50 +0000 (Fri, 04 Dec 2009)
New Revision: 2879

Added:
   trunk/freebsd-libs/debian/libusb2-dev.install
   trunk/freebsd-libs/debian/libusb2.install
   trunk/freebsd-libs/debian/patches/12_usb.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
* add libusb2 and libusb2-dev packages



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2009-12-04 08:41:46 UTC (rev 2878)
+++ trunk/freebsd-libs/debian/changelog	2009-12-04 09:18:50 UTC (rev 2879)
@@ -1,3 +1,11 @@
+freebsd-libs (8.0-3) UNSTABLE; urgency=low
+
+  [ Petr Salinger ]
+  * bump build-depends on kfreebsd-kernel-headers to (>= 0.45)
+  * add libusb2 and libusb2???-dev packages
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 28 Nov 2009 22:42:32 +0100
+
 freebsd-libs (8.0-2) unstable; urgency=low
 
   * Bump build-depends on kfreebsd-kernel-headers to (>= 0.43).

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2009-12-04 08:41:46 UTC (rev 2878)
+++ trunk/freebsd-libs/debian/control	2009-12-04 09:18:50 UTC (rev 2879)
@@ -4,7 +4,7 @@
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
 Build-Depends: debhelper (>= 5.0.0), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
- libc0.1-dev (>= 2.10), libgdbm-dev, kfreebsd-kernel-headers (>= 0.34), libexpat-dev
+ libc0.1-dev (>= 2.10), libgdbm-dev, kfreebsd-kernel-headers (>= 0.45), libexpat-dev
 # libexpat-dev: aka bsdxml. needed by libgeom
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-libs/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-libs/
@@ -76,6 +76,24 @@
  This package contains the header files and static library needed to
  compile applications that use libusbhid.
 
+Package: libusb2
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: FreeBSD userspace USB programming library
+ Library for programming USB applications without the knowledge
+ of FreeBSD kernel internals.
+ .
+ It should be API compatible with both libusb-1.0 and libusb-0.1
+ used on Linux.
+
+Package: libusb2-dev
+Section: libdevel
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: libusb2 (= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Description: Development files for libusb2
+ This package contains the header files and static library needed to
+ compile applications that use libusb2.
+
 Package: libkvm0
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}

Added: trunk/freebsd-libs/debian/libusb2-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-dev.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusb2-dev.install	2009-12-04 09:18:50 UTC (rev 2879)
@@ -0,0 +1,6 @@
+usr/lib/libusb*.so
+usr/lib/libusb*.a
+usr/include/*.h
+usr/share/man/man3/usb.3.gz
+usr/share/man/man3/libusb.3.gz
+usr/share/man/man3/libusb20.3.gz

Added: trunk/freebsd-libs/debian/libusb2.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusb2.install	2009-12-04 09:18:50 UTC (rev 2879)
@@ -0,0 +1 @@
+usr/lib/libusb*.so.*

Added: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2009-12-04 09:18:50 UTC (rev 2879)
@@ -0,0 +1,23 @@
+--- a/lib/libusb/usb.h
++++ b/lib/libusb/usb.h
+@@ -27,8 +27,8 @@
+ #ifndef _LIBUSB20_COMPAT_01_H_
+ #define	_LIBUSB20_COMPAT_01_H_
+ 
+-#include <sys/stdint.h>
+-#include <sys/endian.h>
++#include <stdint.h>
++#include <endian.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+--- a/lib/libusb/Makefile
++++ b/lib/libusb/Makefile
+@@ -15,6 +15,7 @@
+ MAN=		libusb.3 libusb20.3
+ MKLINT=		no
+ NOGCCERROR=
++LDADD+=		-lpthread -lrt -lbsd
+ 
+ MLINKS+=	libusb.3 usb.3
+ 

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2009-12-04 08:41:46 UTC (rev 2878)
+++ trunk/freebsd-libs/debian/patches/series	2009-12-04 09:18:50 UTC (rev 2879)
@@ -8,3 +8,4 @@
 09_libusbhid.diff
 10_memstat.diff
 11_netgraph.diff
+12_usb.diff

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2009-12-04 08:41:46 UTC (rev 2878)
+++ trunk/freebsd-libs/debian/rules	2009-12-04 09:18:50 UTC (rev 2879)
@@ -50,7 +50,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch $@
 
-build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat build-memstat build-netgraph
+build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph
 
 build-cam: build-cam-stamp
 build-cam-stamp: patch build-sbuf
@@ -102,6 +102,11 @@
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid
 	touch $@
 
+build-usb: build-usb-stamp
+build-usb-stamp: patch
+	$(PMAKE) -C $(CURDIR)/lib/libusb
+	touch $@
+
 build-indep: build-indep-stamp
 build-indep-stamp:
 	touch $@
@@ -119,6 +124,7 @@
 	$(PMAKE) -C $(CURDIR)/lib/libkvm clean
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf clean
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid clean
+	$(PMAKE) -C $(CURDIR)/lib/libusb clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -rf .pc
 	rm -f *stamp
@@ -144,6 +150,7 @@
 	$(PMAKE) -C $(CURDIR)/lib/libmemstat install
 	$(PMAKE) -C $(CURDIR)/lib/libnetgraph install
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid install
+	$(PMAKE) -C $(CURDIR)/lib/libusb install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp