From 979949830e61d3a07381baeb8e6b14edaa141673 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sat, 21 Aug 2010 07:59:17 +0000 Subject: [PATCH] Fix some low hanging lintian warnings svn path=/dists/trunk/linux-2.6/; revision=16172 --- debian/bin/gencontrol.py | 3 ++- debian/changelog | 11 +++++++++++ debian/rules.real | 5 ++++- debian/templates/control.headers.arch.in | 7 ++++--- debian/templates/control.headers.featureset.in | 1 + debian/templates/control.headers.in | 2 +- debian/templates/control.image-dbg.in | 1 + debian/templates/control.image.type-kernel-package.in | 2 +- debian/templates/control.image.type-modulesextra.in | 4 ++-- debian/templates/control.image.type-modulesinline.in | 2 +- debian/templates/control.image.type-plain.in | 2 +- debian/templates/control.image.type-standalone.in | 2 +- debian/templates/control.libc-dev.in | 1 + debian/templates/control.main.in | 9 ++++++--- debian/templates/control.xen-linux-system.in | 4 ++-- debian/templates/image-dbg.lintian-override.in | 2 ++ 16 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 debian/templates/image-dbg.lintian-override.in diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index d5b4b4d77..389660a6a 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -47,7 +47,8 @@ class Gencontrol(Base): libc_dev = self.templates["control.libc-dev"] packages_headers_arch[0:0] = self.process_packages(libc_dev, {}) - extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = PackageRelation() + packages_headers_arch[-1]['Depends'].extend(PackageRelation()) + extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] self.merge_packages(packages, packages_headers_arch, arch) diff --git a/debian/changelog b/debian/changelog index 6084f3355..f895c35ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,17 @@ linux-2.6 (2.6.35-1~experimental.3) UNRELEASED; urgency=low * [x86] Enable samsung-laptop driver * [sparc] Enable XVR1000 driver (Closes: #574243) + [ Ian Campbell ] + * Fixes/overrides for Linitan warnings: + - Add "(meta package)" to short description of linux-headers + metapackages, resolves empty-binary-package. + - Add dependency on ${misc:Depends} to all packages, resolves + debhelper-but-no-misc-depends. Required update to gencontrol.py to + augment rather than override headers_arch_depends read from templates. + - Override dbg-package-missing-depends for linux-image-*-dbg. It is not + necessary to install the kernel image package to use the dbg package + since the dbg package already contains a complete image with symbols. + -- Ben Hutchings Wed, 18 Aug 2010 02:45:21 +0100 linux-2.6 (2.6.35-1~experimental.2) experimental; urgency=low diff --git a/debian/rules.real b/debian/rules.real index a782735d9..7e34032ee 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -472,7 +472,10 @@ install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_ dh_testdir dh_testroot dh_prep - dh_installdirs usr/lib/debug usr/lib/debug/boot + dh_installdirs usr/lib/debug usr/lib/debug/boot usr/share/lintian/overrides/ + sed -e 's/=V/$(REAL_VERSION)/g' \ + debian/templates/image-dbg.lintian-override.in \ + > $(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME) install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION) ifeq ($(MODULES),True) +$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR) diff --git a/debian/templates/control.headers.arch.in b/debian/templates/control.headers.arch.in index b4959bd82..129021923 100644 --- a/debian/templates/control.headers.arch.in +++ b/debian/templates/control.headers.arch.in @@ -1,12 +1,13 @@ Package: linux-headers-@upstreamversion@@abiname@-all -Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${binary:Version}) -Description: All header files for Linux @version@ +Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends} +Description: All header files for Linux @version@ (meta-package) This package depends against all architecture-specific kernel header files for Linux kernel version @upstreamversion@, generally used for building out-of-tree kernel modules. Package: linux-headers-@upstreamversion@@abiname@-all-@arch@ -Description: All header files for Linux @version@ +Depends: ${misc:Depends} +Description: All header files for Linux @version@ (meta-package) This package depends against all architecture-specific kernel header files for Linux kernel version @upstreamversion@, generally used for building out-of-tree kernel modules. diff --git a/debian/templates/control.headers.featureset.in b/debian/templates/control.headers.featureset.in index 1d247ec49..0722c3b37 100644 --- a/debian/templates/control.headers.featureset.in +++ b/debian/templates/control.headers.featureset.in @@ -1,4 +1,5 @@ Package: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ +Depends: ${misc:Depends} Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@ This package provides the architecture-specific common kernel header files for Linux kernel version @upstreamversion@@abiname@@localversion_headers@, generally used for building out-of-tree diff --git a/debian/templates/control.headers.in b/debian/templates/control.headers.in index c0e851316..f726e80ec 100644 --- a/debian/templates/control.headers.in +++ b/debian/templates/control.headers.in @@ -1,5 +1,5 @@ Package: linux-headers-@upstreamversion@@abiname@@localversion@ -Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@ +Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@, ${misc:Depends} Provides: linux-headers, linux-headers-@major@ Description: Header files for Linux @upstreamversion@@abiname@@localversion@ This package provides the architecture-specific kernel header files diff --git a/debian/templates/control.image-dbg.in b/debian/templates/control.image-dbg.in index a60436eb4..158f14ec0 100644 --- a/debian/templates/control.image-dbg.in +++ b/debian/templates/control.image-dbg.in @@ -1,4 +1,5 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@-dbg +Depends: linux-image-@upstreamversion@@abiname@@localversion@, ${misc:Depends} Section: debug Priority: extra Description: Debugging infos for Linux @upstreamversion@@abiname@@localversion@ diff --git a/debian/templates/control.image.type-kernel-package.in b/debian/templates/control.image.type-kernel-package.in index d35c4a525..391a44dac 100644 --- a/debian/templates/control.image.type-kernel-package.in +++ b/debian/templates/control.image.type-kernel-package.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ Pre-Depends: debconf | debconf-2.0 -Depends: module-init-tools +Depends: module-init-tools, ${misc:Depends} Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ for @class@ The Linux kernel @upstreamversion@ and modules for use on @longclass@. diff --git a/debian/templates/control.image.type-modulesextra.in b/debian/templates/control.image.type-modulesextra.in index 498193032..a3e84f80f 100644 --- a/debian/templates/control.image.type-modulesextra.in +++ b/debian/templates/control.image.type-modulesextra.in @@ -1,11 +1,11 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@ -Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}) +Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ for @class@ The Linux kernel @upstreamversion@ for use on @longclass@. Package: linux-modules-@upstreamversion@@abiname@@localversion@ -Depends: module-init-tools +Depends: module-init-tools, ${misc:Depends} Description: Linux @upstreamversion@ modules for @class@ Modules for Linux kernel @upstreamversion@ for use on @longclass@. diff --git a/debian/templates/control.image.type-modulesinline.in b/debian/templates/control.image.type-modulesinline.in index dae73fa9c..dcc82a931 100644 --- a/debian/templates/control.image.type-modulesinline.in +++ b/debian/templates/control.image.type-modulesinline.in @@ -1,6 +1,6 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ -Depends: module-init-tools +Depends: module-init-tools, ${misc:Depends} Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ for @class@ The Linux kernel @upstreamversion@ for use on @longclass@. diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.type-plain.in index 27a5ada81..4a00c4007 100644 --- a/debian/templates/control.image.type-plain.in +++ b/debian/templates/control.image.type-plain.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ Pre-Depends: debconf | debconf-2.0 -Depends: module-init-tools, linux-base (>= ${source:Version}), ${shlibs:Depends} +Depends: module-init-tools, linux-base (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: firmware-linux-free (>= @source_upstream@) Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ for @class@ diff --git a/debian/templates/control.image.type-standalone.in b/debian/templates/control.image.type-standalone.in index 4036d3212..c15b1d89e 100644 --- a/debian/templates/control.image.type-standalone.in +++ b/debian/templates/control.image.type-standalone.in @@ -1,6 +1,6 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@ Suggests: linux-doc-@version@ -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Linux @upstreamversion@ for @class@ The Linux kernel @upstreamversion@ for use on @longclass@. diff --git a/debian/templates/control.libc-dev.in b/debian/templates/control.libc-dev.in index 6e3447393..6c9239430 100644 --- a/debian/templates/control.libc-dev.in +++ b/debian/templates/control.libc-dev.in @@ -1,5 +1,6 @@ Package: linux-libc-dev Section: devel +Depends: ${misc:Depends} Provides: linux-kernel-headers Replaces: linux-kernel-headers Conflicts: linux-kernel-headers diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 62b6ab265..85a8dd4a7 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -14,7 +14,7 @@ Package: linux-source-@version@ Architecture: all Section: kernel Provides: linux-source, linux-source-@major@ -Depends: binutils, bzip2 +Depends: binutils, bzip2, ${misc:Depends} Recommends: libc6-dev | libc-dev, gcc, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev Description: Linux kernel source for version @version@ with Debian patches @@ -31,6 +31,7 @@ Description: Linux kernel source for version @version@ with Debian patches Package: linux-doc-@version@ Architecture: all +Depends: ${misc:Depends} Section: doc Provides: linux-doc-@major@ Description: Linux kernel specific documentation for version @version@ @@ -43,6 +44,7 @@ Description: Linux kernel specific documentation for version @version@ Package: linux-manual-@version@ Architecture: all +Depends: ${misc:Depends} Section: doc Provides: linux-manual, kernel-manual-@major@ Conflicts: linux-manual, kernel-manual-@major@ @@ -59,7 +61,7 @@ Description: Linux kernel API manual pages for version @version@ Package: linux-patch-debian-@version@ Architecture: all -Depends: bzip2, linux-support-@upstreamversion@@abiname@, python +Depends: bzip2, linux-support-@upstreamversion@@abiname@, python, ${misc:Depends} Suggests: linux-source-@version@ Description: Debian patches to version @version@ of the Linux kernel This package includes the patches used to produce the prepackaged @@ -72,6 +74,7 @@ Description: Debian patches to version @version@ of the Linux kernel Package: firmware-linux-free Architecture: all +Depends: ${misc:Depends} Description: Binary firmware for various drivers in the Linux kernel This package contains firmware which was previously included in the Linux kernel and which is compliant with the Debian Free Software @@ -83,7 +86,7 @@ Description: Binary firmware for various drivers in the Linux kernel Package: linux-support-@upstreamversion@@abiname@ Architecture: all Section: devel -Depends: ${python:Depends} +Depends: ${python:Depends}, ${misc:Depends} Description: Support files for Linux @upstreamversion@ This package provides support files for the Linux kernel build, e.g. scripts to handle ABI information and for generation of diff --git a/debian/templates/control.xen-linux-system.in b/debian/templates/control.xen-linux-system.in index afebaf737..b3712f053 100644 --- a/debian/templates/control.xen-linux-system.in +++ b/debian/templates/control.xen-linux-system.in @@ -1,5 +1,5 @@ Package: xen-linux-system-@upstreamversion@@abiname@@localversion@ -Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}) -Description: Xen system with Linux @upstreamversion@ on @class@ +Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} +Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package) This package depends on the binary Linux image and hypervisors. diff --git a/debian/templates/image-dbg.lintian-override.in b/debian/templates/image-dbg.lintian-override.in new file mode 100644 index 000000000..b0773e2fc --- /dev/null +++ b/debian/templates/image-dbg.lintian-override.in @@ -0,0 +1,2 @@ +# Kernel dbg packages contain a full image with debug data +linux-image-=V-dbg: dbg-package-missing-depends