[PATCH] UBUNTU: (config) Move dependency on crda to extra package

[Stefan Bader]

With the split between linux-image and linux-image-extra, all
wireless modules are in the extra package. Only some base
libraries were still in the main package. Move those into
extra and also move the dependency on crda/wireless-tools
to that. That way the linux-image package which is used
by the virtual meta-package does not automatically pull in
crda.

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

[v2: move net/mac80211 into extra as well based on Seth's feedback]
Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian.master/control.d/flavour-control.stub   |    4 ++--
 debian.master/control.d/generic.inclusion-list |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index d01b03a..b5403ce 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -27,7 +27,7 @@ Section: kernel
 Priority: optional
 Pre-Depends: dpkg (>= 1.10.24)
 Provides: linux-image, linux-image-3.0, fuse-module, =PROVIDES=
-Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3), crda (>=1.1.1-1ubuntu2) | wireless-crda
+Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: BOOTLOADER
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools
@@ -51,7 +51,7 @@ Package: linux-image-extra-PKGVER-ABINUM-FLAVOUR
 Architecture: ARCH
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR, crda (>=1.1.1-1ubuntu2) | wireless-crda
 Description: Linux kernel image for version PKGVER on DESC
  This package contains the Linux kernel image for version PKGVER on
  DESC.
diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 81df862..edf93b2 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -117,7 +117,6 @@ net/irda/*
 net/key/*
 net/lapb/*
 net/llc/*
-net/mac80211/*
 net/netfilter/*
 net/netrom/*
 net/phonet/*
@@ -127,7 +126,6 @@ net/sched/*
 net/sctp/*
 net/tipc/*
 net/wanrouter/*
-net/wireless/*
 net/x25/*
 net/xfrm/*
 net/sunrpc/auth_gss/auth_rpcgss.ko
-- 
1.7.9.5