[Quantal: linux-meta] Fix the virtual dependencies

[Stefan Bader]

As it came up during the server-team meeting, it seems that
the stack of dependencies for virtual is probably not what
it was intended to be.

Note that I made additional changes based on the assumption
that it would be good not to cross depend on any generic
meta-packages. It feels that would blow up the stack without
benefit and potentially confuses people.

Hopefully did not mess up things in the hurry...

-Stefan


>From 49d8abb0de5a0688c68960f5cf0f65408b58aac5 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader at canonical.com>
Date: Tue, 12 Jun 2012 19:04:15 +0200
Subject: [PATCH] UBUNTU: Fix dependencies and descriptions of virtual

The linux-virtual package depends on linux-generic, but that
would again depend on the complete kernel (including extra).
Fix this by pointing at linux-image-virtual and
linux-headers-virtual which point at the generic binaries.
Also change the dependency of linux-image-extra-virtual to
hopefully eliminate generic meta packages being pulled in.
And change some descriptions in the hope to match better.

BugLink: http://bugs.launchpad.net/bugs/1009553

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 meta-source/debian/control.d/virtual |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
index 7ec994e..9c8b0a1 100644
--- a/meta-source/debian/control.d/virtual
+++ b/meta-source/debian/control.d/virtual
@@ -2,7 +2,7 @@ Package: linux-headers-virtual
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: ${misc:Depends}, linux-headers-generic
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic
 Description: Transitional package.
  This package will always depend on linux-headers-generic.
 
@@ -19,14 +19,16 @@ Package: linux-virtual
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: ${misc:Depends}, linux-generic
+Depends: ${misc:Depends}, linux-image-virtual, linux-headers-virtual
 Description: Complete Generic Linux kernel and headers
- This package will always depend on linux-generic.
+ This package will always depend on the latest minimal generic kernel image
+ used for virtual instances and the generic headers.
 
 Package: linux-image-extra-virtual
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: ${misc:Depends}, linux-image-generic
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-image-extra-${kernel-abi-version}-generic
 Description: Transitional package.
- This package will always depend on linux-image-generic.
+ This package will always depend on the latest complete generic kernel
+ image.
-- 
1.7.9.5