[Glibc-bsd-commits] r3305 - in trunk: freebsd-libs/debian kfreebsd-kernel-headers/debian

[Guillem Jover]

Author: guillem
Date: 2011-05-25 06:17:06 +0000 (Wed, 25 May 2011)
New Revision: 3305

Modified:
   trunk/freebsd-libs/debian/control
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
Log:
Do not remove <sys/sbuf.h> yet from kfreebsd-kernel-headers

Removing this file will cause a bootstrapping problem, and probable build
failures if the system ends up with a newer kfreebsd-kernel-headers and
an older libsbuf-dev. So let's keep it for now, and relax the Replaces
field in libsbuf-dev.


Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2011-05-25 06:04:56 UTC (rev 3304)
+++ trunk/freebsd-libs/debian/control	2011-05-25 06:17:06 UTC (rev 3305)
@@ -38,7 +38,7 @@
 Section: libdevel
 Architecture: any
 Depends: libsbuf0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Replaces: kfreebsd-kernel-headers (<< 0.54)
+Replaces: kfreebsd-kernel-headers
 Description: Development files for libsbuf
  This package contains the header files and static library needed to
  compile applications that use libsbuf.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-05-25 06:04:56 UTC (rev 3304)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-05-25 06:17:06 UTC (rev 3305)
@@ -7,7 +7,6 @@
 
   [ Robert Millan ]
   * Add <sys/kerneldump.h> for savecore (freebsd-utils).
-  * Remove <sys/sbuf.h> (now provided by libsbuf-dev).
   * start MIPS support.
 
  -- Robert Millan <rmh at debian.org>  Thu, 27 Jan 2011 16:16:03 +0100

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2011-05-25 06:04:56 UTC (rev 3304)
+++ trunk/kfreebsd-kernel-headers/debian/install	2011-05-25 06:17:06 UTC (rev 3305)
@@ -263,6 +263,8 @@
 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