diff mbox

SRU: Maverick linux-meta

Message ID 20110318173359.4018332F2C@sepang.rtg.net
State New
Headers show

Pull-request

git://kernel.ubuntu.com/rtg/ubuntu-lucid-meta.git master

Commit Message

Tim Gardner March 18, 2011, 5:33 p.m. UTC
The following changes since commit 6921f14cbf2f8fdf488fbe8c30d7abc8803c3b5c:
  Brad Figg (1):
        UBUNTU: Ubuntu-2.6.32.31.37

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-lucid-meta.git master

Tim Gardner (2):
      UBUNTU: Add compat-wireless-2.6.38 meta package
      UBUNTU: Start new release

 meta-source/debian/changelog             |    9 +++++++++
 meta-source/debian/control.d/generic     |    7 +++++++
 meta-source/debian/control.d/generic-pae |    7 +++++++
 meta-source/debian/control.d/preempt     |    7 +++++++
 meta-source/debian/control.d/server      |    7 +++++++
 5 files changed, 37 insertions(+), 0 deletions(-)

From 162eeec8fde8d718e42b5bc242297ce11c6ebc36 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 18 Mar 2011 11:29:05 -0600
Subject: [PATCH 1/2] UBUNTU: Add compat-wireless-2.6.38 meta package

BugLink: http://bugs.launchpad.net/bugs/737669

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 meta-source/debian/control.d/generic     |    7 +++++++
 meta-source/debian/control.d/generic-pae |    7 +++++++
 meta-source/debian/control.d/preempt     |    7 +++++++
 meta-source/debian/control.d/server      |    7 +++++++
 4 files changed, 28 insertions(+), 0 deletions(-)

Comments

Tim Gardner March 18, 2011, 5:45 p.m. UTC | #1
This should actually be for Lucid, not Maverick.

rtg
Stefan Bader March 21, 2011, 10:03 a.m. UTC | #2
On 03/18/2011 06:33 PM, Tim Gardner wrote:
> The following changes since commit 6921f14cbf2f8fdf488fbe8c30d7abc8803c3b5c:
>   Brad Figg (1):
>         UBUNTU: Ubuntu-2.6.32.31.37
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-lucid-meta.git master
> 
> Tim Gardner (2):
>       UBUNTU: Add compat-wireless-2.6.38 meta package
>       UBUNTU: Start new release
> 
>  meta-source/debian/changelog             |    9 +++++++++
>  meta-source/debian/control.d/generic     |    7 +++++++
>  meta-source/debian/control.d/generic-pae |    7 +++++++
>  meta-source/debian/control.d/preempt     |    7 +++++++
>  meta-source/debian/control.d/server      |    7 +++++++
>  5 files changed, 37 insertions(+), 0 deletions(-)
> 
> From 162eeec8fde8d718e42b5bc242297ce11c6ebc36 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Fri, 18 Mar 2011 11:29:05 -0600
> Subject: [PATCH 1/2] UBUNTU: Add compat-wireless-2.6.38 meta package
> 
> BugLink: http://bugs.launchpad.net/bugs/737669
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  meta-source/debian/control.d/generic     |    7 +++++++
>  meta-source/debian/control.d/generic-pae |    7 +++++++
>  meta-source/debian/control.d/preempt     |    7 +++++++
>  meta-source/debian/control.d/server      |    7 +++++++
>  4 files changed, 28 insertions(+), 0 deletions(-)
> 
> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> index 35095d4..1573646 100644
> --- a/meta-source/debian/control.d/generic
> +++ b/meta-source/debian/control.d/generic
> @@ -60,6 +60,13 @@ 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.
>  
> +Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-generic
> +Architecture: amd64 i386
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-generic
> +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.
> +
>  Package: linux-backports-modules-alsa-RELEASE_NAME-generic
>  Architecture: amd64 i386
>  Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
> diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
> index 5321352..bfa393f 100644
> --- a/meta-source/debian/control.d/generic-pae
> +++ b/meta-source/debian/control.d/generic-pae
> @@ -63,6 +63,13 @@ Description: Backported wireless drivers for generic-pae kernel image
>   This empty package allows people to keep their backported wireless modules
>   up-to-date when upgrading their Linux kernel.
>  
> +Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-generic-pae
> +Architecture: i386
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-generic-pae
> +Description: Backported wireless drivers for generic-pae kernel image
> + This empty package allows people to keep their backported wireless modules
> + up-to-date when upgrading their Linux kernel.
> +
>  Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae
>  Architecture: i386
>  Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
> diff --git a/meta-source/debian/control.d/preempt b/meta-source/debian/control.d/preempt
> index b1bdde8..b353eea 100644
> --- a/meta-source/debian/control.d/preempt
> +++ b/meta-source/debian/control.d/preempt
> @@ -63,6 +63,13 @@ Description: Backported wireless drivers for preempt kernel image
>   This empty package allows people to keep their backported wireless modules
>   up-to-date when upgrading their Linux kernel.
>  
> +Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-preempt
> +Architecture: amd64
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-preempt
> +Description: Backported wireless drivers for preempt kernel image
> + This empty package allows people to keep their backported wireless modules
> + up-to-date when upgrading their Linux kernel.
> +
>  Package: linux-backports-modules-alsa-RELEASE_NAME-preempt
>  Architecture: amd64
>  Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-preempt
> diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
> index edea169..ecc6e75 100644
> --- a/meta-source/debian/control.d/server
> +++ b/meta-source/debian/control.d/server
> @@ -63,6 +63,13 @@ 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.
>  
> +Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-server
> +Architecture: amd64
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-server
> +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.
> +
>  Package: linux-backports-modules-alsa-RELEASE_NAME-server
>  Architecture: amd64
>  Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server

