Rearrangements in preparation to merge with

kernel-source

svn path=/branches/kernel-image-2.6.11/; revision=3240

debian/Makefile

@@ -129,21 +129,21 @@ headers-stamp: $(kdir)
 
 binary:	binary-indep binary-arch
 
-header-install-$(subarch): header-install.in
+header-install-$(subarch): templates/header-install.in
 	sed -e 's,@kbpkg@,$(kbpkg),g'				\
 	    -e 's,@ksource_dir@,$(CURDIR)/$(kdir),g'		\
 	    -e 's,@headers_dirs@,$(headers_dirs),g'		\
 	    -e 's,@headers_extra@,$(headers_extra),g'		\
-            header-install.in > header-install-$(subarch)
+            templates/header-install.in > header-install-$(subarch)
 	chmod u+x header-install-$(subarch)
 #
 # The way to make the correct package names is to make a
 # subarch-specific post-install script...
 #
-post-install-$(subarch): post-install.in
+post-install-$(subarch): templates/post-install.in
 	sed -e 's,@initrd_modules@,$(initrd_modules),'	\
 	    -e 's,@append_subarch@,$(append),'		\
-	    post-install.in > post-install-$(subarch)
+	    templates/post-install.in > post-install-$(subarch)
 #
 # Generates the kernel config file for a subarch by merging
 # the arch-independent config file (arch/config.common),

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 # Required variables
-#
+# 
 version   := 2.6.11
 abiname   := 1
 ktver     := 5

debian/templates/control.main.in

@@ -0,0 +1,100 @@
+Source: linux-world-@version@
+Section: devel
+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]
+
+Package: linux-source-@version@
+Architecture: all
+Section: devel
+Priority: optional
+Provides: linux-source, linux-source-@major@, kernel-source, kernel-source-@major@
+Depends: binutils, bzip2, coreutils | fileutils (>= 4.0)
+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
+ This package provides the source code for the Linux kernel version 2.6.11.
+ .
+ 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. 
+
+Package: linux-docs-@version@
+Architecture: all
+Section: doc
+Priority: optional
+Provides: linux-docs-@major@, kernel-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/kernel-doc-@version@/Documentation/00-INDEX for a list of what
+ is contained in each file.
+
+Package: linux-patch-debian-@version@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: bzip2
+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@_@version@.orig.tar.gz from the Debian archive.
+
+Package: linux-tree-@version@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: linux-patch-debian-@version@ (= @source_version@), @kt_depends@
+Provides: @kt_provides@
+Description: Linux kernel source tree for building Debian kernel images
+ This meta package is used as a build dependency of Debian
+ linux-image packages to prevent a version discrepancy between
+ the linux-image and corresponding linux-sources packages in the
+ fast-moving unstable archive. The package's dependency relations
+ are structured so that a linux-image package's build
+ dependencies can always be satisfied, even if the linux-source
+ package that had been used to compile the image has been
+ superseeded by a newer Debian revision since the last build.
+ .
+ The package provides a list of virtual packages, corresponding to
+ Debian revisions of a linux-source package. The Debian
+ linux-patch contains the information needed to roll back the
+ current linux-source to any of the revisions identified by the
+ provided virtual packages. Therefore, the linux-tree package
+ ensures the availability of the Linux kernel source tree corresponding
+ to each of the virtual packages listed.
+ .
+ The package serves no purpose outside of the Debian build and
+ archive infrastructure.
+
+Package: linux-headers-@version@-@abiname@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0)
+Provides: linux-headers, linux-headers-@major@, kernel-headers, kernel-headers-@major@
+Description: Architecture-independent header files for Linux kernel @version@
+ This package provides the architecture-independent kernel header files
+ for Linux kernel version @version@, generally used for building out-of-tree
+ kernel modules. It does not include the header files for (sub)architectures
+ which require additional unmerged patches to build, for those separate
+ header packages are provided.
+
+Package: linux-scripts-@version@-@abiname@
+Architecture: any
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0)
+Description: Architecture-specific header files for Linux kernel @version@
+ This package provides the architecture-specific support files for Linux
+ kernel version @version@, generally used for building out-of-tree
+ kernel modules. It mainly contains the binaries from the script/ kernel
+ directory, as well as other architecture-dependent files such as
+ asm-offsets.s.
+