Merge branch 'master' of gitorious.org:xen-tools/xen-tools

Conflicts:
	debian/changelog

README

@@ -19,20 +19,21 @@ About:
 
   xen-tools currently has scripts to install most releases of Debian
  (starting with 3.1 "Sarge") and Ubuntu (starting with 6.06 LTS
- "Dapper") and some RPM-based distributions.
+ "Dapper") and some RPM-based distributions. On the Dom0 side all
+ current Xen supporting distributions should work.
 
   However, currently only Debian and Ubuntu releases are tested and
  known to work, i.e.:
 
 	Debian:
-	  * Sarge 3.1 (i386 only)
-	  * Etch 4.0
+	  * Sarge 3.1 (i386 and DomU only)
+	  * Etch 4.0 (Dom0 no more tested)
 	  * Lenny 5.0
 	  * Squeeze 6.0
 	  * Wheezy 7.0 (preliminary support as it's not yet available)
 	  * Sid (works at least at the moment of writing :-)
 
-	Ubuntu:
+	Ubuntu (only DomUs tested):
 	  * Dapper Drake 6.06
 	  * Edgy Eft 6.10
 	  * Feisty Fawn 7.04

debian/changelog

@@ -4,6 +4,8 @@ xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low
     - Correctly checks and documents valid values for
       disk_device. (Closes: #621499)
   * Support creating Ubuntu 11.10 Oneiric DomUs (LP: #848654)
+  * No more suggest evms-cli -- it's no more available on any supported
+    Dom0 distribution. Thanks to Markus Waldeck for the hint.
   * Fix Lintian warning copyright-refers-to-symlink-license.
 
  -- Axel Beckert <abe@debian.org>  Tue, 13 Sep 2011 15:50:59 +0200

debian/control

@@ -12,7 +12,7 @@ Package: xen-tools
 Architecture: all
 Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}
 Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse, xen-shell, libexpect-perl
-Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2, evms-cli, btrfs-tools
+Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2, btrfs-tools
 Description: Tools to manage Xen virtual servers
  This package contains tools to manage Debian based Xen virtual servers.
  .