[RFR] templates://freebsd-utils/{kbdcontrol.templates,module-init-tools.te mplates}

2009-04-19 Thread Christian Perrier
Please find, for review, the debconf templates and packages descriptions for 
the freebsd-utils source package.

This review will last from Sunday, April 19, 2009 to Wednesday, April 29, 2009.

Please send reviews as unified diffs (diff -u) against the original
files. Comments about your proposed changes will be appreciated.

Your review should be sent as an answer to this mail.

When appropriate, I will send intermediate requests for review, with
"[RFRn]" (n>=2) as a subject tag.

When we will reach a consensus, I send a "Last Chance For
Comments" mail with "[LCFC]" as a subject tag.

Finally, the reviewed templates will be sent to the package maintainer
as a bug report, and a mail will be sent to this list with "[BTS]" as
a subject tag.

Rationale:
--- freebsd-utils.old/debian/kbdcontrol.templates   2009-04-14 
21:47:59.843981138 +0200
+++ freebsd-utils/debian/kbdcontrol.templates   2009-04-14 22:36:55.331982119 
+0200
@@ -3,7 +3,7 @@
 Choices: ${choices}
 Default: none
 Description: Keymap:
- You can choose a keymap in the list.
+ Please choose the keyboard map.
  .
- Note: If you don't know, don't select any yet.  You can always come back to
+ If in doubt, don't choose any map. You can always come back to
  this question with "dpkg-reconfigure kbdcontrol".

Standardize to our usual recommendation (Please foo...).

As usual, also, we suggest dropping leading "Note:" stuffand also
use our standard formula here "If in doubt...".

--- freebsd-utils.old/debian/module-init-tools.templates2009-04-14 
21:47:59.795981291 +0200
+++ freebsd-utils/debian/module-init-tools.templates2009-04-14 
22:35:56.143982264 +0200
@@ -2,30 +2,30 @@
 Type: multiselect
 Choices: ${choices}
 _Description: Network card drivers:
- Select the appropiate driver for your network cards. You may select more than
- one driver, or none at all, depending on the number of cards you have.
+ Please select drivers for this machine's network card(s). You may select more 
than
+ one driver, or none at all, depending on the number of cards installed in the 
machine.
  .
- Note: You most likely don't need any, since default kernels currently include
- builtin support for many NICs.  You can always come back to this question 
later
+ You most likely don't need any, since default kernels currently include
+ built-in support for network cards. You can always come back to this question 
later
  with "dpkg-reconfigure module-init-tools".

About the same changes...
 
 Template: module-init-tools/sound
 Type: multiselect
 Choices: ${choices}
 _Description: Sound card drivers:
- Select the appropiate driver for your sound cards. You may select more than
- one driver, or none at all, depending on the number of cards you have.
+ Please select drivers for this machine's sound card(s). You may select more 
than
+ one driver, or none at all, depending on the number of cards installed in the 
machine.
  .
- Note: If you don't know, don't select any yet.  Later, you can use the
- snd_probe command to find it out.  You can always come back to this question
+ If in doubt, leave this field empty. The "snd_probe" command may be used
+ later to identify the sound card(s). You can always come back to this question
  with "dpkg-reconfigure module-init-tools".

Ditto.
 
 Template: module-init-tools/other
 Type: multiselect
 Choices: ${choices}
 _Description: Other modules:
- Below is a selection of modules that don't fall in either of the previous
- cathegories. Select those you find adequate.
+ Please select the modules needed to properly support this
+ machine's hardware.
  .
- Note: If you don't know, don't select any yet.  You can always come back to
+ If in doubt, leave this field empty. You can always come back to
  this question with "dpkg-reconfigure module-init-tools".

And ditto.

--- freebsd-utils.old/debian/control2009-04-14 21:47:59.795981291 +0200
+++ freebsd-utils/debian/control2009-04-14 22:38:07.131982281 +0200
@@ -26,7 +26,7 @@
 Conflicts: inetutils-tools (<= 2:1.4.3+20051212-4)
 Replaces: freebsd-hackedutils (<= 6.1-1)
 Description: FreeBSD utilities needed for GNU/kFreeBSD
- This package contains FreeBSD utilities needed for GNU/kFreeBSD.
+ This package provides FreeBSD utilities needed for GNU/kFreeBSD.

s/contains/provides (our standard recommendation, again).

 
 Package: module-init-tools
 Priority: important
@@ -35,14 +35,14 @@
 Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16),
  freebsd-hackedutils (<= 6.1-1), kfreebsd-common (<< 6.1-6)
 Description: tools for managing kFreeBSD modules
- This package contains a set of programs for loading, inserting, and
+ This package provides a set of programs for loading, inserting, and
  removing kernel modules for kFreeBSD.
 
 Package: kbdcontrol
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf
-Description: Command line tool to change keyboard layout
- Original FreeBSD command to set keyboard layout an

