[kernel] r5310 - in dists/trunk/linux-2.6/debian: . patches

[Sven Luther]

Author: luther
Date: Fri Jan  6 08:03:55 2006
New Revision: 5310

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch
Log:
Added bug closers to changelog entry about making initramfs-tools the default.
Removed spurious 'sven' file from powerpc-apus.patch.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan  6 08:03:55 2006
@@ -2,15 +2,19 @@
 
   [ maximilian attems ]
   * Default to initramfs-tools as initramfs generator.
+    (Closes: #346141, #343147, #341524)
 
   [ dann frazier ]
   * [ia64] Update config for 2.6.15.
 
   [ Frederik Schüler ]
-  * Make CONFIG_IPW2100 a per-architecture option and deactivate it on all 
+  * Make CONFIG_IPW2100 a per-architecture option and deactivate it on all
     architectures but i386. (Closes: #344515)
 
- -- Frederik Schüler <fs at debian.org>  Thu,  5 Jan 2006 14:19:56 +0100
+  [ Sven Luther ]
+  * Removed spurious file from powerpc-apus patch. (Closes: #346159)
+
+ -- Sven Luther <luther at debian.org>  Fri,  6 Jan 2006 07:56:52 +0000
 
 linux-2.6 (2.6.15-1) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch	Fri Jan  6 08:03:55 2006
@@ -3353,57 +3353,3 @@
  				return -EFAULT;				\
  			data = convsample(data);			\
  			*righth++ = data>>8;				\
-diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/sven linux-2.6-2.6.14+2.6.15-rc7/sven
---- linux-2.6-2.6.14+2.6.15-rc7.orig/sven	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6-2.6.14+2.6.15-rc7/sven	2005-12-29 09:31:10.000000000 +0000
-@@ -0,0 +1,50 @@
-+patching file arch/ppc/Kconfig
-+patching file arch/ppc/amiga/Makefile
-+patching file arch/ppc/amiga/amiints.c
-+patching file arch/ppc/amiga/bootinfo.c
-+patching file arch/ppc/amiga/cia.c
-+patching file arch/ppc/amiga/config.c
-+patching file arch/ppc/amiga/time.c
-+patching file arch/ppc/configs/apus_defconfig
-+patching file arch/ppc/kernel/Makefile
-+Hunk #1 succeeded at 353 with fuzz 2.
-+Hunk #4 succeeded at 1231 (offset -6 lines).
-+Hunk #5 succeeded at 1248 (offset -6 lines).
-+Hunk #6 succeeded at 1444 (offset -6 lines).
-+patching file arch/ppc/kernel/head_end.S
-+patching file arch/ppc/kernel/misc.S
-+Hunk #1 succeeded at 1325 (offset -52 lines).
-+patching file arch/ppc/kernel/ppc_ksyms.c
-+Hunk #2 succeeded at 144 (offset 4 lines).
-+patching file arch/ppc/kernel/setup.c
-+Hunk #1 succeeded at 566 (offset 20 lines).
-+Hunk #2 succeeded at 625 (offset 32 lines).
-+patching file arch/ppc/kernel/time.c
-+Hunk #1 succeeded at 156 (offset 4 lines).
-+Hunk #2 succeeded at 183 (offset 4 lines).
-+patching file arch/ppc/mm/Makefile
-+patching file arch/ppc/mm/init.c
-+patching file arch/ppc/mm/pgtable.c
-+Hunk #2 succeeded at 427 (offset -2 lines).
-+patching file arch/ppc/platforms/apus_setup.c
-+patching file drivers/block/amiflop.c
-+patching file include/asm-m68k/bootinfo.h
-+patching file include/asm-ppc/amigahw.h
-+patching file include/asm-ppc/bootinfo.h
-+patching file include/asm-powerpc/current.h
-+Hunk #1 FAILED at 1.
-+1 out of 1 hunk FAILED -- saving rejects to file include/asm-powerpc/current.h.rej
-+patching file include/asm-ppc/io.h
-+Hunk #2 succeeded at 297 (offset 3 lines).
-+Hunk #3 succeeded at 380 (offset 3 lines).
-+Hunk #4 succeeded at 402 (offset 3 lines).
-+Hunk #5 succeeded at 420 (offset 3 lines).
-+Hunk #6 succeeded at 530 (offset -7 lines).
-+Hunk #7 succeeded at 563 (offset 10 lines).
-+patching file include/asm-ppc/machdep.h
-+patching file include/asm-ppc/pgtable.h
-+Hunk #1 succeeded at 724 (offset 1 line).
-+patching file include/asm-ppc/zorro.h
-+patching file include/video/vga.h
-+patching file sound/oss/dmasound/dmasound_paula.c
-+patching file drivers/video/console/fonts.c