From 4995e1c70d1ec072c092e3cf019527565ba37927 Mon Sep 17 00:00:00 2001 From: Jurij Smakov Date: Tue, 31 May 2005 03:05:58 +0000 Subject: [PATCH] Looks like all pieces are in places. Testing, testing, testing! svn path=/branches/kernel-image-2.6.11/; revision=3281 --- debian/Makefile | 5 +++-- debian/TODO | 7 ------- debian/templates/control.main.in | 20 ++++++++++++-------- debian/templates/control.source.in | 3 ++- 4 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 debian/TODO diff --git a/debian/Makefile b/debian/Makefile index e7edb6547..3f2631890 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -210,8 +210,9 @@ build-stamp-$(subarch)-%: build-$(subarch)-% src="arch/$${arch}/kernel/asm-offsets.s"; \ dst="../$(kdir)/$${src}"; \ if [ -f "$${src}" ] && [ ! -e "$${dst}" ]; then \ - ln -s "$$(pwd)/$${src}" "$${dst}"; \ - fi + ln -s "$$(pwd)/$${src}" "$${dst}"; \ + fi + cat $> files touch build-stamp-$(subarch)-$* # # Creates a build directory for a particular flavour diff --git a/debian/TODO b/debian/TODO deleted file mode 100644 index 54f5fb055..000000000 --- a/debian/TODO +++ /dev/null @@ -1,7 +0,0 @@ -Some things to think about: - -* Looks like it would be optimal to have a common kernel-headers package - which would contain common headers for all arches without unmerged patches. - -* Generate the control file for individual files dynamically, so that we - do not have that ridiculous master control file. diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index d21c13ecb..471ecc64e 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -21,11 +21,14 @@ Priority: optional Provides: linux-doc-@major@ Depends: coreutils | fileutils (>= 4.0) Description: Linux kernel specific documentation for version @version@ - This package provides the various README files in the @version@ kernel - Documentation/ subdirectory: these typically contain kernel-specific - installation notes for some drivers for example. See - /usr/share/doc/linux-doc-@version@/Documentation/00-INDEX for a list of what - is contained in each file. + This package provides the various README files and HTML documentation for + the Linux kernel version @version@. Plenty of information, including the + descriptions of varios kernel subsystems, filesystems, driver-specific + notes and the like. Consult the file + . + /usr/share/doc/linux-doc-@version@/Documentation/00-INDEX + . + for the detailed description of the contents. Package: linux-patch-debian-@version@ Architecture: all @@ -35,10 +38,11 @@ Depends: bzip2, ${kpatch: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 - linux-source-@version@ package. Note that these patches do NOT apply - against a pristine Linux @version@ kernel but only against + linux-source-@version@ package, as well as architecture-specific + patches. Note that these patches do NOT apply against a pristine + Linux @version@ kernel but only against the kernel tarball linux-source-@version@_@version@.orig.tar.gz from the Debian archive. - + Package: linux-tree-@version@ Architecture: all Section: devel diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index a30176cd9..c370ad749 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,4 +3,5 @@ Section: devel Priority: optional Maintainer: Debian Kernel Team Standards-Version: 3.6.1.0 -Build-Depends: Build-Depends: gcc (>= 4:3.3), debhelper (>= 4), kernel-package, module-init-tools, sparc-utils [sparc] +Build-Depends: gcc (>= 4:3.3), debhelper (>= 4), kernel-package (>= 8.135), module-init-tools, dpkg-dev (>= 1.10.23), debian-utils (>= 1.6), bzip2, console-tools, sparc-utils [sparc] +Build-Depends-Indep: bzip2, debhelper (>= 4), docbook-utils, gs, kernel-package (>= 8.135), transfig