UBUNTU: lintian -- clean up misc-depends warnings

Signed-off-by: Andy Whitcroft <apw@canonical.com>

10 files changed, 41 insertions, 40 deletions

diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
index ea5399e..e16428f 100644
--- a/meta-source/debian/changelog
+++ b/meta-source/debian/changelog
@@ -4,6 +4,7 @@ linux-meta (2.6.32.13.14) UNRELEASED; urgency=low
   * add versatile arm flavour
   * reinstate the LBM meta packages
   * we are not using anything clever, move to debhelper version 5
+  * lintian -- clean up misc-depends warnings
 
  -- Andy Whitcroft <apw@canonical.com>  Thu, 11 Feb 2010 23:14:22 +0000
 
diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
index 1aab752..25f5e9e 100644
--- a/meta-source/debian/control.common
+++ b/meta-source/debian/control.common
@@ -10,7 +10,7 @@ Package: linux
 Architecture: i386 amd64 lpia
 Section: metapackages
 Priority: optional
-Depends: linux-image (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image (= ${binary:Version})
 Description: Generic complete Linux kernel.
  This package will always depend on the latest generic complete Linux kernel
  available.
@@ -19,7 +19,7 @@ Package: linux-source
 Architecture: all
 Section: devel
 Priority: optional
-Depends: linux-source-${kernel-version}
+Depends: ${misc:Depends}, linux-source-${kernel-version}
 Description: Linux kernel source with Ubuntu patches
  This package will always depend on the latest Linux kernel source code
  available. The Ubuntu patches have been applied.
@@ -28,7 +28,7 @@ Package: linux-image
 Architecture: i386 amd64 lpia
 Section: metapackages
 Priority: optional
-Depends: linux-image-${generic-depends} (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-${generic-depends} (= ${binary:Version})
 Description: Generic Linux kernel image.
  This package will always depend on the latest generic Linux kernel image
  available.
@@ -36,7 +36,7 @@ Description: Generic Linux kernel image.
 Package: linux-crashdump
 Architecture: i386 amd64
 Section: devel
-Depends: kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub (>= 0.97-29ubuntu24)
+Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub (>= 0.97-29ubuntu24)
 Recommends: apport
 Suggests: crash
 Description: Linux kernel crashdump setup for the latest generic kernel
diff --git a/meta-source/debian/control.d/386 b/meta-source/debian/control.d/386
index 807f242..9309fbd 100644
--- a/meta-source/debian/control.d/386
+++ b/meta-source/debian/control.d/386
@@ -2,7 +2,7 @@ Package: linux-headers-386
 Architecture: i386 
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-386
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-386
 Description: Generic Linux kernel headers
  This package will always depend on the latest 386 kernel headers
  available.
@@ -11,7 +11,7 @@ Package: linux-image-386
 Architecture: i386
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-386, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-386, linux-firmware
 Description: Generic Linux kernel image
  This package will always depend on the latest 386 kernel image
  available.
@@ -20,7 +20,7 @@ Package: linux-386
 Architecture: i386
 Section: metapackages
 Priority: optional
-Depends: linux-image-386 (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-386 (= ${binary:Version})
 Description: Complete Generic Linux kernel
  This package will always depend on the latest complete 386 Linux kernel
  available.
diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
index f13f997..57abe19 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -2,7 +2,7 @@ Package: linux-headers-generic
 Architecture: i386 amd64
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-generic
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic
 Description: Generic Linux kernel headers
  This package will always depend on the latest generic kernel headers
  available.
@@ -11,7 +11,7 @@ Package: linux-image-generic
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-generic, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-firmware
 Description: Generic Linux kernel image
  This package will always depend on the latest generic kernel image
  available.
@@ -20,35 +20,35 @@ Package: linux-generic
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-generic (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-generic (= ${binary:Version})
 Description: Complete Generic Linux kernel
  This package will always depend on the latest complete generic Linux kernel
  available.
 
 Package: linux-backports-modules-headers-RELEASE_NAME-generic
 Architecture: amd64 i386
-Depends: linux-headers-lbm-${kernel-abi-version}-generic
+Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
 Description: Backported driver headers for generic kernel image
  This empty package allows people to keep their backported module
  headers up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wireless-RELEASE_NAME-generic
 Architecture: amd64 i386
-Depends: linux-backports-modules-${kernel-abi-version}-generic
+Depends: ${misc:Depends}, linux-backports-modules-${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: linux-backports-modules-alsa-${kernel-abi-version}-generic
+Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
 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.
 
 Package: linux-backports-modules-nouveau-RELEASE_NAME-generic
 Architecture: amd64 i386
-Depends: linux-backports-modules-nouveau-${kernel-abi-version}-generic
+Depends: ${misc:Depends}, linux-backports-modules-nouveau-${kernel-abi-version}-generic
 Description: Backported drivers for Nouveau.
  This empty package allows people to keep their Nouveau driver
  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 37eb7fa..dffbcd6 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -2,7 +2,7 @@ Package: linux-headers-generic-pae
 Architecture: i386
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-pae
 Description: Generic Linux kernel headers
  This package will always depend on the latest generic kernel headers
  available.
@@ -11,7 +11,7 @@ Package: linux-image-generic-pae
 Architecture: i386
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-generic-pae, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-pae, linux-firmware
 Description: Generic Linux kernel image
  This package will always depend on the latest generic kernel image
  available.
@@ -20,35 +20,35 @@ Package: linux-generic-pae
 Architecture: i386
 Section: metapackages
 Priority: optional
-Depends: linux-image-generic-pae (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-generic-pae (= ${binary:Version})
 Description: Complete Generic Linux kernel
  This package will always depend on the latest complete generic Linux kernel
  available.
 
 Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
 Architecture: i386
-Depends: linux-headers-lbm-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
 Description: Backported driver headers for generic-pae kernel image
  This empty package allows people to keep their backported module
  headers up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
 Architecture: i386
-Depends: linux-backports-modules-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-backports-modules-${kernel-abi-version}-generic-pae
 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-pae
 Architecture: i386
-Depends: linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
 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.
 
 Package: linux-backports-modules-noveau-RELEASE_NAME-generic-pae
 Architecture: i386
-Depends: linux-backports-modules-noveau-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-backports-modules-noveau-${kernel-abi-version}-generic-pae
 Description: Backported drivers for Nouveau.
  This empty package allows people to keep their Nouveau driver
  up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/lpia b/meta-source/debian/control.d/lpia
index ec27a55..7026972 100644
--- a/meta-source/debian/control.d/lpia
+++ b/meta-source/debian/control.d/lpia
@@ -2,7 +2,7 @@ Package: linux-headers-lpia
 Architecture: lpia
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-lpia
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-lpia
 Description: Generic Linux kernel headers
  This package will always depend on the latest lpia kernel headers
  available.
@@ -11,7 +11,7 @@ Package: linux-image-lpia
 Architecture: lpia
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-lpia, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-lpia, linux-firmware
 Description: Generic Linux kernel image
  This package will always depend on the latest lpia kernel image
  available.
@@ -20,7 +20,7 @@ Package: linux-lpia
 Architecture: lpia
 Section: metapackages
 Priority: optional
-Depends: linux-image-lpia (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-lpia (= ${binary:Version})
 Description: Complete Generic Linux kernel
  This package will always depend on the latest complete lpia Linux kernel
  available.
diff --git a/meta-source/debian/control.d/preempt b/meta-source/debian/control.d/preempt
index 253fa13..4742200 100644
--- a/meta-source/debian/control.d/preempt
+++ b/meta-source/debian/control.d/preempt
@@ -2,7 +2,7 @@ Package: linux-headers-preempt
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-preempt
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-preempt
 Description: Linux kernel headers for Low Latency Servers.
  This package will always depend on the latest kernel headers available
  for Server Equipment.
@@ -11,7 +11,7 @@ Package: linux-image-preempt
 Architecture: amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-preempt, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-preempt, linux-firmware
 Description: Linux kernel image for Low Latency Servers.
  This package will always depend on the latest kernel image available
  for Server Equipment.
@@ -20,7 +20,7 @@ Package: linux-preempt
 Architecture: amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-preempt (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-preempt (= ${binary:Version})
 Description: Complete Linux kernel for Low Latency Servers.
  This package will always depend on the latest complete Linux kernel available
  for Server Equipment.
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index 940f642..baa8e85 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -2,7 +2,7 @@ Package: linux-headers-server
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-server
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-server
 Description: Linux kernel headers on Server Equipment.
  This package will always depend on the latest kernel headers available
  for Server Equipment.
@@ -11,7 +11,7 @@ Package: linux-image-server
 Architecture: amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-server, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-server, linux-firmware
 Description: Linux kernel image on Server Equipment.
  This package will always depend on the latest kernel image available
  for Server Equipment.
@@ -20,35 +20,35 @@ Package: linux-server
 Architecture: amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-server (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-server (= ${binary:Version})
 Description: Complete Linux kernel on Server Equipment.
  This package will always depend on the latest complete Linux kernel available
  for Server Equipment.
 
 Package: linux-backports-modules-headers-RELEASE_NAME-server
 Architecture: amd64
-Depends: linux-headers-lbm-${kernel-abi-version}-server
+Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
 Description: Backported driver headers for server kernel image
  This empty package allows people to keep their backported module
  headers up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wireless-RELEASE_NAME-server
 Architecture: amd64
-Depends: linux-backports-modules-${kernel-abi-version}-server
+Depends: ${misc:Depends}, linux-backports-modules-${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: linux-backports-modules-alsa-${kernel-abi-version}-server
+Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server
 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.
 
 #Package: linux-backports-modules-nouveau-RELEASE_NAME-server
 #Architecture: amd64
-#Depends: linux-backports-modules-nouveau-${kernel-abi-version}-server
+#Depends: ${misc:Depends}, linux-backports-modules-nouveau-${kernel-abi-version}-server
 #Description: Backported drivers for Nouveau.
 # This empty package allows people to keep their Nouveau driver
 # up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/versatile b/meta-source/debian/control.d/versatile
index 5275e9f..ff11b18 100644
--- a/meta-source/debian/control.d/versatile
+++ b/meta-source/debian/control.d/versatile
@@ -2,7 +2,7 @@ Package: linux-headers-versatile
 Architecture: armel
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-versatile 
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-versatile 
 Description: Linux kernel headers for the Versatile architecture.
  This package will always depend on the latest kernel headers available
  for ARM versatile systems.
@@ -11,7 +11,7 @@ Package: linux-image-versatile
 Architecture: armel
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-versatile, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-versatile, linux-firmware
 Description: Linux kernel image for the Versatile architecture.
  This package will always depend on the latest kernel image available
  for ARM versatile systems.
@@ -20,7 +20,7 @@ Package: linux-versatile
 Architecture: armel
 Section: metapackages
 Priority: optional
-Depends: linux-image-versatile (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-versatile (= ${binary:Version})
 Description: Complete Linux kernel for the Versatile architecture.
  This package will always depend on the latest complete Linux kernel available
  for ARM versatile systems.
diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
index f56e949..bf1eded 100644
--- a/meta-source/debian/control.d/virtual
+++ b/meta-source/debian/control.d/virtual
@@ -2,7 +2,7 @@ Package: linux-headers-virtual
 Architecture: i386 amd64
 Section: devel
 Priority: optional
-Depends: linux-headers-${kernel-abi-version}-server | linux-headers-${kernel-abi-version}-generic-pae
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-server | linux-headers-${kernel-abi-version}-generic-pae
 Description: Linux kernel headers for virtual machines
  This package will always depend on the latest kernel headers available
  for virtual machines (which are the same headers as for the server flavour).
@@ -11,7 +11,7 @@ Package: linux-image-virtual
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-${kernel-abi-version}-virtual, linux-firmware
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-virtual, linux-firmware
 Description: Linux kernel image for virtual machines
  This package will always depend on the latest kernel image available
  for virtual machines.
@@ -20,7 +20,7 @@ Package: linux-virtual
 Architecture: i386 amd64
 Section: metapackages
 Priority: optional
-Depends: linux-image-virtual (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-virtual (= ${binary:Version})
 Description: Complete Linux kernel for virtual machines
  This package will always depend on the latest complete Linux kernel available
  for virtual machines.