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

[Robert Millan]

Author: rmh
Date: 2011-06-28 15:56:58 +0000 (Tue, 28 Jun 2011)
New Revision: 3495

Removed:
   trunk/kfreebsd-kernel-headers/debian/patches/041_printflike.patch
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Remove <sys/sbuf.h> again, now that libsbuf-dev provides a usable header.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-06-28 15:31:06 UTC (rev 3494)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-06-28 15:56:58 UTC (rev 3495)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.56) UNRELEASED; urgency=low
+
+  * Remove <sys/sbuf.h> again, now that libsbuf-dev provides a usable
+    header.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 17:56:32 +0200
+
 kfreebsd-kernel-headers (0.55) unstable; urgency=low
 
   * Swap build-arch and build-indep; install-arch and install-indep targets.

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2011-06-28 15:31:06 UTC (rev 3494)
+++ trunk/kfreebsd-kernel-headers/debian/install	2011-06-28 15:56:58 UTC (rev 3495)
@@ -266,8 +266,6 @@
 sys/sys/rman.h                          usr/include/sys
 sys/sys/rtprio.h                        usr/include/sys
 sys/sys/runq.h                          usr/include/sys
-# XXX: Remove sys/sbuf.h eventually, now provided by libsbuf-dev
-sys/sys/sbuf.h                          usr/include/sys
 sys/sys/sdt.h                           usr/include/sys
 sys/sys/selinfo.h                       usr/include/sys
 sys/sys/sigio.h                         usr/include/sys

Deleted: trunk/kfreebsd-kernel-headers/debian/patches/041_printflike.patch
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/041_printflike.patch	2011-06-28 15:31:06 UTC (rev 3494)
+++ trunk/kfreebsd-kernel-headers/debian/patches/041_printflike.patch	2011-06-28 15:56:58 UTC (rev 3495)
@@ -1,19 +0,0 @@
----
- sys/sys/sbuf.h |    8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/sys/sys/sbuf.h
-+++ b/sys/sys/sbuf.h
-@@ -64,10 +64,8 @@ int		 sbuf_bcat(struct sbuf *, const voi
- int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
- int		 sbuf_cat(struct sbuf *, const char *);
- int		 sbuf_cpy(struct sbuf *, const char *);
--int		 sbuf_printf(struct sbuf *, const char *, ...)
--	__printflike(2, 3);
--int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
--	__printflike(2, 0);
-+int		 sbuf_printf(struct sbuf *, const char *, ...);
-+int		 sbuf_vprintf(struct sbuf *, const char *, __va_list);
- int		 sbuf_putc(struct sbuf *, int);
- int		 sbuf_trim(struct sbuf *);
- int		 sbuf_overflowed(struct sbuf *);

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2011-06-28 15:31:06 UTC (rev 3494)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2011-06-28 15:56:58 UTC (rev 3495)
@@ -36,4 +36,3 @@
 038_gnuclike.diff
 #039_mips_misc.diff
 040_internal_types.patch
-041_printflike.patch