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

[Robert Millan]

Author: rmh
Date: 2011-11-14 17:53:16 +0000 (Mon, 14 Nov 2011)
New Revision: 3859

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
Log:
Drop conflict on kfreebsd-headers (now a virtual package provided by kfreebsd-headers-*).

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-11-14 17:51:50 UTC (rev 3858)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-11-14 17:53:16 UTC (rev 3859)
@@ -1,8 +1,10 @@
 kfreebsd-kernel-headers (0.61) UNRELEASED; urgency=low
 
   * Remove dev/bktr/*.h, it isn't installed on FreeBSD.
+  * Drop conflict on kfreebsd-headers (now a virtual package provided by
+    kfreebsd-headers-*).
 
- -- Robert Millan <rmh at debian.org>  Sun, 13 Nov 2011 14:15:59 +0100
+ -- Robert Millan <rmh at debian.org>  Mon, 14 Nov 2011 18:53:05 +0100
 
 kfreebsd-kernel-headers (0.60) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2011-11-14 17:51:50 UTC (rev 3858)
+++ trunk/kfreebsd-kernel-headers/debian/control	2011-11-14 17:53:16 UTC (rev 3859)
@@ -11,8 +11,7 @@
 Package: kfreebsd-kernel-headers
 Architecture: kfreebsd-any
 Depends: ${misc:Depends}
-Replaces: kfreebsd-headers, libc0.1-dev (<= 2.3.6.ds1-8)
-Conflicts: kfreebsd-headers
+Replaces: libc0.1-dev (<= 2.3.6.ds1-8)
 Description: kernel of FreeBSD 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.