From patchwork Thu Aug 26 14:23:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 62781 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5A43DB70DD for ; Fri, 27 Aug 2010 00:23:43 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OodMa-0006Ic-3a; Thu, 26 Aug 2010 15:23:32 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OodMX-0006IO-LM for kernel-team@lists.ubuntu.com; Thu, 26 Aug 2010 15:23:30 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id E2E2125F72D; Thu, 26 Aug 2010 07:22:36 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id 8429FF88E5; Thu, 26 Aug 2010 08:23:25 -0600 (MDT) To: stefan.bader@canonical.com Subject: Lucid LBM pull request, LP621185 Message-Id: <20100826142325.8429FF88E5@sepang.rtg.net> Date: Thu, 26 Aug 2010 08:23:25 -0600 (MDT) From: timg@tpi.com (Tim Gardner) Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit eea9703400fd008febf00f90f4ec0515c1090c62: Stefan Bader (1): UBUNTU: Merging back 2.6.32-24.20 proposed release are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm master Tim Gardner (1): UBUNTU: Add Conflicts/Replaces for compat-wireless debian/control.d/flavour-control.stub | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) From e96f8024ac0a6224f0f56b70f4050281ba6e1836 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 26 Aug 2010 07:58:54 -0600 Subject: [PATCH] UBUNTU: Add Conflicts/Replaces for compat-wireless Renaming linux-backports-modules-wireless to linux-backports-modules-compat-wireless-2.6.34 requires Conflicts/Replaces statements to correctly update from the original package. The Conflicts/Replaces statements could be dropped after the next ABI bump since the possibility of Replace/Conflict will no longer exist. Signed-off-by: Tim Gardner --- debian/control.d/flavour-control.stub | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control.d/flavour-control.stub b/debian/control.d/flavour-control.stub index 94074eb..853b403 100644 --- a/debian/control.d/flavour-control.stub +++ b/debian/control.d/flavour-control.stub @@ -14,12 +14,16 @@ Architecture: ARCH Section: SECTION_IMAGE Priority: optional Provides: =PROVIDES= -Conflicts: linux-backports-modules-compat-wireless-2.6.35-PKGVER-ABINUM-FLAVOUR +Conflicts: linux-backports-modules-compat-wireless-2.6.35-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-wireless-PKGVER-ABINUM-FLAVOUR +Replaces: linux-backports-modules-wireless-PKGVER-ABINUM-FLAVOUR Depends: linux-image-PKGVER-ABINUM-FLAVOUR Pre-Depends: dpkg (>= 1.10.24) Description: compat-wireless Linux modules for version PKGVER on DESC This package contains compat-wireless modules supplied by Ubuntu for Linux - kernel PKGVER on DESC. + kernel PKGVER on DESC. It replaces the original package linux-backports-modules-wireless + with linux-backports-modules-compat-wireless-2.6.34, a name which is more consistent with + subsequent compat-wireless stable update packages, e.g., linux-backports-modules-compat-wireless-2.6.35, + linux-backports-modules-compat-wireless-2.6.36, etc. . You likely do not want to install this package directly. Instead, install the linux-backports-modules-wireless-POCKET-FLAVOUR meta-package, which will ensure