From ad3ee16d4af55ddabd64b6009f415ee1b6db9d4e Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Mon, 30 Jul 2012 16:59:19 +0200 Subject: [PATCH 1/2] version 1.7.42 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index be2c5f1..2d29ee1 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.7.36 +1.7.42 From 32405af775f04f564f9767ad060b05b00a49142d Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 30 Jul 2012 22:54:42 +0200 Subject: [PATCH 2/2] vm/kernel-placeholder: simplify upgrade --- rpm_spec/core-vm-kernel-placeholder.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpm_spec/core-vm-kernel-placeholder.spec b/rpm_spec/core-vm-kernel-placeholder.spec index 2533d47..2b4f459 100644 --- a/rpm_spec/core-vm-kernel-placeholder.spec +++ b/rpm_spec/core-vm-kernel-placeholder.spec @@ -10,6 +10,12 @@ Vendor: Invisible Things Lab License: GPL Group: Qubes URL: http://www.qubes-os.org +# template released with 1.0-rc1 have kernel-debug installed by mistake. This +# line is required to smooth upgrade. +Obsoletes: kernel-debug +# this driver require exact kernel-drm-nouveau version; as isn't needed in VM, +# just remove it +Obsoletes: xorg-x11-drv-nouveau # choose the oldest Qubes-supported VM kernel Provides: kernel = 3.2.7