diff mbox

Maverick SRU: linux-meta

Message ID 20110318194241.41A4E32F2C@sepang.rtg.net
State New
Headers show

Pull-request

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

Commit Message

Tim Gardner March 18, 2011, 7:42 p.m. UTC
The following changes since commit df2451409fa16f8ddc3c1dc942efc78b3a02a9c3:
  Brad Figg (1):
        UBUNTU: Ubuntu-2.6.35.28.36

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick-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/server      |    7 +++++++
 4 files changed, 30 insertions(+), 0 deletions(-)

From 001b82f6dccbde8794986f23e14b1b206ec5f799 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 18 Mar 2011 13:12:56 -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/server      |    7 +++++++
 3 files changed, 21 insertions(+), 0 deletions(-)

Comments

Stefan Bader March 21, 2011, 10:15 a.m. UTC | #1
On 03/18/2011 08:42 PM, Tim Gardner wrote:
> The following changes since commit df2451409fa16f8ddc3c1dc942efc78b3a02a9c3:
>   Brad Figg (1):
>         UBUNTU: Ubuntu-2.6.35.28.36
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-maverick-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/server      |    7 +++++++
>  4 files changed, 30 insertions(+), 0 deletions(-)
> 
> From 001b82f6dccbde8794986f23e14b1b206ec5f799 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Fri, 18 Mar 2011 13:12:56 -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/server      |    7 +++++++
>  3 files changed, 21 insertions(+), 0 deletions(-)
> 
> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> index c427d4b..bee4fdd 100644
> --- a/meta-source/debian/control.d/generic
> +++ b/meta-source/debian/control.d/generic
> @@ -74,6 +74,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-compat-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-media-RELEASE_NAME-generic
>  Architecture: amd64 i386
>  Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic
> diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
> index f0a551f..58988c4 100644
> --- a/meta-source/debian/control.d/generic-pae
> +++ b/meta-source/debian/control.d/generic-pae
> @@ -77,6 +77,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-compat-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-media-RELEASE_NAME-generic-pae
>  Architecture: i386
>  Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic-pae
> diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
> index f527fe4..65581e4 100644
> --- a/meta-source/debian/control.d/server
> +++ b/meta-source/debian/control.d/server
> @@ -77,6 +77,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-compat-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-media-RELEASE_NAME-server
>  Architecture: amd64
>  Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-server

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

Patch

diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
index c427d4b..bee4fdd 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -74,6 +74,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-compat-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-media-RELEASE_NAME-generic
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic
diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index f0a551f..58988c4 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -77,6 +77,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-compat-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-media-RELEASE_NAME-generic-pae
 Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic-pae
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index f527fe4..65581e4 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -77,6 +77,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-compat-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-media-RELEASE_NAME-server
 Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-server
-- 
1.7.0.4


From 66cc401e9f8b723a97add7ecbfec8ce1539884aa Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 18 Mar 2011 13:21:54 -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 49de092..2ebfbbd 100644
--- a/meta-source/debian/changelog
+++ b/meta-source/debian/changelog
@@ -1,3 +1,12 @@ 
+linux-meta (2.6.35.28.37) UNRELEASED; urgency=low
+
+  [ Tim Gardner ]
+
+  * Added compat-wireless-2.6.38
+    -LP: #737669
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Fri, 18 Mar 2011 13:18:42 -0600
+
 linux-meta (2.6.35.28.36) maverick-proposed; urgency=low
 
   * Bump ABI - Maverick ABI 28