[Pkg-xen-changes] r1078 - in branches/wheezy/xen/debian: . templates

[Bastian Blank]

Author: waldi
Date: Fri Jul 27 10:32:22 2012
New Revision: 1078

Log:
Revert revision 1075.

Modified:
   branches/wheezy/xen/debian/changelog
   branches/wheezy/xen/debian/templates/control.hypervisor.in
   branches/wheezy/xen/debian/templates/control.utils.in

Modified: branches/wheezy/xen/debian/changelog
==============================================================================
--- branches/wheezy/xen/debian/changelog	Fri Jul 27 10:29:55 2012	(r1077)
+++ branches/wheezy/xen/debian/changelog	Fri Jul 27 10:32:22 2012	(r1078)
@@ -2,9 +2,7 @@
 
   [ Ian Campbell ]
   * Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
-  * Make xen-hypervisor-$flavour a real package and make hypervisor and tools
-    packages mutually dependent rather than recommending each other. This
-    improves upgrade (Closes: #681376)
+  * Make xen-hypervisor-$flavour a real package to aid upgrade (Closes: #681376)
   * Only run xendomains initscript if toolstack is xl or xm (Closes: #680528)
 
   [ Bastian Blank ]

Modified: branches/wheezy/xen/debian/templates/control.hypervisor.in
==============================================================================
--- branches/wheezy/xen/debian/templates/control.hypervisor.in	Fri Jul 27 10:29:55 2012	(r1077)
+++ branches/wheezy/xen/debian/templates/control.hypervisor.in	Fri Jul 27 10:32:22 2012	(r1078)
@@ -1,6 +1,7 @@
 Package: xen-hypervisor- at version@@localversion@
-Depends: ${misc:Depends}, xen-utils- at version@
+Depends: ${misc:Depends}
 Provides: xen-hypervisor, xen-hypervisor- at version@
+Recommends: xen-utils- at version@
 Suggests: xen-docs- at version@
 Description: Xen Hypervisor on @class@
  The hypervisor is the "core" for XEN itself. It gets booted by the boot loader

Modified: branches/wheezy/xen/debian/templates/control.utils.in
==============================================================================
--- branches/wheezy/xen/debian/templates/control.utils.in	Fri Jul 27 10:29:55 2012	(r1077)
+++ branches/wheezy/xen/debian/templates/control.utils.in	Fri Jul 27 10:32:22 2012	(r1078)
@@ -1,6 +1,6 @@
 Package: xen-utils- at version@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-hypervisor- at version@, xen-utils-common (>= ${source:Version})
-Recommends: bridge-utils, libc6-xen [i386], qemu-keymaps, qemu-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version})
+Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at version@, qemu-keymaps, qemu-utils
 Provides: xen-utils
 Suggests: xen-docs- at version@
 Built-Using: ${misc:Built-Using}