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

[Jurij Smakov]

Author: jurij-guest
Date: 2005-05-31 23:38:14 +0000 (Tue, 31 May 2005)
New Revision: 3289

Modified:
   branches/kernel-image-2.6.11/debian/Makefile
   branches/kernel-image-2.6.11/debian/control
   branches/kernel-image-2.6.11/debian/rules
   branches/kernel-image-2.6.11/debian/templates/post-install.in
Log:
* Add dh-kpatches to build-deps-indep.
* Copy asm-offsets.s in place instead of symlinking
* Make sure DEBIAN does not get into packages.


Modified: branches/kernel-image-2.6.11/debian/Makefile
===================================================================
--- branches/kernel-image-2.6.11/debian/Makefile	2005-05-31 23:11:54 UTC (rev 3288)
+++ branches/kernel-image-2.6.11/debian/Makefile	2005-05-31 23:38:14 UTC (rev 3289)
@@ -210,7 +210,7 @@
 	src="arch/$${arch}/kernel/asm-offsets.s";		\
 	dst="../$(kdir)/$${src}";				\
 	if [ -f "$${src}" ] && [ ! -e "$${dst}" ]; then		\
-	  ln -s "$$(pwd)/$${src}" "$${dst}";			\
+	  cp -a "$$(pwd)/$${src}" "$${dst}";			\
 	fi
 	touch build-stamp-$(subarch)-$*
 #

Modified: branches/kernel-image-2.6.11/debian/control
===================================================================
--- branches/kernel-image-2.6.11/debian/control	2005-05-31 23:11:54 UTC (rev 3288)
+++ branches/kernel-image-2.6.11/debian/control	2005-05-31 23:38:14 UTC (rev 3289)
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Standards-Version: 3.6.1.0
 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
+Build-Depends-Indep: bzip2, debhelper (>= 4), docbook-utils, gs, kernel-package (>= 8.135), transfig, dh-kpatches (>= 0.99.35)
 
 Package: linux-source-2.6.11
 Architecture: all

Modified: branches/kernel-image-2.6.11/debian/rules
===================================================================
--- branches/kernel-image-2.6.11/debian/rules	2005-05-31 23:11:54 UTC (rev 3288)
+++ branches/kernel-image-2.6.11/debian/rules	2005-05-31 23:38:14 UTC (rev 3289)
@@ -199,7 +199,7 @@
 	cd debian;						\
 	rm -f *-stamp-* *-stamp config.* *.kpatches.arch; 	\
 	rm -f header-install-* post-install-* bin/touch.orig;	\
-	rm -rf kernel-source-* build-* install-*
+	rm -rf linux-source-* build-* install-*
 	dh_clean
 
 binary-indep: source tree patch-debian doc

Modified: branches/kernel-image-2.6.11/debian/templates/post-install.in
===================================================================
--- branches/kernel-image-2.6.11/debian/templates/post-install.in	2005-05-31 23:11:54 UTC (rev 3288)
+++ branches/kernel-image-2.6.11/debian/templates/post-install.in	2005-05-31 23:38:14 UTC (rev 3289)
@@ -65,7 +65,7 @@
 
 find . -mindepth 1 -maxdepth 1 \
 	! -name debian -a ! -name Documentation -a ! -name include -a \
-	! -name '.*' -a \( \
+	! -name DEBIAN -a ! -name '.*' -a \( \
 	-name Makefile -o -type d \) \
 	-printf "../linux-headers-$prefix/%f\n" |
 	xargs ln -s --target-directory="$dir"