Patchwork [Maverick,1/1] UBUNTU: Update linux-headers-virtual depends clause

login
register
mail settings
Submitter Leann Ogasawara
Date June 9, 2010, 1:16 a.m.
Message ID <1276046208.1221.20.camel@emiko>
Download mbox | patch
Permalink /patch/55045/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - June 9, 2010, 1:16 a.m.
Note the following patch is against maverick linux-meta...

>From 5c9cf303330acb569aa8261c2736661709c369f3 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Tue, 8 Jun 2010 17:08:51 -0700
Subject: [PATCH 1/1] UBUNTU: Update linux-headers-virtual depends clause

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

Now that the virtual flavour has been converted to it's own regular
flavour, as opposed to being a sub-flavour of server, the
linux-headers-virtual meta package should no longer depend on the server
flavour header package.  Thus, update the linux-headers-virtual Depends
clause to use the virtual flavour header package.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 meta-source/debian/control.d/virtual |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Tim Gardner - June 9, 2010, 12:41 p.m.
On 06/08/2010 07:16 PM, Leann Ogasawara wrote:
> Note the following patch is against maverick linux-meta...
>
>> From 5c9cf303330acb569aa8261c2736661709c369f3 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara<leann.ogasawara@canonical.com>
> Date: Tue, 8 Jun 2010 17:08:51 -0700
> Subject: [PATCH 1/1] UBUNTU: Update linux-headers-virtual depends clause
>
> BugLink: http://bugs.launchpad.net/bugs/591041
>
> Now that the virtual flavour has been converted to it's own regular
> flavour, as opposed to being a sub-flavour of server, the
> linux-headers-virtual meta package should no longer depend on the server
> flavour header package.  Thus, update the linux-headers-virtual Depends
> clause to use the virtual flavour header package.
>
> Signed-off-by: Leann Ogasawara<leann.ogasawara@canonical.com>
> ---
>   meta-source/debian/control.d/virtual |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
> index bf1eded..210ecfe 100644
> --- a/meta-source/debian/control.d/virtual
> +++ b/meta-source/debian/control.d/virtual
> @@ -2,10 +2,10 @@ Package: linux-headers-virtual
>   Architecture: i386 amd64
>   Section: devel
>   Priority: optional
> -Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-server | linux-headers-${kernel-abi-version}-generic-pae
> +Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-virtual
>   Description: Linux kernel headers for virtual machines
>    This package will always depend on the latest kernel headers available
> - for virtual machines (which are the same headers as for the server flavour).
> + for virtual machines.
>
>   Package: linux-image-virtual
>   Architecture: i386 amd64

Looks right.

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Leann Ogasawara - June 9, 2010, 3:10 p.m.
Applied to Maverick linux-meta master.

Thanks,
Leann

Patch

diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
index bf1eded..210ecfe 100644
--- a/meta-source/debian/control.d/virtual
+++ b/meta-source/debian/control.d/virtual
@@ -2,10 +2,10 @@  Package: linux-headers-virtual
 Architecture: i386 amd64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-server | linux-headers-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-virtual
 Description: Linux kernel headers for virtual machines
  This package will always depend on the latest kernel headers available
- for virtual machines (which are the same headers as for the server flavour).
+ for virtual machines.
 
 Package: linux-image-virtual
 Architecture: i386 amd64