Patchwork [4/5] UBUNTU: lintian -- add required misc:Depends

login
register
mail settings
Submitter Andy Whitcroft
Date March 3, 2010, 4:29 p.m.
Message ID <1267633743-11047-5-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/46822/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - March 3, 2010, 4:29 p.m.
Add misc:Depends to the Depends: for the packages, this will be null
but will quiet the lintian noise:

  W: linux source: debhelper-but-no-misc-depends linux-doc

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/control.d/flavour-control.stub |    5 +++--
 debian.master/control.stub.in                |    6 ++++--
 debian.master/sub-flavours/control.stub      |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

Patch

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index bead07f..0c5b924 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -27,7 +27,7 @@  Section: admin
 Priority: optional
 Pre-Depends: dpkg (>= 1.10.24)
 Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES=
-Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda
+Depends: ${misc:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: BOOTLOADER
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER
@@ -51,7 +51,7 @@  Package: linux-headers-PKGVER-ABINUM-FLAVOUR
 Architecture: ARCH
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
 Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-2.6
 Description: Linux kernel headers for version PKGVER on DESC
  This package provides kernel header files for version PKGVER on
@@ -64,6 +64,7 @@  Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym
 Architecture: ARCH
 Section: devel
 Priority: optional
+Depends: ${misc:Depends}
 Provides: linux-debug
 Description: Linux kernel debug image for version PKGVER on DESC
  This package provides a kernel debug image for version PKGVER on
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index b69bbef..bcc1c66 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -13,7 +13,7 @@  Architecture: all
 Section: devel
 Priority: optional
 Provides: SRCPKGNAME-source, SRCPKGNAME-source-2.6
-Depends: binutils, bzip2, coreutils | fileutils (>= 4.0)
+Depends: ${misc:Depends}, binutils, bzip2, coreutils | fileutils (>= 4.0)
 Recommends: libc-dev, gcc, make
 Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev
 Description: Linux kernel source for version PKGVER with Ubuntu patches
@@ -35,6 +35,7 @@  Package: SRCPKGNAME-doc
 Architecture: all
 Section: doc
 Priority: optional
+Depends: ${misc:Depends}
 Conflicts: SRCPKGNAME-doc-2.6
 Replaces: SRCPKGNAME-doc-2.6
 Description: Linux kernel specific documentation for version PKGVER
@@ -48,7 +49,7 @@  Package: linux-headers-PKGVER-ABINUM
 Architecture: all
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0)
+Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0)
 Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-2.6
 Description: Header files related to Linux kernel version PKGVER
  This package provides kernel header files for version PKGVER, for sites
@@ -57,6 +58,7 @@  Description: Header files related to Linux kernel version PKGVER
 
 Package: SRCPKGNAME-libc-dev
 Architecture: i386 amd64 lpia ia64 powerpc sparc armel
+Depends: ${misc:Depends}
 Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), SRCPKGNAME-kernel-headers
 Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), SRCPKGNAME-kernel-headers, libdrm-dev
 Provides: SRCPKGNAME-kernel-headers
diff --git a/debian.master/sub-flavours/control.stub b/debian.master/sub-flavours/control.stub
index 7e2aa53..c5159d9 100644
--- a/debian.master/sub-flavours/control.stub
+++ b/debian.master/sub-flavours/control.stub
@@ -18,7 +18,7 @@  Section: admin
 Priority: optional
 Pre-Depends: dpkg (>= 1.10.24)
 Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES=
-Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3)
+Depends: ${misc:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3)
 Conflicts: hotplug (<< 0.0.20040105-1), =CONFLICTS=
 Recommends: BOOTLOADER
 Suggests: fdutils, linux-doc-PKGVER | linux-source-PKGVER