From patchwork Tue Nov 30 20:09:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 73649 X-Patchwork-Delegate: tim.gardner@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 9034FB70F1 for ; Wed, 1 Dec 2010 07:10:16 +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 1PNWWa-0005Qc-9s; Tue, 30 Nov 2010 20:10:04 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PNWWY-0005QL-70 for kernel-team@lists.ubuntu.com; Tue, 30 Nov 2010 20:10:02 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1PNWWY-0003xP-3v; Tue, 30 Nov 2010 20:10:02 +0000 Received: from 79-71-115-209.dynamic.dsl.as9105.com ([79.71.115.209] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PNWWX-0000Dc-Tw; Tue, 30 Nov 2010 20:10:02 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: Fix linux-backports-modules-wireless linkage Date: Tue, 30 Nov 2010 20:09:59 +0000 Message-Id: <1291147799-4063-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291147799-4063-1-git-send-email-apw@canonical.com> References: <1291147799-4063-1-git-send-email-apw@canonical.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 BugLink: http://bugs.launchpad.net/bugs/681727 Point linux-backports-modules-wireless meta package to the replacement linux-backports-modules-compat-wireless-2.6.36. Signed-off-by: Andy Whitcroft --- meta-source/debian/changelog | 2 ++ meta-source/debian/control.d/generic | 2 +- meta-source/debian/control.d/generic-pae | 2 +- meta-source/debian/control.d/server | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog index c7d8654..2670f4d 100644 --- a/meta-source/debian/changelog +++ b/meta-source/debian/changelog @@ -3,6 +3,8 @@ linux-meta (2.6.35.23.27) UNRELEASED; urgency=low [ Andy Whitcroft ] * Add compat-wireless-2.6.36/37 support for generic-pae. + * Point linux-backports-modules-wireless meta package to the replacement + linux-backports-modules-compat-wireless-2.6.36. (LP: #681727) -- Andy Whitcroft Fri, 26 Nov 2010 14:33:46 +0000 diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic index f2f4157..2071941 100644 --- a/meta-source/debian/control.d/generic +++ b/meta-source/debian/control.d/generic @@ -34,7 +34,7 @@ Description: Backported driver headers for generic kernel image Package: linux-backports-modules-wireless-RELEASE_NAME-generic Architecture: amd64 i386 -Depends: ${misc:Depends}, linux-backports-modules-wireless-${kernel-abi-version}-generic +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic (= ${binary:Version}) Description: Backported wireless drivers for generic kernel image This empty package allows people to keep their backported wireless modules up-to-date when upgrading their Linux kernel. diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae index c95f1b2..6a2ab5e 100644 --- a/meta-source/debian/control.d/generic-pae +++ b/meta-source/debian/control.d/generic-pae @@ -41,7 +41,7 @@ Description: Backported wireless drivers for generic kernel image Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae Architecture: i386 -Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae (= ${binary:Version}) Description: Backported drivers for alsa-driver snapshot. This empty package allows people to keep their alsa-driver snapshot up-to-date when upgrading their Linux kernel. diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server index 40b5c27..96ae438 100644 --- a/meta-source/debian/control.d/server +++ b/meta-source/debian/control.d/server @@ -34,7 +34,7 @@ Description: Backported driver headers for server kernel image Package: linux-backports-modules-wireless-RELEASE_NAME-server Architecture: amd64 -Depends: ${misc:Depends}, linux-backports-modules-wireless-${kernel-abi-version}-server +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-server (= ${binary:Version}) Description: Backported wireless drivers for server kernel image This empty package allows people to keep their backported wireless modules up-to-date when upgrading their Linux kernel.