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

[Jurij Smakov]

Author: jurij-guest
Date: 2005-05-31 02:16:28 +0000 (Tue, 31 May 2005)
New Revision: 3280

Modified:
   branches/kernel-image-2.6.11/debian/rules
   branches/kernel-image-2.6.11/debian/templates/control.main.in
Log:
Added the building of linux-doc package.


Modified: branches/kernel-image-2.6.11/debian/rules
===================================================================
--- branches/kernel-image-2.6.11/debian/rules	2005-05-31 01:17:23 UTC (rev 3279)
+++ branches/kernel-image-2.6.11/debian/rules	2005-05-31 02:16:28 UTC (rev 3280)
@@ -47,7 +47,7 @@
 patch: debian/patch-stamp
 debian/patch-stamp: debian/bin/apply
 	dh_testdir
-	override_version=$(release) home=debian/patches debian/bin/apply
+	override_version=$(release) home=debian/patches-debian debian/bin/apply
 #	make-kpkg does this when building kernel-source.
 	mv scripts/package/Makefile scripts/package/Makefile.dist
 	mv scripts/package/builddeb scripts/package/builddeb.dist
@@ -57,12 +57,12 @@
 
 unpatch:
 	dh_testdir
-	if [ -e debian/patch-stamp ]; then			\
-	  override_version=$(release) home=debian/patches	\
-	    debian/bin/apply $(version);			\
-	  cd scripts/package;					\
-	  mv Makefile.dist Makefile;				\
-	  mv builddeb.dist builddeb;				\
+	if [ -e debian/patch-stamp ]; then				\
+	  override_version=$(release) home=debian/patches-debian	\
+	    debian/bin/apply $(version);				\
+	  cd scripts/package;						\
+	  mv Makefile.dist Makefile;					\
+	  mv builddeb.dist builddeb;					\
 	fi
 	rm -f debian/patch-stamp
 #
@@ -151,6 +151,27 @@
 	dh_md5sums -p$(ppkg)
 	dh_builddeb -p$(ppkg)
 	touch debian/patch-debian-stamp
+#
+# linux-doc package
+#
+dbdir := debian/build-doc
+dbddir := $(dbdir)/debian
+doc: debian/doc-stamp
+debian/doc-stamp: debian/patch-stamp
+	dh_testdir
+	dh_testroot
+#	Create a build tree
+	mkdir -p $(dbdir)
+	cp -al $(source_files) $(dbdir)
+	mkdir -p $(dbddir)
+	cp debian/changelog $(dbddir)
+	cp debian/control   $(dbddir)
+	cp debian/copyright $(dbddir)
+	touch $(dbddir)/official
+	cd $(dbdir) && make-kpkg --stem linux kernel-doc
+	cat $(dbddir)/files >> debian/files
+	mv debian/*.deb ..
+	touch debian/doc-stamp
 
 unpack: debian/unpack-stamp
 debian/unpack-stamp: debian/patch-stamp
@@ -181,7 +202,7 @@
 	rm -rf kernel-source-* build-* install-*		
 	dh_clean
 
-binary-indep: source tree
+binary-indep: source tree patch-debian doc
 binary-arch: build
 	dh_testdir
 	for i in $(subarchs); do	\

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 01:17:23 UTC (rev 3279)
+++ branches/kernel-image-2.6.11/debian/templates/control.main.in	2005-05-31 02:16:28 UTC (rev 3280)
@@ -65,16 +65,3 @@
  .
  The package serves no purpose outside of the Debian build and
  archive infrastructure.
-
-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.
-