[Glibc-bsd-commits] r1552 - trunk/freebsd-utils/debian

[Robert Millan]

Author: rmh
Date: 2006-05-04 14:32:15 +0000 (Thu, 04 May 2006)
New Revision: 1552

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
Log:
Set versioned conflicts to (<< 6.0-2.really.5.4-0.6), and add changelog entry.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-05-04 11:43:10 UTC (rev 1551)
+++ trunk/freebsd-utils/debian/changelog	2006-05-04 14:32:15 UTC (rev 1552)
@@ -1,3 +1,11 @@
+freebsd-utils (6.0-2.really.5.4-0.7) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * Use versioned Conflicts, it allows to install both module-init-tools
+    and dummy kldutils.
+
+ -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 16:30:43 +0200
+
 freebsd-utils (6.0-2.really.5.4-0.6) unreleased; urgency=low
 
   * Add dummy kldutils package to facilitate upgrade (since, in some

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-05-04 11:43:10 UTC (rev 1551)
+++ trunk/freebsd-utils/debian/control	2006-05-04 14:32:15 UTC (rev 1552)
@@ -16,9 +16,8 @@
 Package: module-init-tools
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6-3+kbsd.r1365)
-Conflicts: kldutils (<< 6.0)
-Provides: kldutils
-Replaces: kldutils, freebsd-utils (<= 5.2.1-16)
+Conflicts: kldutils (<< 6.0-2.really.5.4-0.6)
+Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16)
 Description: tools for managing kFreeBSD modules
  This package contains a set of programs for loading, inserting, and
  removing kernel modules for kFreeBSD.