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

[Robert Millan]

Author: rmh
Date: 2012-01-17 19:39:07 +0000 (Tue, 17 Jan 2012)
New Revision: 3979

Removed:
   trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/series
Log:
Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-01-17 19:26:49 UTC (rev 3978)
+++ trunk/freebsd-libs/debian/changelog	2012-01-17 19:39:07 UTC (rev 3979)
@@ -1,3 +1,9 @@
+freebsd-libs (8.3~svn229725-3) UNRELEASED; urgency=low
+
+  * Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 17 Jan 2012 20:39:00 +0100
+
 freebsd-libs (8.3~svn229725-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2012-01-17 19:26:49 UTC (rev 3978)
+++ trunk/freebsd-libs/debian/control	2012-01-17 19:39:07 UTC (rev 3979)
@@ -7,7 +7,7 @@
  libbsd-dev (>= 0.3.0),
  libc0.1-dev (>= 2.13-0exp2) [kfreebsd-any],
  libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 0.54) [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 0.63) [kfreebsd-any],
 # libexpat-dev: aka bsdxml. needed by libgeom
  libexpat-dev [kfreebsd-any],
 # libncurses5-dev: needed by libalias

Deleted: trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff	2012-01-17 19:26:49 UTC (rev 3978)
+++ trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff	2012-01-17 19:39:07 UTC (rev 3979)
@@ -1,15 +0,0 @@
-
-USB_FS_MAX_FRAMES_PRE_SCALE is only available with
-kfreebsd-kernel-headers >= 8.3
-
---- a/lib/libusb/libusb20_ugen20.c
-+++ b/lib/libusb/libusb20_ugen20.c
-@@ -747,7 +747,7 @@
- 	struct usb_fs_endpoint *fsep;
- 
- 	if (pre_scale)
--		MaxFrameCount |= USB_FS_MAX_FRAMES_PRE_SCALE;
-+		MaxFrameCount |= (1U << 31);
- 
- 	memset(&temp, 0, sizeof(temp));
- 

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2012-01-17 19:26:49 UTC (rev 3978)
+++ trunk/freebsd-libs/debian/patches/series	2012-01-17 19:39:07 UTC (rev 3979)
@@ -13,4 +13,3 @@
 12_usb.diff
 13_jail.diff
 14_alias.diff
-15_kkh_kludge.diff