From patchwork Thu Dec 2 02:11:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 73926 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 D868AB70CC for ; Thu, 2 Dec 2010 13:12:01 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PNyeD-0008VO-6F; Thu, 02 Dec 2010 02:11:49 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PNyeB-0008VJ-Kb for kernel-team@lists.ubuntu.com; Thu, 02 Dec 2010 02:11:47 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1PNyeB-0004Z5-J1 for ; Thu, 02 Dec 2010 02:11:47 +0000 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PNyeB-0007x6-4v for kernel-team@lists.ubuntu.com; Thu, 02 Dec 2010 02:11:47 +0000 Subject: [Maverick][SRU][PATCH 1/1] UBUNTU: Remove conflicts statements for compat-wireless meta packages From: Leann Ogasawara To: kernel-team Date: Wed, 01 Dec 2010 18:11:37 -0800 Message-ID: <1291255897.2385.3029.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 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: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/683944 SRU Justification: Examining the Maverick compat-wireless LBM meta packages it appears the 'Conflicts:' statements in each of the debian/control.d flavours is unnecessary. The LBM packages themselves already have the appropriate 'Conflicts:' statements. Furthermore, they are coded in only one location in each of the LBM packages (debian/control.d/flavour-control.stub) which is much simpler to track and update vs multiple separate files in each of the meta package flavours. Impact: For Maverick there is zero impact as the 'Conflicts:' statements are already commented out. The patch for Maverick just removes the commented out statements thus preventing them for possibly being enabled in the future. Test Case: Maverick currently only enables the 2.6.36 compat-wireless package (2.6.37 will be enabled once it's final). Thus there is no test case at this time, as it won't conflict with anything. The following changes since commit 7129fb4c2565b3a5f6f864efbd96338313aef33c: UBUNTU: Ubuntu-2.6.35.24.28 (2010-11-30 19:41:09 -0800) are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-maverick-meta.git lp683944 Leann Ogasawara (1): UBUNTU: Remove conflicts statements for compat-wireless meta packages meta-source/debian/control.d/generic | 2 -- meta-source/debian/control.d/generic-pae | 2 -- meta-source/debian/control.d/server | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) From fa939977fa5f68fc99bd2134179eca03d236177a Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Wed, 1 Dec 2010 17:23:45 -0800 Subject: [PATCH] UBUNTU: Remove conflicts statements for compat-wireless meta packages BugLink: http://bugs.launchpad.net/bugs/683944 Examining the compat-wireless LBM meta packages it appears the 'Conflicts:' statements in each of the debian/control.d flavours is unnecessary. The LBM packages themselves already have the appropriate 'Conflicts:' statements. Furthermore, they are coded in only one location in each of the LBM packages (debian/control.d/flavour-control.stub) which is much simpler to track and update vs. 6 or 8 separate files in each of the meta package flavour files. This patch has zero impact as the 'Conflicts:' statements are already commented out. This just removes the commented out statements. Signed-off-by: Leann Ogasawara Acked-by: Stefan Bader Acked-by: Tim Gardner --- meta-source/debian/control.d/generic | 2 -- meta-source/debian/control.d/generic-pae | 2 -- meta-source/debian/control.d/server | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-)