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

[Aurelien Jarno]

Author: aurel32
Date: 2009-12-09 12:06:22 +0000 (Wed, 09 Dec 2009)
New Revision: 2896

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
Log:
  * freebsd-utils: conflicts with module-init-tools (closes: #559344). 



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2009-12-09 11:10:02 UTC (rev 2895)
+++ trunk/freebsd-utils/debian/changelog	2009-12-09 12:06:22 UTC (rev 2896)
@@ -2,8 +2,9 @@
 
   * freebsd-utils.init: fix quoting, and use a symbolic links instead
     of an hardlink (closes: #560125).
+  * freebsd-utils: conflicts with module-init-tools (closes: #559344). 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 09 Dec 2009 12:06:20 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 09 Dec 2009 13:06:02 +0100
 
 freebsd-utils (8.0-1) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2009-12-09 11:10:02 UTC (rev 2895)
+++ trunk/freebsd-utils/debian/control	2009-12-09 12:06:22 UTC (rev 2896)
@@ -44,6 +44,7 @@
 Priority: important
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: freebsd-utils, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: module-init-tools
 Replaces: module-init-tools, freebsd-utils (<= 5.2.1-16),
  freebsd-hackedutils (<= 6.1-1), kfreebsd-common (<< 6.1-6)
 Provides: module-init-tools