r3924 - in branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8: . debian

[Simon Horman]

Author: horms
Date: 2005-08-16 11:26:13 +0000 (Tue, 16 Aug 2005)
New Revision: 3924

Modified:
   branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog
   branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control
   branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install
   branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install
Log:
Remove non-security fixes

Modified: branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog
===================================================================
--- branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog	2005-08-16 11:21:35 UTC (rev 3923)
+++ branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog	2005-08-16 11:26:13 UTC (rev 3924)
@@ -1,17 +1,3 @@
-kernel-image-2.6.8-i386 (2.6.8-17) UNRELEASED; urgency=low
-
-  * Build against kernel-tree-2.6.8-17. (Simon Horman)
-  * Require gcc-3.3 as gcc-4.0, now the dedault in unstable,
-    fails to build this source. As this tree is primarily
-    intended for use with sarge, there seems little point
-    in putting in gcc-4.0 fixes, but at the same time,
-    there is some value in being able to use it with unstable.
-    (Simon Horman)
-  * Fix bogus source symlink in /lib/modules/2.6.8-2-flavour
-  * Allow build to work with kernel-package >= 9.002
-
- -- Simon Horman <horms at debian.org>  Mon,  1 Aug 2005 13:35:19 +0900
-
 kernel-image-2.6.8-i386 (2.6.8-16) unstable; urgency=low
 
   * Fix up AMD descriptions to include CPU name.

Modified: branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control
===================================================================
--- branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control	2005-08-16 11:21:35 UTC (rev 3923)
+++ branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control	2005-08-16 11:26:13 UTC (rev 3924)
@@ -4,7 +4,7 @@
 Maintainer: Debian kernel team <debian-kernel at lists.debian.org>
 Uploaders: William Lee Irwin III <wli at debian.org>, Andres Salomon <dilinger at debian.org>, Simon Horman <horms at debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-17, module-init-tools, gcc-3.3
+Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-16, module-init-tools
 
 Package: kernel-headers-2.6.8-2
 Architecture: i386

Modified: branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install
===================================================================
--- branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install	2005-08-16 11:21:35 UTC (rev 3923)
+++ branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install	2005-08-16 11:26:13 UTC (rev 3924)
@@ -4,25 +4,15 @@
 
 kbpkg=@kbpkg@
 
-# As of make-kpkg 9.002 these files are added automatically
-# This foo is to allow this package to build on Sarge
-# (kernel-package 8.135) and unstable, and to produce
-# packages with the same file layout as the original
-# sarge kernel-header packages.
-kpkg_version=`dpkg -p kernel-package | sed -ne 's/Version: //; T; p; q'`
-if dpkg --compare-versions "$kpkg_version" "<" "9.002"; then
-	cd $DEBIAN_SRCTOP
-	{
-		find . -path './scripts/*' -prune -o \
-			-path './Documentation/*' -prune -o \
-			-path './debian/*' -prune -o \
-			-type f \( -name Makefile -o -name 'Kconfig*' \) -print
-		echo arch/$DEB_HOST_ARCH/kernel/asm-offsets.s
-	} | cpio -pd --preserve-modification-time $OLDPWD
-	cd - > /dev/null
-else
-	rm -r scripts
-fi
+cd $DEBIAN_SRCTOP
+{
+	find . -path './scripts/*' -prune -o \
+		-path './Documentation/*' -prune -o \
+		-path './debian/*' -prune -o \
+		-type f \( -name Makefile -o -name 'Kconfig*' \) -print
+	echo arch/$DEB_HOST_ARCH/kernel/asm-offsets.s
+} | cpio -pd --preserve-modification-time $OLDPWD
+cd - > /dev/null
 ln -s ../$kbpkg/scripts .
 
 remove=

Modified: branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install
===================================================================
--- branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install	2005-08-16 11:21:35 UTC (rev 3923)
+++ branches/dist/sarge-security/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install	2005-08-16 11:26:13 UTC (rev 3924)
@@ -58,8 +58,6 @@
 
 mkdir -p $top/lib/modules/$version
 ln -s /usr/src/kernel-headers-$version $top/lib/modules/$version/build
-rm -f $top/lib/modules/$version/source
-ln -s /usr/src/kernel-headers-$version $top/lib/modules/$version/source
 
 debhelper_post $pkg