From: Evan Broder <broder@mit.edu>
Date: Sun, 15 Feb 2009 03:38:09 +0000 (-0500)
Subject: Things that are not the same: Conflicts. Depends.
X-Git-Tag: 0.0.12~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-autoinstaller.git/commitdiff_plain/d20f5d4a78432418d5208ec2fa32023e1c3834cc?ds=sidebyside

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
--- 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
--- 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.