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 (file)
--- 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
 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}
 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
 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.
 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 (file)
--- 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
 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}
 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
 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.
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.