UBUNTU: correct the headers dependancy and select minimal packages

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

Ensure the flavour header depends on the correctly named common header.
Also turn off those packages a derivative kernel is not permitted to
generate.

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

3 files changed, 62 insertions, 57 deletions

diff --git a/debian.ti-omap4/control.d/flavour-control.stub b/debian.ti-omap4/control.d/flavour-control.stub
index ccde915f5b7..59ce81884ba 100644
--- a/debian.ti-omap4/control.d/flavour-control.stub
+++ b/debian.ti-omap4/control.d/flavour-control.stub
@@ -51,7 +51,7 @@ Package: linux-headers-PKGVER-ABINUM-FLAVOUR
 Architecture: ARCH
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-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
diff --git a/debian.ti-omap4/control.stub.in b/debian.ti-omap4/control.stub.in
index 80acc5829c8..0fa2364492a 100644
--- a/debian.ti-omap4/control.stub.in
+++ b/debian.ti-omap4/control.stub.in
@@ -8,52 +8,52 @@ Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharuti
 Build-Conflicts: findutils (= 4.4.1-1ubuntu1)
 Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-maverick.git
 
-Package: SRCPKGNAME-source-PKGVER
-Architecture: all
-Section: devel
-Priority: optional
-Provides: SRCPKGNAME-source, SRCPKGNAME-source-2.6
-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
- This package provides the source code for the Linux kernel version
- PKGVER.
- .
- This package is mainly meant for other packages to use, in order to build
- custom flavours.
- .
- If you wish to use this package to create a custom Linux kernel, then it
- is suggested that you investigate the package kernel-package, which has
- been designed to ease the task of creating kernel image packages.
- .
- If you are simply trying to build third-party modules for your kernel,
- you do not want this package. Install the appropriate linux-headers
- package instead.
+#Package: SRCPKGNAME-source-PKGVER
+#Architecture: all
+#Section: devel
+#Priority: optional
+#Provides: SRCPKGNAME-source, SRCPKGNAME-source-2.6
+#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
+# This package provides the source code for the Linux kernel version
+# PKGVER.
+# .
+# This package is mainly meant for other packages to use, in order to build
+# custom flavours.
+# .
+# If you wish to use this package to create a custom Linux kernel, then it
+# is suggested that you investigate the package kernel-package, which has
+# been designed to ease the task of creating kernel image packages.
+# .
+# If you are simply trying to build third-party modules for your kernel,
+# you do not want this package. Install the appropriate linux-headers
+# package instead.
 
-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
- This package provides the various documents in the PKGVER kernel
- Documentation/ subdirectory.  These document kernel subsystems, APIs, device
- drivers, and so on.  See
- /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
- contained in each file.
+#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
+# This package provides the various documents in the PKGVER kernel
+# Documentation/ subdirectory.  These document kernel subsystems, APIs, device
+# drivers, and so on.  See
+# /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
+# contained in each file.
 
-Package: SRCPKGNAME-tools-common
-Architecture: all
-Section: admin
-Priority: optional
-Depends: ${misc:Depends}
-Replaces: SRCPKGNAME-tools (<= 2.6.32-16.25)
-Description: Linux kernel specific tools for version PKGVER
- This package provides the architecture independent parts for kernel
- version locked tools in the PKGVER kernel source.
+#Package: SRCPKGNAME-tools-common
+#Architecture: all
+#Section: admin
+#Priority: optional
+#Depends: ${misc:Depends}
+#Replaces: SRCPKGNAME-tools (<= 2.6.32-16.25)
+#Description: Linux kernel specific tools for version PKGVER
+# This package provides the architecture independent parts for kernel
+# version locked tools in the PKGVER kernel source.
 
 Package: linux-headers-PKGVER-ABINUM
 Architecture: all
@@ -64,19 +64,19 @@ 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
  that want the latest kernel headers. Please read
- /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
+ /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: linux-libc-dev
-Architecture: 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
-Description: Linux Kernel Headers for development
- This package provides headers from the Linux kernel.  These headers
- are used by the installed headers for GNU glibc and other system
- libraries. They are NOT meant to be used to build third-party modules for
- your kernel. Use SRCPKGNAME-headers-* packages for that.
+#Package: linux-libc-dev
+#Architecture: 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
+#Description: Linux Kernel Headers for development
+# This package provides headers from the Linux kernel.  These headers
+# are used by the installed headers for GNU glibc and other system
+# libraries. They are NOT meant to be used to build third-party modules for
+# your kernel. Use SRCPKGNAME-headers-* packages for that.
 
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Architecture: armel
diff --git a/debian.ti-omap4/rules.d/armel.mk b/debian.ti-omap4/rules.d/armel.mk
index 2a9a82c08bf..b79b63cfcd8 100644
--- a/debian.ti-omap4/rules.d/armel.mk
+++ b/debian.ti-omap4/rules.d/armel.mk
@@ -9,3 +9,8 @@ install_file	= vmlinuz
 no_dumpfile = true
 
 loader		= grub
+
+do_doc_package          = false
+do_source_package       = false
+do_common_headers_indep = false
+do_libc_dev_package     = false