Read tasksel's debian-tasks.desc from its new location.

Falls back to old location so update_tasks can still be used with old
tasksel.

This does not deal with most of the task information being removed from
debian-tasks.desc. The file still has Key fields, that now list the task-*
packages, and the packages Depend on the crucial packages for the task.
So to that extent it should continue to work.

However, with NORECOMMENDS set, the Recommended other packages for tasks
won't be included on CD. This still needs to be dealt with, probably by
adding all packages listed in Recommends of task-* packages to the
generated task list files.

debian/changelog

@@ -7,6 +7,9 @@ debian-cd (3.1.8) UNRELEASED; urgency=low
     + Leave the 486 kernel on CD#1 still, for people who can't use 686-pae
     + Add zfsutils into the generate_d-i+k_list for kfreebsd users.
 
+  [ Joey Hess ]
+  * Read tasksel's debian-tasks.desc from its new location.
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 07 Jun 2011 23:03:42 +0100
 
 debian-cd (3.1.7) unstable; urgency=low

tools/update_tasks

@@ -108,9 +108,14 @@ update_essential_list () {
     tasklist=$2
     tasksel=$3
 
+    file=$tasksel/usr/share/tasksel/descs/debian-tasks.desc
+    if [ ! -e $file ]; then
+	    file=$tasksel/usr/share/tasksel/debian-tasks.desc
+    fi
+
     (grep -Ev "^(#.*)?[[:space:]]*$" $tasklist ;
 		echo DONE ;
-		cat $tasksel/usr/share/tasksel/debian-tasks.desc) | mawk '
+		cat $file) | mawk '
 
     /DONE/ {
         in_tasks = 1