[Glibc-bsd-commits] r3500 - in trunk: freebsd-utils/debian kfreebsd-8/debian kfreebsd-9/debian

[Robert Millan]

Author: rmh
Date: 2011-06-28 16:38:43 +0000 (Tue, 28 Jun 2011)
New Revision: 3500

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.in
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/control.in
Log:
Require either libsbuf-dev or kfreebsd-kernel-headers that provides a valid <sys/sbuf.h>.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-06-28 16:35:02 UTC (rev 3499)
+++ trunk/freebsd-utils/debian/changelog	2011-06-28 16:38:43 UTC (rev 3500)
@@ -13,8 +13,10 @@
     by libbsd, pf_ruleset.c is imported from upstream source.
   * Provide config files and init.d script for devd.  (Closes: #630614)
   * Add Dutch Debconf translation from Jeroen Schot.  (Closes: #631122)
+  * Require either libsbuf-dev or kfreebsd-kernel-headers that provides
+    a valid <sys/sbuf.h>.
 
- -- Robert Millan <rmh at debian.org>  Mon, 27 Jun 2011 20:52:13 +0200
+ -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 18:38:06 +0200
 
 freebsd-utils (8.2-2) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2011-06-28 16:35:02 UTC (rev 3499)
+++ trunk/freebsd-utils/debian/control	2011-06-28 16:38:43 UTC (rev 3500)
@@ -23,8 +23,8 @@
  libdevstat-dev,
 # libgeom-dev : ccdconfig
  libgeom-dev,
-# libsbuf-dev: mdconfig
- libsbuf-dev (>= 8.2),
+# libsbuf-dev: ifconfig, mdconfig
+ libsbuf-dev (>= 8.2), libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),
 # libcam-dev: camcontrol
  libcam-dev (>= 8.2),
 # libedit-dev: pppctl

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-06-28 16:35:02 UTC (rev 3499)
+++ trunk/kfreebsd-8/debian/changelog	2011-06-28 16:38:43 UTC (rev 3500)
@@ -3,8 +3,10 @@
   * Add sys/conf/kmod_syms.awk, sys/kern/bus_if.m, sys/dev/pci/pci_if.m,
     sys/kern/device_if.m, sys/tools/makeobjops.awk and sys/machine symlink
     to header package.
+  * Require either libsbuf-dev or kfreebsd-kernel-headers that provides
+    a valid <sys/sbuf.h>.
 
- -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 17:28:42 +0200
+ -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 18:37:30 +0200
 
 kfreebsd-8 (8.2-3) unstable; urgency=medium
 

Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in	2011-06-28 16:35:02 UTC (rev 3499)
+++ trunk/kfreebsd-8/debian/control.in	2011-06-28 16:38:43 UTC (rev 3500)
@@ -8,7 +8,8 @@
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
  gcc- at gcc_version@, libdb-dev,
- libbsd-dev, libsbuf-dev
+ libbsd-dev,
+ libsbuf-dev, libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),
 Standards-Version: 3.9.2
 
 Package: kfreebsd-source- at version@

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-06-28 16:35:02 UTC (rev 3499)
+++ trunk/kfreebsd-9/debian/changelog	2011-06-28 16:38:43 UTC (rev 3500)
@@ -3,8 +3,10 @@
   * Add sys/conf/kmod_syms.awk, sys/kern/bus_if.m, sys/dev/pci/pci_if.m,
     sys/kern/device_if.m, sys/tools/makeobjops.awk and sys/machine
     symlink to header package.
+  * Require either libsbuf-dev or kfreebsd-kernel-headers that provides
+    a valid <sys/sbuf.h>.
 
- -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 17:30:31 +0200
+ -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 18:38:14 +0200
 
 kfreebsd-9 (9.0~svn223502-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-9/debian/control.in
===================================================================
--- trunk/kfreebsd-9/debian/control.in	2011-06-28 16:35:02 UTC (rev 3499)
+++ trunk/kfreebsd-9/debian/control.in	2011-06-28 16:38:43 UTC (rev 3500)
@@ -8,7 +8,8 @@
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
  gcc- at gcc_version@, libdb-dev,
- libbsd-dev, libsbuf-dev
+ libbsd-dev,
+ libsbuf-dev, libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),
 Standards-Version: 3.9.2
 
 Package: kfreebsd-source- at version@