Hi,
Can someone delete tools/ddetect/debian/{d,eth}detect.templates
and apply the attached patch, thanks.
regards,
guillem
Index: ddetect/debian/rules
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/ddetect/debian/rules,v
retrieving revision 1.6
diff -u -r1.6 rules
--- ddetect/debian/rules 6 Aug 2002 15:28:49 -0000 1.6
+++ ddetect/debian/rules 19 Aug 2002 07:54:54 -0000
@@ -32,6 +32,8 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ $(foreach PACKAGE, $(PACKAGES), \
+ ( rm -f debian/$$PACKAGE.templates) ; )
-$(MAKE) clean
rm -f debian/ethdetect.postinst
@@ -42,7 +44,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(foreach PACKAGE, $(PACKAGES), \
+ $(foreach PACKAGE, $(PACKAGES), \
( $(MAKE) install PROGS=$(PACKAGE) DESTDIR=`pwd`/debian/$(PACKAGE)) ; )
@@ -54,6 +56,15 @@
binary-arch: build install
dh_testdir
dh_testroot
+
+ $(foreach PACKAGE, $(PACKAGES), \
+ ( TEMPLATES=""; \
+ for TEMPLATE_LL in debian/template/$$PACKAGE.templates.* ; do \
+ TEMPLATES="$$TEMPLATES $$TEMPLATE_LL" ; \
+ done ; \
+ echo "Creating $$PACKAGE.templates -- $$TEMPLATES "; \
+ debconf-mergetemplate $$TEMPLATES > debian/$$PACKAGE.templates ); )
+
dh_installdebconf
$(foreach PACKAGE, $(PACKAGES), \
(cp debian/$(PACKAGE).menutest debian/$(PACKAGE)/DEBIAN/menutest ) ; )
Index: ddetect/debian/templates/ethdetect.templates.da
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/ddetect/debian/templates/ethdetect.templates.da,v
retrieving revision 1.1
diff -u -r1.1 ethdetect.templates.da
--- ddetect/debian/templates/ethdetect.templates.da 8 Feb 2002 14:57:22 -0000
1.1
+++ ddetect/debian/templates/ethdetect.templates.da 19 Aug 2002 07:54:55 -0000
@@ -2,7 +2,7 @@
Type: select
Choices: passive, full, none
Choices-da: passiv, fuld, ingen
-Default: passive
+Default: passive
Default-da: passiv
Description: What level of hardware detection would you like?
I can automatically detect some hardware. If you want me to try to detect
Index: ddetect/debian/templates/ethdetect.templates.en
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/ddetect/debian/templates/ethdetect.templates.en,v
retrieving revision 1.1
diff -u -r1.1 ethdetect.templates.en
--- ddetect/debian/templates/ethdetect.templates.en 29 Jan 2002 08:00:08 -0000
1.1
+++ ddetect/debian/templates/ethdetect.templates.en 19 Aug 2002 07:54:55 -0000
@@ -1,7 +1,7 @@
Template: ethdetect/detection_type
Type: select
Choices: passive, full, none
-Default: passive
+Default: passive
Description: What level of hardware detection would you like?
I can automatically detect some hardware. If you want me to try to detect
your hardware you can choose between full and passive detection. Full
@@ -17,19 +17,11 @@
This is a list of modules that I know about. Choose the module from the list
that supports your card. If your card requires a different module, choose
'other' and you will be prompted for the location of that module.
-Description-de: Welche Module benötigt Ihre Netzwerkkarte?
- Dies ist die Liste alle verfügbare Module. Wählen Sie das zu
- Ihrer Netzwerkkarte passende Modul aus. Wenn es nicht in der
- Liste aufgeführt ist wählen Sie 'andere'. Sie können dann den
- Pfad zum laden Moduls angeben.
Template: ethdetect/module_prompt
Type: string
Description: Where is the module for your ethernet card?
Please enter the full path to the module for your ethernet card.
-Description-de: Wo ist das Modul für die Netzwerkkarte gespeichert?
- Bitte geben Sie den vollständigen Pfad zum Modul für die
- Netzwerkkarte an.
Template: ethdetect/module_params
Type: string
@@ -38,11 +30,6 @@
parameters are often I/O port and IRQ numbers that vary from machine to
machine and cannot be determined from the hardware. An example string looks
something like "IRQ=7 IO=0x220"
-Description-de: Bitte geben Sie zusätzliche Parameter an.
- Manche Module akzeptieren die Angabe zusätzlicher Startparameter,
- wie z.B. die I/O-Adresse oder den IRQ. Diese Angaben sind von
- Rechner zu Rechner unterschiedlich. Eine Parameterangabe kann
- zum Beispiel so aussehen: "IRQ=7 IO=0x220".
Template: ethdetect/load_module
Type: boolean
@@ -55,8 +42,6 @@
Type: note
Description: An error occured.
Something went wrong.
-Description-de: Ein Fehler ist aufgetreten.
- Ein Fehler ist aufgetreten.
Template: ethdetect/nothing_detected
Type: note
Index: ddetect/debian/templates/ethdetect.templates.nl
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/ddetect/debian/templates/ethdetect.templates.nl,v
retrieving revision 1.1
diff -u -r1.1 ethdetect.templates.nl
--- ddetect/debian/templates/ethdetect.templates.nl 29 Jan 2002 08:00:08 -0000
1.1
+++ ddetect/debian/templates/ethdetect.templates.nl 19 Aug 2002 07:54:55 -0000
@@ -1,6 +1,6 @@
Template: ethdetect/detection_type
Type: select
-Choices: passive, none
+Choices: passive, full, none
Choices-nl: passief, geen
Description: What level of hardware detection would you like?
I can automatically detect some hardware. If you want me to try to detect
@@ -44,7 +44,7 @@
Some modules accept load-time parameters to customize their operation.
These parameters are often I/O port and IRQ numbers that vary from machine
to machine and cannot be determined from the hardware. An example string
- looks something like "IRQ=7 IO=0x220"
+ looks something like "IRQ=7 IO=0x220"
Description-nl: Geef aanvullende parameters
Sommige modules accepteren parameters bij het laden die hun werking
kunnen aanpassen. Deze parameters zijn vaak de I/O poort en IRQ nummers
@@ -54,6 +54,7 @@
Template: ethdetect/load_module
Type: boolean
+Default: true
Description: Would you like me to attempt to load the '${module}' module?
An ethernet card has been detected on the ${bus} bus. In order for the
operating system to use this card the module '${module}' must be loaded.
Index: netcfg/debian/rules
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/netcfg/debian/rules,v
retrieving revision 1.13
diff -u -r1.13 rules
--- netcfg/debian/rules 13 Aug 2002 16:19:34 -0000 1.13
+++ netcfg/debian/rules 19 Aug 2002 07:54:56 -0000
@@ -64,8 +64,8 @@
for TYPE in common dhcp static ; do \
TEMPLATES=""; \
- for LINGUA in en de ru fr ; do \
- TEMPLATES="$$TEMPLATES
debian/template/netcfg-$$TYPE.templates.$$LINGUA" ; \
+ for TEMPLATE_LL in debian/template/netcfg-$$TYPE.templates.* ; do \
+ TEMPLATES="$$TEMPLATES $$TEMPLATE_LL" ; \
done ; \
echo "Creating netcfg-$$TYPE.templates -- $$TEMPLATES "; \
debconf-mergetemplate $$TEMPLATES > debian/netcfg-$$TYPE.templates; \
