generate_di+k_list: fix logic error in use of codenames

When building a CD for e.g. etch using D-I from e.g. sid, the script should
not update debian-installer+kernel-sid but debian-installer+kernel-etch in
tasks. After all, debian-installer+kernel-* contains normal packages, and
not udebs. With this change we no longer have to modify the Debian_<codename>
tasks in such cases.
The generated file should of course have '#include <debian-installer-sid>'.

debian/changelog

@@ -25,6 +25,11 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   [ Frans Pop ]
   * Drop the base-{etch,lenny} tasks files as make_disc_trees.pl already takes
     care of including packages needed by debootstrap.
+  * generate_di+k_list: fix logic error in use of codenames.
+    When building a CD for e.g. etch using D-I from e.g. sid, the script
+    should update tasks/debian-installer+kernel-etch (instead of -sid), and
+    that file should have '#include <debian-installer-sid>'. This means we'll
+    no longer have to modify the Debian_* tasks in such cases.
  
   [ Raphael Hertzog ]
   * Switch debhelper compatibility level to 5 and use debian/compat
@@ -34,7 +39,7 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   [ Joey Hess ]
   * Add per-language desktop tasks to the task.list files.
 
- -- Frans Pop <fjp@debian.org>  Sun, 04 May 2008 19:55:17 +0200
+ -- Frans Pop <fjp@debian.org>  Sat, 17 May 2008 18:03:38 +0200
 
 debian-cd (3.0.4) unstable; urgency=low
 

tools/generate_di+k_list

@@ -19,7 +19,7 @@ if [ "$DI_CODENAME"x = ""x ] ; then
 fi
 
 DATE=`date`
-cat > debian-installer+kernel-$DI_CODENAME << EOF
+cat > debian-installer+kernel-$CODENAME << EOF
 /* These packages + the ones needed by debootstrap are the ones needed for
  * debian-installer to be able to install a base Debian system.
  *