Ignore:
Timestamp:
Sep 28, 2008, 5:22:00 PM (16 years ago)
Author:
price
Message:

fold duplicate Conflicts: lines, to make newer debuild happy

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

Location:
trunk/packages/sipb-xen-autoinstaller/debian
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/sipb-xen-autoinstaller/debian/control

    r929 r932  
    1111Conflicts: ${diverted-files}
    1212Depends: ${misc:Depends}, patch, xen-tools, sipb-xen-dom0
    13 Conflicts: sysvinit, upstart
    1413Description: SIPB Xen automatic guest-image installer system (host)
    1514 This is our automatic guest-image installer system.
    … …  
    1817Architecture: all
    1918Provides: ${diverted-files}
    20 Conflicts: ${diverted-files}
     19Conflicts: ${diverted-files}, sysvinit, upstart
    2120Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2
    22 Conflicts: sysvinit, upstart
    2321Description: SIPB Xen automatic guest-image installer system (guest)
    2422 This is our automatic guest-image installer system.

  • trunk/packages/sipb-xen-autoinstaller/debian/control.in

    r929 r932  
    1111Conflicts: ${diverted-files}
    1212Depends: ${misc:Depends}, patch, xen-tools, sipb-xen-dom0
    13 Conflicts: sysvinit, upstart
    1413Description: SIPB Xen automatic guest-image installer system (host)
    1514 This is our automatic guest-image installer system.
    … …  
    1817Architecture: all
    1918Provides: ${diverted-files}
    20 Conflicts: ${diverted-files}
     19Conflicts: ${diverted-files}, sysvinit, upstart
    2120Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2
    22 Conflicts: sysvinit, upstart
    2321Description: SIPB Xen automatic guest-image installer system (guest)
    2422 This is our automatic guest-image installer system.
Note: See TracChangeset for help on using the changeset viewer.