From 6fdcd2db92d056a690c2f42d90b036c44a6a6e05 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Jun 2006 22:44:39 +0000 Subject: [PATCH] * Add pcmciautils-udeb to udeb_include lists; something needs to pull it in and like pcmcia-cs-udeb its priority won't. --- data/etch/amd64_businesscard_udeb_include | 2 +- data/etch/amd64_netinst_udeb_include | 2 +- data/etch/amd64_udeb_include | 2 +- data/etch/exclude-udebs-powerpc | 3 --- data/etch/i386_businesscard_udeb_include | 1 + data/etch/i386_netinst_udeb_include | 1 + data/etch/i386_udeb_include | 1 + data/etch/powerpc_udeb_include | 1 + debian/changelog | 4 +++- 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/data/etch/amd64_businesscard_udeb_include b/data/etch/amd64_businesscard_udeb_include index c8849a91..bfc81f03 100644 --- a/data/etch/amd64_businesscard_udeb_include +++ b/data/etch/amd64_businesscard_udeb_include @@ -1,5 +1,5 @@ choose-mirror netcfg ethdetect -pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/data/etch/amd64_netinst_udeb_include b/data/etch/amd64_netinst_udeb_include index 275197a4..e5ed8739 100644 --- a/data/etch/amd64_netinst_udeb_include +++ b/data/etch/amd64_netinst_udeb_include @@ -1,4 +1,4 @@ netcfg ethdetect -pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/data/etch/amd64_udeb_include b/data/etch/amd64_udeb_include index 275197a4..e5ed8739 100644 --- a/data/etch/amd64_udeb_include +++ b/data/etch/amd64_udeb_include @@ -1,4 +1,4 @@ netcfg ethdetect -pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/data/etch/exclude-udebs-powerpc b/data/etch/exclude-udebs-powerpc index 606eac2d..0ae1c0cf 100644 --- a/data/etch/exclude-udebs-powerpc +++ b/data/etch/exclude-udebs-powerpc @@ -17,9 +17,6 @@ fs-common-modules-* ide-modules-* input-modules-* kbd-chooser -pcmcia-cs-udeb -pcmcia-modules-* -pcmcia-storage-modules-* scsi-common-modules-* scsi-core-modules-* scsi-modules-* diff --git a/data/etch/i386_businesscard_udeb_include b/data/etch/i386_businesscard_udeb_include index c8849a91..ecce0bd5 100644 --- a/data/etch/i386_businesscard_udeb_include +++ b/data/etch/i386_businesscard_udeb_include @@ -2,4 +2,5 @@ choose-mirror netcfg ethdetect pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/data/etch/i386_netinst_udeb_include b/data/etch/i386_netinst_udeb_include index 275197a4..081a7435 100644 --- a/data/etch/i386_netinst_udeb_include +++ b/data/etch/i386_netinst_udeb_include @@ -1,4 +1,5 @@ netcfg ethdetect pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/data/etch/i386_udeb_include b/data/etch/i386_udeb_include index 275197a4..081a7435 100644 --- a/data/etch/i386_udeb_include +++ b/data/etch/i386_udeb_include @@ -1,4 +1,5 @@ netcfg ethdetect pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/data/etch/powerpc_udeb_include b/data/etch/powerpc_udeb_include index 275197a4..081a7435 100644 --- a/data/etch/powerpc_udeb_include +++ b/data/etch/powerpc_udeb_include @@ -1,4 +1,5 @@ netcfg ethdetect pcmcia-cs-udeb +pcmciautils-udeb wireless-tools-udeb diff --git a/debian/changelog b/debian/changelog index b6b0a3f1..9ab7a6ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,8 +65,10 @@ debian-cd (2.2.25) UNRELEASED; urgency=low * Add gtk initrd to amd64 images if available. * Add autorun file to amd64 images if there's a README.html, same as for i386. + * Add pcmciautils-udeb to udeb_include lists; something needs to pull it + in and like pcmcia-cs-udeb its priority won't. - -- Joey Hess Thu, 15 Jun 2006 15:25:08 -0400 + -- Joey Hess Thu, 15 Jun 2006 18:42:51 -0400 debian-cd (2.2.24) unstable; urgency=low