* Switch i386 kernel flavours again on advice from Ben:

+ Removed all mention of 686-bigmem as it's now gone
  + Moved 686 to interesting-fromcd23
  + Added 686-pae onto CD#1 in place of 686
  + Leave the 486 kernel on CD#1 still, for people who can't use 686-pae

debian/changelog

@@ -1,3 +1,14 @@
+debian-cd (3.1.8) UNRELEASED; urgency=low
+
+  [ Steve McIntyre ]
+  * Switch i386 kernel flavours again on advice from Ben:
+    + Removed all mention of 686-bigmem as it's now gone
+    + Moved 686 to interesting-fromcd23
+    + Added 686-pae onto CD#1 in place of 686
+    + Leave the 486 kernel on CD#1 still, for people who can't use 686-pae
+
+ -- Steve McIntyre <93sam@debian.org>  Tue, 07 Jun 2011 23:03:42 +0100
+
 debian-cd (3.1.7) unstable; urgency=low
 
   [ Ben Hutchings ]

tasks/wheezy/interesting-fromcd23

@@ -4,7 +4,7 @@
 
 /* Bring this up nearer the top of the list, above
  * linux-image-amd64. Bug #622622 */
-linux-image-686-bigmem
+linux-image-686
 
 dpkg-repack
 dctrl-tools

tools/generate_di+k_list

@@ -110,11 +110,11 @@ libc6-i686
  * Kernel headers are included as third party modules are commonly
  * used on this architecture.
  */
-linux-image-2.6-686
-linux-headers-2.6-686
-loop-aes-modules-2.6-686
-atl2-modules-2.6-686
-speakup-modules-2.6-686
+linux-image-2.6-686-pae
+linux-headers-2.6-686-pae
+loop-aes-modules-2.6-686-pae
+atl2-modules-2.6-686-pae
+speakup-modules-2.6-686-pae
 #ifndef ARCH_i386_EXCLUDE_486_KERNEL
 linux-image-2.6-486
 linux-headers-2.6-486
@@ -122,13 +122,6 @@ loop-aes-modules-2.6-486
 atl2-modules-2.6-486
 speakup-modules-2.6-486
 #endif
-#ifdef VARIANT_xen
-linux-image-2.6-686-bigmem
-linux-headers-2.6-686-bigmem
-loop-aes-modules-2.6-686-bigmem
-atl2-modules-2.6-686-bigmem
-speakup-modules-2.6-686-bigmem
-#endif
 
 #endif