[Glibc-bsd-commits] r5758 - trunk/kfreebsd-kernel-headers/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-08-20 22:52:42 +0000 (Thu, 20 Aug 2015)
New Revision: 5758

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
Log:
Declare conflict against Linux libcap-dev, possible within a multi-
arch environment:
- sys/capability.h


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2015-08-20 13:41:27 UTC (rev 5757)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2015-08-20 22:52:42 UTC (rev 5758)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (10.1~6) UNRELEASED; urgency=medium
+
+  * Declare conflict against Linux libcap-dev, possible within a multi-
+    arch environment:
+    - sys/capability.h
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Thu, 20 Aug 2015 23:45:34 +0100
+
 kfreebsd-kernel-headers (10.1~5) unstable; urgency=medium
 
   * Make net/route.h compilable again in userland, by including

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2015-08-20 13:41:27 UTC (rev 5757)
+++ trunk/kfreebsd-kernel-headers/debian/control	2015-08-20 22:52:42 UTC (rev 5758)
@@ -20,6 +20,7 @@
 Architecture: kfreebsd-any
 Depends: ${misc:Depends}
 Replaces: libc0.1-dev (<= 2.3.6.ds1-8)
+Conflicts: libcap-dev
 Description: kFreeBSD headers for development
  This package provides headers from the kernel of FreeBSD. These headers
  are used by the installed headers for GNU glibc and other system libraries.