From: Hans van Kranenburg Date: Sat, 27 Jan 2018 23:21:20 +0000 (+0100) Subject: d/t/control-*: bump grub config incompat for now X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~112 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b50eb9c0f378350bb1b34b7a0d4b8edec8e32b9e;p=xen.git d/t/control-*: bump grub config incompat for now In 8c378bc011 I moved the grub config file that was wrongly placed inside the hypervisor package, and assumed that it would be fixed in a stable update, and that the orig tar would not change before that. However, we don't know yet what will happen in stretch security. So, don't assume the fix would happen in a specific version in stable. For now, bump the cutoff point all the way up to 4.10 so we can lower it again when the actual fix did happen in stretch. The end goal is to be able to upgrade from stretch to buster without this problem. As long as the fix didn't happen in stable, and we have a newer xen in unstable, the upgrade will hit the conflict. Signed-off-by: Hans van Kranenburg --- diff --git a/debian/templates/control.hypervisor.in b/debian/templates/control.hypervisor.in index e7ca119c81..e3f06079a1 100644 --- a/debian/templates/control.hypervisor.in +++ b/debian/templates/control.hypervisor.in @@ -1,6 +1,6 @@ Package: xen-hypervisor-@version@@localversion@ Depends: ${misc:Depends} -Breaks: xen-utils-common (<< 4.8.3~) +Breaks: xen-utils-common (<< 4.10.0~) Provides: xen-hypervisor, xen-hypervisor-@version@, xen-hypervisor@localversion@ Recommends: xen-utils-@version@ Description: Xen Hypervisor on @class@ diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 20dcdce9a1..c368156f4a 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -52,8 +52,8 @@ Description: Xenstore command line utilities for Xen Package: xen-utils-common Architecture: all Depends: lsb-base, python, udev, xenstore-utils, ${misc:Depends} -Replaces: xen-hypervisor-4.8-amd64 (<< 4.8.3~), xen-hypervisor-4.8-arm64 (<< 4.8.3~), xen-hypervisor-4.8-armhf (<< 4.8.3~) -Breaks: xen-hypervisor-4.8-amd64 (<< 4.8.3~), xen-hypervisor-4.8-arm64 (<< 4.8.3~), xen-hypervisor-4.8-armhf (<< 4.8.3~) +Replaces: xen-hypervisor-4.8-amd64, xen-hypervisor-4.8-arm64, xen-hypervisor-4.8-armhf +Breaks: xen-hypervisor-4.8-amd64, xen-hypervisor-4.8-arm64, xen-hypervisor-4.8-armhf Description: Xen administrative tools - common files The userspace tools to manage a system virtualized through the Xen virtual machine monitor.