Acked-by: Stefan Bader <stefan.bader@canonical.com>
Tim Gardner March 21, 2011, 12:56 p.m. UTC | #3
applied
diff mbox

Patch

diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
index 35095d4..1573646 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -60,6 +60,13 @@  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.
 
+Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-generic
+Architecture: amd64 i386
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-generic
+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.
+
 Package: linux-backports-modules-alsa-RELEASE_NAME-generic
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index 5321352..bfa393f 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -63,6 +63,13 @@  Description: Backported wireless drivers for generic-pae kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
 
+Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-generic-pae
+Architecture: i386
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-generic-pae
+Description: Backported wireless drivers for generic-pae kernel image
+ This empty package allows people to keep their backported wireless modules
+ up-to-date when upgrading their Linux kernel.
+
 Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae
 Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
diff --git a/meta-source/debian/control.d/preempt b/meta-source/debian/control.d/preempt
index b1bdde8..b353eea 100644
--- a/meta-source/debian/control.d/preempt
+++ b/meta-source/debian/control.d/preempt
@@ -63,6 +63,13 @@  Description: Backported wireless drivers for preempt kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
 
+Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-preempt
+Architecture: amd64
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-preempt
+Description: Backported wireless drivers for preempt kernel image
+ This empty package allows people to keep their backported wireless modules
+ up-to-date when upgrading their Linux kernel.
+
 Package: linux-backports-modules-alsa-RELEASE_NAME-preempt
 Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-preempt
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index edea169..ecc6e75 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -63,6 +63,13 @@  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.
 
+Package: linux-backports-modules-wireless-2.6.38-RELEASE_NAME-server
+Architecture: amd64
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.38-${kernel-abi-version}-server
+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.
+
 Package: linux-backports-modules-alsa-RELEASE_NAME-server
 Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server
-- 
1.7.0.4


From fb4497e2cd103f8ff909e5cc5798960f513e9bac Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 18 Mar 2011 11:31:41 -0600
Subject: [PATCH 2/2] UBUNTU: Start new release

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 meta-source/debian/changelog |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
index a2759e6..a0e35f8 100644
--- a/meta-source/debian/changelog
+++ b/meta-source/debian/changelog
@@ -1,3 +1,12 @@ 
+linux-meta (2.6.32.31.38) UNRELEASED; urgency=low
+
+  [ Tim Gardner ]
+
+  * Added compat-wireless-2.6.38
+    -LP: #737669
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Fri, 18 Mar 2011 11:30:23 -0600
+
 linux-meta (2.6.32.31.37) lucid-proposed; urgency=low
 
   * Bump ABI