| Submitter | Andy Whitcroft |
|---|---|
| Date | Nov. 30, 2010, 8:09 p.m. |
| Message ID | <1291147799-4063-3-git-send-email-apw@canonical.com> |
| Download | mbox | patch |
| Permalink | /patch/73649/ |
| State | Rejected |
| Delegated to: | Tim Gardner |
| Headers | show |
Comments
On 11/30/2010 01:09 PM, Andy Whitcroft wrote: > 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<apw@canonical.com> > --- > 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<apw@canonical.com> 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}) This doesn't seem right. Looks like a fat finger.... > 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.
On Tue, Nov 30, 2010 at 01:20:51PM -0700, Tim Gardner wrote: > > 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}) > > This doesn't seem right. Looks like a fat finger.... Indeed. See V2 series with this fixed. -apw
Patch
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 <apw@canonical.com> 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.
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 <apw@canonical.com> --- 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(-)