r3281 - in branches/kernel-image-2.6.11/debian: . templates

[Jurij Smakov]

Author: jurij-guest
Date: 2005-05-31 03:05:58 +0000 (Tue, 31 May 2005)
New Revision: 3281

Removed:
   branches/kernel-image-2.6.11/debian/TODO
Modified:
   branches/kernel-image-2.6.11/debian/Makefile
   branches/kernel-image-2.6.11/debian/templates/control.main.in
   branches/kernel-image-2.6.11/debian/templates/control.source.in
Log:
Looks like all pieces are in places.
Testing, testing, testing!


Modified: branches/kernel-image-2.6.11/debian/Makefile
===================================================================
--- branches/kernel-image-2.6.11/debian/Makefile	2005-05-31 02:16:28 UTC (rev 3280)
+++ branches/kernel-image-2.6.11/debian/Makefile	2005-05-31 03:05:58 UTC (rev 3281)
@@ -210,8 +210,9 @@
 	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 $</debian/files >> files
 	touch build-stamp-$(subarch)-$*
 #
 # Creates a build directory for a particular flavour

Deleted: branches/kernel-image-2.6.11/debian/TODO
===================================================================
--- branches/kernel-image-2.6.11/debian/TODO	2005-05-31 02:16:28 UTC (rev 3280)
+++ branches/kernel-image-2.6.11/debian/TODO	2005-05-31 03:05:58 UTC (rev 3281)
@@ -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.

Modified: branches/kernel-image-2.6.11/debian/templates/control.main.in
===================================================================
--- branches/kernel-image-2.6.11/debian/templates/control.main.in	2005-05-31 02:16:28 UTC (rev 3280)
+++ branches/kernel-image-2.6.11/debian/templates/control.main.in	2005-05-31 03:05:58 UTC (rev 3281)
@@ -21,11 +21,14 @@
 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 @@
 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

Modified: branches/kernel-image-2.6.11/debian/templates/control.source.in
===================================================================
--- branches/kernel-image-2.6.11/debian/templates/control.source.in	2005-05-31 02:16:28 UTC (rev 3280)
+++ branches/kernel-image-2.6.11/debian/templates/control.source.in	2005-05-31 03:05:58 UTC (rev 3281)
@@ -3,4 +3,5 @@
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 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