[Glibc-bsd-commits] r1796 - in trunk: kfreebsd-5/debian kfreebsd-6 kfreebsd-6/debian kfreebsd-7/debian

[Aurelien Jarno]

Author: aurel32
Date: 2006-12-12 15:46:06 +0100 (Tue, 12 Dec 2006)
New Revision: 1796

Modified:
   trunk/kfreebsd-5/debian/changelog
   trunk/kfreebsd-5/debian/control.flavor.in
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/control.flavor.in
   trunk/kfreebsd-6/freebsd-6.2.txt
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/control.flavor.in
Log:
  * Remove kldutils from the dependencies alternatives.



Modified: trunk/kfreebsd-5/debian/changelog
===================================================================
--- trunk/kfreebsd-5/debian/changelog	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-5/debian/changelog	2006-12-12 14:46:06 UTC (rev 1796)
@@ -1,3 +1,9 @@
+kfreebsd-5 (5.4-22) UNRELEASED; urgency=low
+
+  * Remove kldutils from the depencies alternatives.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 12 Dec 2006 15:42:41 +0100
+
 kfreebsd-5 (5.4-21) unstable; urgency=high
 
   * Urgency set to high as this fixes a security bug.

Modified: trunk/kfreebsd-5/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-5/debian/control.flavor.in	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-5/debian/control.flavor.in	2006-12-12 14:46:06 UTC (rev 1796)
@@ -1,7 +1,7 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
 Section: base
-Depends: freebsd-utils (>= 5), module-init-tools | kldutils (>= @version@)
+Depends: freebsd-utils (>= 5), module-init-tools
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Conflicts: kfreebsd5, kfreebsd-image
 Replaces: kfreebsd5

Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-6/debian/changelog	2006-12-12 14:46:06 UTC (rev 1796)
@@ -1,3 +1,9 @@
+kfreebsd-6 (6.1-2) UNRELEASED; urgency=low
+
+  * Remove kldutils from the dependencies alternatives.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 12 Dec 2006 15:43:24 +0100
+
 kfreebsd-6 (6.1-1) unreleased; urgency=low
 
   * Urgency set to high as this fixes a security bug.

Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-6/debian/control.flavor.in	2006-12-12 14:46:06 UTC (rev 1796)
@@ -1,7 +1,7 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
 Section: base
-Depends: freebsd-utils (>= 5), module-init-tools | kldutils, kfreebsd-common (>= 0.2.2)
+Depends: freebsd-utils (>= 5), module-init-tools, kfreebsd-common (>= 0.2.2)
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@

Modified: trunk/kfreebsd-6/freebsd-6.2.txt
===================================================================
--- trunk/kfreebsd-6/freebsd-6.2.txt	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-6/freebsd-6.2.txt	2006-12-12 14:46:06 UTC (rev 1796)
@@ -14,6 +14,7 @@
 	000_net.diff
 	000_ppp.diff
 	000_smbfs.diff
+	000_kmem.diff
 	002_glibc_dev_isp.diff
 	006_proc_mounts.diff
 

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-7/debian/changelog	2006-12-12 14:46:06 UTC (rev 1796)
@@ -1,3 +1,9 @@
+kfreebsd-7 (6.99+20060506-0.2) UNRELEASED; urgency=low
+
+  * Remove kldutils from the dependencies alternatives.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 12 Dec 2006 15:44:22 +0100
+
 kfreebsd-7 (6.99+20060506-0.1) unreleased; urgency=low
 
   * Fork for 7-CURRENT, based on r1560.

Modified: trunk/kfreebsd-7/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-7/debian/control.flavor.in	2006-12-12 09:35:34 UTC (rev 1795)
+++ trunk/kfreebsd-7/debian/control.flavor.in	2006-12-12 14:46:06 UTC (rev 1796)
@@ -1,7 +1,7 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
 Section: base
-Depends: freebsd-utils (>= 5), module-init-tools | kldutils, kfreebsd-common (>= 0.2.2)
+Depends: freebsd-utils (>= 5), module-init-tools, kfreebsd-common (>= 0.2.2)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image