From b7d2667b1d6707e552d98ae277d9b296175b589d Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 30 Jul 2012 22:54:42 +0200
Subject: [PATCH] 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 2533d474..2b4f4598 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