Move the "firmware" task into per-release task dirs like it should

have been to start with.

Makefile

@@ -133,8 +133,6 @@ ifneq ($(ARCHES),source)
 	$(Q)mkdir -p $(TASKDIR)
 	$(Q)echo "- copying task files from 'tasks/$(DI_CODENAME)/'"
 	$(Q)cp -r $(BASEDIR)/tasks/$(CODENAME)/* $(TASKDIR)
-	$(Q)echo "- copying firwmare task file from 'tasks/firmware'"
-	$(Q)cp -r $(BASEDIR)/tasks/firmware $(TASKDIR)
 	$(Q)echo "- task.languages: using 'tasks/$(DI_CODENAME)/$(TASK_LANGLIST)'"
 	$(Q)cp $(BASEDIR)/tasks/$(DI_CODENAME)/$(TASK_LANGLIST) \
 		$(TASKDIR)/task.languages

debian/changelog

@@ -27,6 +27,8 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
     + Switch from awk to perl makes things much faster too!
     + Make arch handling more generic - instead of having to list all
       arches, allow a wildcard and then check for lack of Packages.gz files
+  * Move the "firmware" task into per-release task dirs like it should
+    have been to start with.
 
   [ Aurelien Jarno ]
   * Add support for hurd-i386. Closes: #619211

tasks/squeeze/firmware

@@ -0,0 +1,16 @@
+/* This file lists non-free firmware packages used by d-i (for all arches) */
+ixp4xx-microcode
+atmel-firmware
+firmware-bnx2
+firmware-bnx2x
+firmware-ipw2x00
+firmware-ipw3945
+firmware-iwlwifi
+firmware-linux
+firmware-linux-nonfree
+firmware-qlogic
+firmware-ralink
+libertas-firmware
+zd1211-firmware
+/* This firmware is free, but it is convenient to include it here. */
+firmware-linux-free

tasks/wheezy/firmware

@@ -0,0 +1,16 @@
+/* This file lists non-free firmware packages used by d-i (for all arches) */
+ixp4xx-microcode
+atmel-firmware
+firmware-bnx2
+firmware-bnx2x
+firmware-ipw2x00
+firmware-ipw3945
+firmware-iwlwifi
+firmware-linux
+firmware-linux-nonfree
+firmware-qlogic
+firmware-ralink
+libertas-firmware
+zd1211-firmware
+/* This firmware is free, but it is convenient to include it here. */
+firmware-linux-free