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

[Aurelien Jarno]

Author: aurel32
Date: 2006-10-10 13:33:54 +0000 (Tue, 10 Oct 2006)
New Revision: 1680

Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/control.flavor.in
Log:
s/freebsd-loader/kfreebsd-loader/g


Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2006-10-10 13:26:44 UTC (rev 1679)
+++ trunk/kfreebsd-6/debian/changelog	2006-10-10 13:33:54 UTC (rev 1680)
@@ -2,7 +2,7 @@
 
   [ Aurelien Jarno ]
   * patches/999_config.diff: remove COMPAT_LINUX from amd64.
-  * Make the images conflict with freebsd-loader (<< 5.4-3).
+  * Make the images conflict with kfreebsd-loader (<< 5.4-3).
 
   [ Petr Salinger ]
   * Fix buffer overflow in sppp (FreeBSD-SA-06:08.ppp / CVE-2006-4304).

Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in	2006-10-10 13:26:44 UTC (rev 1679)
+++ trunk/kfreebsd-6/debian/control.flavor.in	2006-10-10 13:33:54 UTC (rev 1680)
@@ -2,7 +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)
+Conflicts: kfreebsd-loader (<< 5.4-3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image