Pkg xen changes - Mar 2006 - r85 - branches/20060307-fern/xen-3.0/debian

Author: tha-guest
Date: 2006-03-07 11:22:40 +0000 (Tue, 07 Mar 2006)
New Revision: 85

Modified:
   branches/20060307-fern/xen-3.0/debian/control
Log:
- updated debian/control to have better conflicts & added
  the "linux-xen0-2.6 | kernel-xen0-2.6" suggestion again.


Modified: branches/20060307-fern/xen-3.0/debian/control
==================================================================---
branches/20060307-fern/xen-3.0/debian/control	2006-03-07 11:20:37 UTC (rev 84)
+++ branches/20060307-fern/xen-3.0/debian/control	2006-03-07 11:22:40 UTC (rev
85)
@@ -24,9 +24,9 @@
 Section: misc
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}
-Suggests: linux-xen0-2.6
+Suggests: linux-xen0-2.6 | kernel-xen0-2.6
 Provides: xen-hypervisor
-Conflicts: xen (<< 3.0.1)
+Conflicts: xen (<< ${Source-Version})
 Replaces: xen
 Recommends: grub
 Description: The Xen Hypervisor
@@ -46,9 +46,9 @@
 Section: misc
 Architecture: i386
 Depends: ${shlibs:Depends}
-Suggests: linux-xen0-2.6
+Suggests: linux-xen0-2.6 | kernel-xen0-2.6
 Provides: xen-hypervisor-3.0, xen-hypervisor
-Conflicts: xen (<< 3.0.1)
+Conflicts: xen (<< ${Source-Version})
 Replaces: xen
 Recommends: grub
 Description: The Xen Hypervisor (pae enabled version)
@@ -68,10 +68,10 @@
 Package: xen-utils-3.0
 Section: misc
 Architecture: i386 amd64
-Depends: xen-hypervisor-3.0,  python-twisted, python, libxen-python, iproute,
hotplug | udev, ${shlibs:Depends}
+Depends: xen-hypervisor-3.0, python-twisted, python, libxen-python, iproute,
hotplug | udev, ${shlibs:Depends}
 Recommends: bridge-utils
 Provides: xen-utils
-Conflicts: udev (<< 0.059)
+Conflicts: udev (<< 0.059), xen (<< ${Source-Version})
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.