Re: [RFR] templates://freebsd-utils/{kbdcontrol.templates,module-init-tools.te mplates}

2009-04-19 Thread Justin B Rye
Christian Perrier wrote:
> Your review should be sent as an answer to this mail.

I'm having trouble generating a patch here, since freebsd-utils
7.1-5 in Sid doesn't have a module-init-tools.templates file.  The
changelog for 7.1-4 says "Rename module-init-tools to kldutils"...
For now I'll just attach my modified versions.

>  _Description: Network card drivers:
[...]
> - Note: You most likely don't need any, since default kernels currently 
> include
> - builtin support for many NICs.  You can always come back to this question 
> later
> + You most likely don't need any, since default kernels currently include
> + built-in support for network cards. You can always come back to this 
> question later
>   with "dpkg-reconfigure module-init-tools".

The revised version avoids the jargonism NIC, but dropping the
qualifier "many" makes it sound as if it's talking about
CONFIG_NETDEVICES (required for a kernel to support NICs at all).
I'd put it back, or indeed make it "most network cards".

I'd also say "^the^ default kernels".

>  Package: kbdcontrol
[...]
> -Description: Command line tool to change keyboard layout
> - Original FreeBSD command to set keyboard layout and the FreeBSD possible
> +Description: command-line tool to change FreeBSD keyboard layout
> + This package provides the original FreeBSD command to set keyboard layout 
> and the FreeBSD possible
>   keyboards.

"FreeBSD" is a modifying noun, which has to go after any adjectives,
and I think that "and" needs to be reinforced (to make it clear it's
"provides A + B", not "to set A + B"):

This package provides the original FreeBSD command to set keyboard layout,
plus the possible FreeBSD keyboards.
-- 
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
Template: module-init-tools/network
Type: multiselect
Choices: ${choices}
_Description: Network card drivers:
 Please select drivers for this machine's network card(s). You may select more 
than
 one driver, or none at all, depending on the number of cards installed in the 
machine.
 .
 You most likely don't need any, since the default kernels currently include
 built-in support for most network cards. You can always come back to this 
question later
 with "dpkg-reconfigure module-init-tools".

Template: module-init-tools/sound
Type: multiselect
Choices: ${choices}
_Description: Sound card drivers:
 Please select drivers for this machine's sound card(s). You may select more 
than
 one driver, or none at all, depending on the number of cards installed in the 
machine.
 .
 If in doubt, leave this field empty. The "snd_probe" command may be used
 later to identify the sound card(s). You can always come back to this question
 with "dpkg-reconfigure module-init-tools".

Template: module-init-tools/other
Type: multiselect
Choices: ${choices}
_Description: Other modules:
 Please select the modules needed to properly support this
 machine's hardware.
 .
 If in doubt, leave this field empty. You can always come back to
 this question with "dpkg-reconfigure module-init-tools".
Source: freebsd-utils
Section: utils
Priority: important
Maintainer: GNU/kFreeBSD Maintainers 
Uploaders: Aurelien Jarno , Guillem Jover 

Build-Depends: debhelper (>= 7), quilt, po-debconf, freebsd-buildutils,
 libkvm-dev (>= 7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.7-13),
 flex | flex-old, kfreebsd-kernel-headers (>= 0.31), libfreebsd-dev (>= 0.0-5),
 libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev
# libkvm-dev: dmesg
# libgeom-dev : ccdconfig
# libfreebsd (>= 0.0-5): ifconfig
# libipx-dev: ifconfig
# libkiconv-dev: mount_*
# libc0.1-dev (>= 2.7-13): ifconfig
# libdevstat-dev: mdconfig
# libsbuf-dev: mdconfig
Standards-Version: 3.8.1

Package: freebsd-utils
Priority: required
Essential: yes
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ufsutils
Suggests: freebsd-hackedutils (>= 6.1-1)
Conflicts: inetutils-tools (<= 2:1.4.3+20051212-4)
Replaces: freebsd-hackedutils (<= 6.1-1)
Description: FreeBSD utilities needed for GNU/kFreeBSD
 This package provides FreeBSD utilities needed for GNU/kFreeBSD.

Package: module-init-tools
Priority: important
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, kfreebsd-image
Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16),
 freebsd-hackedutils (<= 6.1-1), kfreebsd-common (<< 6.1-6)
Description: tools for managing kFreeBSD modules
 This package provides a set of programs for loading, inserting, and
 removing kernel modules for kFreeBSD.

Package: kbdcontrol
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf
Description: command-line tool to change FreeBSD keyboard layout
 This package provides the original FreeBSD command to set keyboard layout,
 plus the possible FreeBSD keyboards.

Package: net-tools
Section: net
Priority: im