Karmic pull request, LP454827

The following changes since commit 5b77a7671f6669950a478ceb7e090a20b34e4f2d:
  Stefan Bader (1):
        UBUNTU: Merge 2.6.31-20.58 security release

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-karmic lp454827

Tim Gardner (1):
      UBUNTU: [Config] Fix sub-flavours package conflicts

 debian.master/sub-flavours/virtual.vars |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

From a5f52d033fc4c2bd70845e77fe873b691a3ab884 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Wed, 17 Mar 2010 11:10:00 -0600
Subject: [PATCH] UBUNTU: [Config] Fix sub-flavours package conflicts

BugLink: http://bugs.launchpad.net/bugs/454827
The logic that creates debian/control information for the
virtual flavour packaging is dependent on the architecture
of the environment within which 'debian/rules clean' is run,
and as such can create an incorrect conflicts statement.

In this case it is sufficient to have both conflicts hard coded in the
same statement since the conflicting packages are architecturally
mutually exclusive.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/sub-flavours/virtual.vars |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

Seems sensible.

Tim Gardner wrote:
> The following changes since commit 5b77a7671f6669950a478ceb7e090a20b34e4f2d:
>   Stefan Bader (1):
>         UBUNTU: Merge 2.6.31-20.58 security release
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-karmic lp454827
> 
> Tim Gardner (1):
>       UBUNTU: [Config] Fix sub-flavours package conflicts
> 
>  debian.master/sub-flavours/virtual.vars |    9 +--------
>  1 files changed, 1 insertions(+), 8 deletions(-)
> 
> From a5f52d033fc4c2bd70845e77fe873b691a3ab884 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Wed, 17 Mar 2010 11:10:00 -0600
> Subject: [PATCH] UBUNTU: [Config] Fix sub-flavours package conflicts
> 
> BugLink: http://bugs.launchpad.net/bugs/454827
> The logic that creates debian/control information for the
> virtual flavour packaging is dependent on the architecture
> of the environment within which 'debian/rules clean' is run,
> and as such can create an incorrect conflicts statement.
> 
> In this case it is sufficient to have both conflicts hard coded in the
> same statement since the conflicting packages are architecturally
> mutually exclusive.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.master/sub-flavours/virtual.vars |    9 +--------
>  1 files changed, 1 insertions(+), 8 deletions(-)
> 
> diff --git a/debian.master/sub-flavours/virtual.vars b/debian.master/sub-flavours/virtual.vars
> index 2191090..9170c63 100644
> --- a/debian.master/sub-flavours/virtual.vars
> +++ b/debian.master/sub-flavours/virtual.vars
> @@ -5,13 +5,6 @@ target="Geared toward virtual machine guests."
>  desc="x86/x86_64"
>  bootloader="grub-pc | grub | lilo (>= 19.1)"
>  is_sub="true"
> -darch="`dpkg-architecture -qDEB_HOST_ARCH`"
> -if [ "$darch" = "i386" ]
> -then
> -based_on="generic-pae"
> -else
> -based_on="server"
> -fi
>  # The provides and conflicts are REQUIRED
>  provides="redhat-cluster-modules"
> -conflicts="linux-image-PKGVER-ABINUM-${based_on}"
> +conflicts="linux-image-PKGVER-ABINUM-generic-pae, linux-image-PKGVER-ABINUM-server"

On Wed, Mar 17, 2010 at 11:36:07AM -0600, Tim Gardner wrote:
> The following changes since commit 5b77a7671f6669950a478ceb7e090a20b34e4f2d:
>   Stefan Bader (1):
>         UBUNTU: Merge 2.6.31-20.58 security release
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-karmic lp454827
> 
> Tim Gardner (1):
>       UBUNTU: [Config] Fix sub-flavours package conflicts
> 
>  debian.master/sub-flavours/virtual.vars |    9 +--------
>  1 files changed, 1 insertions(+), 8 deletions(-)
> 
> From a5f52d033fc4c2bd70845e77fe873b691a3ab884 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Wed, 17 Mar 2010 11:10:00 -0600
> Subject: [PATCH] UBUNTU: [Config] Fix sub-flavours package conflicts
> 
> BugLink: http://bugs.launchpad.net/bugs/454827
> The logic that creates debian/control information for the
> virtual flavour packaging is dependent on the architecture
> of the environment within which 'debian/rules clean' is run,
> and as such can create an incorrect conflicts statement.
> 
> In this case it is sufficient to have both conflicts hard coded in the
> same statement since the conflicting packages are architecturally
> mutually exclusive.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.master/sub-flavours/virtual.vars |    9 +--------
>  1 files changed, 1 insertions(+), 8 deletions(-)
> 
> diff --git a/debian.master/sub-flavours/virtual.vars b/debian.master/sub-flavours/virtual.vars
> index 2191090..9170c63 100644
> --- a/debian.master/sub-flavours/virtual.vars
> +++ b/debian.master/sub-flavours/virtual.vars
> @@ -5,13 +5,6 @@ target="Geared toward virtual machine guests."
>  desc="x86/x86_64"
>  bootloader="grub-pc | grub | lilo (>= 19.1)"
>  is_sub="true"
> -darch="`dpkg-architecture -qDEB_HOST_ARCH`"
> -if [ "$darch" = "i386" ]
> -then
> -based_on="generic-pae"
> -else
> -based_on="server"
> -fi
>  # The provides and conflicts are REQUIRED
>  provides="redhat-cluster-modules"
> -conflicts="linux-image-PKGVER-ABINUM-${based_on}"
> +conflicts="linux-image-PKGVER-ABINUM-generic-pae, linux-image-PKGVER-ABINUM-server"
> -- 

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw

Applied to Karmic master