Fix some low hanging lintian warnings

svn path=/dists/trunk/linux-2.6/; revision=16172

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)
 

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 <ben@decadent.org.uk>  Wed, 18 Aug 2010 02:45:21 +0100
 
 linux-2.6 (2.6.35-1~experimental.2) experimental; urgency=low

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)

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})
+Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends}
-Description: All header files for Linux @version@
+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.

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

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

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@

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@.

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@.

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@.

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@

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@.

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

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

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})
+Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
-Description: Xen system with Linux @upstreamversion@ on @class@
+Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package)
  This package depends on the binary Linux image and hypervisors.
 

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