From: Greg Price <price@mit.edu>
Date: Sun, 28 Sep 2008 21:22:00 +0000 (-0400)
Subject: fold duplicate Conflicts: lines, to make newer debuild happy
X-Git-Tag: sipb-xen-autoinstaller/2.5~6
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-autoinstaller.git/commitdiff_plain/381f3957e8341a6b5d3c523a83a8dcbe9d36fcc8?ds=sidebyside

fold duplicate Conflicts: lines, to make newer debuild happy

Also remove a false Conflicts in -host, that I got by copy-pasting.

svn path=/trunk/packages/sipb-xen-autoinstaller/; revision=932
---

diff --git a/debian/control b/debian/control
index 424ff19..9fdb412 100644
--- a/debian/control
+++ b/debian/control
@@ -10,15 +10,13 @@ Architecture: all
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Depends: ${misc:Depends}, patch, xen-tools, sipb-xen-dom0
-Conflicts: sysvinit, upstart
 Description: SIPB Xen automatic guest-image installer system (host)
  This is our automatic guest-image installer system.
 
 Package: sipb-xen-autoinstaller-guest
 Architecture: all
 Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Conflicts: ${diverted-files}, sysvinit, upstart
 Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2
-Conflicts: sysvinit, upstart
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.
diff --git a/debian/control.in b/debian/control.in
index 0f7c4d2..0fb3475 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,15 +10,13 @@ Architecture: all
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Depends: ${misc:Depends}, patch, xen-tools, sipb-xen-dom0
-Conflicts: sysvinit, upstart
 Description: SIPB Xen automatic guest-image installer system (host)
  This is our automatic guest-image installer system.
 
 Package: sipb-xen-autoinstaller-guest
 Architecture: all
 Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Conflicts: ${diverted-files}, sysvinit, upstart
 Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2
-Conflicts: sysvinit, upstart
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.