Things that are not the same: Conflicts. Depends.

svn path=/trunk/packages/invirt-autoinstaller/; revision=2125

diff --git a/debian/changelog b/debian/changelog
index 809b386..5d1c2c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-autoinstaller (0.0.12) unstable; urgency=low
+
+  * TTANTS: Conflicts. Depends.
+
+ --
+
 invirt-autoinstaller (0.0.11) unstable; urgency=low
 
   * Require aptitude in the autoinstaller guest - and use it in

diff --git a/debian/control b/debian/control
index 2b53494..725fcb8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Description: SIPB Xen automatic guest-image installer system (host)
 Package: invirt-autoinstaller-guest
 Architecture: all
 Provides: ${diverted-files}
-Conflicts: ${diverted-files}, aptitude, sysvinit, upstart, xen-hypervisor
-Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2, kpartx
+Conflicts: ${diverted-files}, sysvinit, upstart, xen-hypervisor
+Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2, kpartx, aptitude
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.