[Glibc-bsd-commits] r1677 - trunk/kfreebsd-6/debian

[Aurelien Jarno]

Author: aurel32
Date: 2006-10-10 13:25:25 +0000 (Tue, 10 Oct 2006)
New Revision: 1677

Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/control.flavor.in
Log:
  * Make the images conflict with freebsd-loader (<< 5.4-3).



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2006-10-10 13:23:28 UTC (rev 1676)
+++ trunk/kfreebsd-6/debian/changelog	2006-10-10 13:25:25 UTC (rev 1677)
@@ -1,13 +1,14 @@
 kfreebsd-6 (6.1-0.2) UNRELEASED; urgency=low
 
   [ Aurelien Jarno ]
-  * patches/999_config.diff: remove COMPAT_LINUX from amd64. 
+  * patches/999_config.diff: remove COMPAT_LINUX from amd64.
+  * Make the images conflict with freebsd-loader (<< 5.4-3).
 
   [ Petr Salinger ]
   * Fix buffer overflow in sppp (FreeBSD-SA-06:08.ppp / CVE-2006-4304).
   * Fix networking issues (FreeBSD-EN-06:02.net).
 
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 17 Aug 2006 11:48:07 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 10 Oct 2006 11:47:04 +0200
 
 kfreebsd-6 (6.1-0.1) unreleased; urgency=low
 

Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in	2006-10-10 13:23:28 UTC (rev 1676)
+++ trunk/kfreebsd-6/debian/control.flavor.in	2006-10-10 13:25:25 UTC (rev 1677)
@@ -2,6 +2,7 @@
 Architecture: kfreebsd- at arch@
 Section: base
 Depends: freebsd-utils (>= 5), module-init-tools | kldutils, kfreebsd-common (>= 0.2.2)
+Conflicts: freebsd-loader (<< 5.4-3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image