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

[Aurelien Jarno]

Author: aurel32
Date: 2006-12-19 16:37:39 +0100 (Tue, 19 Dec 2006)
New Revision: 1811

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
Log:
  * Conflicts with inetutils-tools (<= inetutils-tools_2:1.4.3+20051212-4).
  * Bump the Replaces: freebsd-hackedutils to 6.1-1 (for kfreebsd-amd64).



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-12-19 14:40:22 UTC (rev 1810)
+++ trunk/freebsd-utils/debian/changelog	2006-12-19 15:37:39 UTC (rev 1811)
@@ -1,3 +1,10 @@
+freebsd-utils (6.1-7) unreleased; urgency=low
+
+  * Conflicts with inetutils-tools (<= inetutils-tools_2:1.4.3+20051212-4).
+  * Bump the Replaces: freebsd-hackedutils to 6.1-1 (for kfreebsd-amd64).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 19 Dec 2006 15:52:12 +0100
+
 freebsd-utils (6.1-6) unreleased; urgency=low
 
   * Merge stuff from kfreebsd-common concerning modules into

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-12-19 14:40:22 UTC (rev 1810)
+++ trunk/freebsd-utils/debian/control	2006-12-19 15:37:39 UTC (rev 1811)
@@ -16,8 +16,9 @@
 Priority: required
 Essential: yes
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, freebsd-hackedutils (>= 5.2.1-31)
-Replaces: freebsd-hackedutils (<= 5.2.1-30)
+Depends: ${shlibs:Depends}, freebsd-hackedutils (>= 6.1-1)
+Conflicts: inetutils-tools (<= inetutils-tools_2:1.4.3+20051212-4)
+Replaces: freebsd-hackedutils (<= 6.1-1)
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
  This package contains FreeBSD utilities needed for GNU/kFreeBSD.
 
@@ -25,7 +26,7 @@
 Priority: important
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, debconf, kfreebsd-image
-Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16), freebsd-hackedutils (<= 5.2.1-32), kfreebsd-common (<< 6.1-6)
+Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16), freebsd-hackedutils (<= 6.1-1), kfreebsd-common (<< 6.1-6)
 Description: tools for managing kFreeBSD modules
  This package contains a set of programs for loading, inserting, and
  removing kernel modules for kFreeBSD.
@@ -61,7 +62,7 @@
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6.ds1-9)
 # libc0.1 for ifconfig fixed in 2.3.6.ds1-9
-Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 5.2.1-32)
+Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 6.1-1)
 Description: FreeBSD networking tools
  This package contains the FreeBSD tools needed to manage networking on
  GNU/kFreeBSD.