Please find, for review, the debconf templates of console-common. This review will last from Sunday, June 24, 2007 to Wednesday, July 04, 2007. 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. --- console-common.old/debian/templates.in 2007-06-12 06:12:04.917863979 +0200 +++ console-common/debian/templates.in 2007-06-20 11:39:00.328546777 +0200 @@ -27,13 +27,12 @@ Template: console-data/keymap/ignored Type: note _Description: Ignored boot-time keymap in an old location - You have asked the keymap configuration tool not to touch an existing - keymap you installed, or you asked for higher-priority questions only to - be asked and the tool decided not to mess with your existing setup. + The keymap configuration tool has been setup not to touch an existing + keymap. Simplify sentences and avoid "you have asked"....and the way debconf works. . - However, you have file(s) that were recognized as boot-time keymaps by - older versions of the console utilities, either in /etc/kbd/ or in - /etc/console-tools/, named default.kmap(.gz) and these are now ignored. + However, some 'default.kmap(.gz)' file(s), that were recognized as + boot-time keymaps by older versions of the console utilities, exist + either in /etc/kbd/ or in /etc/console-tools/. "you have files" seems to personal for me. Let's be more neutral. . If you wish that one of them takes effect on next reboot, you will have to move it to /etc/console/boottime.kmap.gz manually. @@ -43,30 +42,29 @@ Choices: ${choices} Default: qwerty _Description: Keyboard layout family: - Please specify the generic family name for your keyboard + Please specify the generic family name for the keyboard Unpersonnalization layout. Usually, the layout family name is taken from the first keys on the - left of the top letters row of the keymap (this is at least true for - qwerty and azerty layouts). + left of the top letters row of the keymap. The example seems superfluous to me and there are other types of layouts. Template: console-data/keymap/template/layout Type: select Choices: ${choices} _Description: Keyboard layout: - In order to refine your choice for a keymap, please mention the - physical layout of your keyboard. + In order to refine the keymap choice, please mention the + physical layout of the keyboard. Be neutral. Template: console-data/keymap/template/variant Type: select Choices: ${choices} _Description: Keyboard variant: - The layout you selected has several variants. Please select the one - matching your keyboard. + The selected layout has several variants. Please select the one + matching the keyboard. Ditto. Template: console-data/keymap/template/keymap Type: select Choices: ${choices} _Description: Keymap: - The keyboard you selected allows you to choose among several keymaps. + The selected keyboard allows to choose among several keymaps. Usually these were designed either for specific tastes (eg. dead keys or not), or for specific needs (eg. programmer's keymaps). Ditto @@ -74,23 +72,23 @@ Type: select Choices: ${choices} _Description: Keymap: - If you use a keyboard from a different computer architecture, you can + If the keyboard is designd for a different computer architecture, you should choose a specific keymap in the full map. Ditto Template: console-data/keymap/powerpcadb Type: boolean _Description: Are you ready for the ADB keycodes transition? The kernel is configured to have the keyboard send ADB keycodes. This - behaviour is now deprecated and no longer supported by Debian. + behaviour is now deprecated and no longer supported. Unbranding. . - For best results you should reconfigure your kernel with - CONFIG_MAC_ADBKEYCODES=n. If you can't or don't want to do this for some - reason, pass keyboard_sends_linux_keycodes=1 as an argument to the kernel. + For best results, you should reconfigure the kernel with + CONFIG_MAC_ADBKEYCODES=n. Alternatively, you can pass + 'keyboard_sends_linux_keycodes=1' as an argument to the kernel. Simplify sentences and avoid "your" kernel . - Beware that the transition will most probably break your X configuration - so it is strongly recommended that you exit all X sessions now and adapt - your configuration afterwards (start "dpkg-reconfigure console-data" as - root). + Please be aware that the transition will most probably break the X + configuration, so it is strongly recommended to close all X sessions + now and adapt the configuration afterwards by running + 'dpkg-reconfigure console-data'. Neutral, ever..:) Template: console-data/bootmap-md5sum Type: string --- console-common.old/debian/control 2007-06-12 06:12:04.917863979 +0200 +++ console-common/debian/control 2007-06-20 11:39:44.826281148 +0200 @@ -13,9 +13,9 @@ Depends: debianutils (>= 1.13), console-data, kbd | console-tools (>=1:0.2.3dbs-54), lsb-base (>= 3.0) Conflicts: console-data (<< 1999.08.29-20) Replaces: console-tools (<< 1:0.2.3-18), kbd (<< 0.99-12), console-data (<< 1999.08.29-18) -Description: Basic infrastructure for text console configuration +Description: basic infrastructure for text console configuration Uncapitalization This package contains the install-keymap(8) utility, which is the - official way to specify a boot-time keymap to the system, as well + recommended tool to specify a boot-time keymap to the system, as well as tools for internal use of keymap-providing packages. "official" means nothing here, indeed Package: dh-consoledata @@ -24,6 +24,6 @@ Architecture: all Depends: debhelper (>> 2) Enhances: debhelper -Description: Debhelper-based script to help packaging console data file +Description: debhelper-based script to help packaging console data files This package allows to build consistent packages of data-files for the - Linux text console (keymaps for now, later fonts and others). + Linux text console. Given the current frozen state of console-common, speaking about the future is rather strange... --
Template: console-data/keymap/policy Type: select __Choices: Select keymap from arch list, Don't touch keymap, Keep kernel keymap, Select keymap from full list Default: Don't touch keymap _Description: Policy for handling keymaps: The keymap describes how keys are laid out on your keyboard, and what symbols (letters, digits, etc.) are drawn on them. . "Select keymap from arch list" will allow you to select one of the predefined keymaps specific for your architecture - you will most likely want this unless you have a USB keyboard. . "Don't touch keymap" will prevent the configuration system from overwriting the keymap you have in /etc/console. Select this if you want to keep a keymap you obtained through other means. Please remember to install new keymaps with install-keymap(8) if you select this choice. . "Keep kernel keymap" will prevent any keymap from being loaded next time your system boots. It will remove from /etc/console any keymap you may have already selected (it will be lost), but if you have already loaded a keymap, it cannot be changed back until you reboot. . "Select keymap from full list" offers a full listing of all predefined keymaps. You want this, if you use an USB keyboard from a different computer architecture or if you use an adapter to use such a keyboard. Template: console-data/keymap/ignored Type: note _Description: Ignored boot-time keymap in an old location The keymap configuration tool has been setup not to touch an existing keymap. . However, some 'default.kmap(.gz)' file(s), that were recognized as boot-time keymaps by older versions of the console utilities, exist either in /etc/kbd/ or in /etc/console-tools/. . If you wish that one of them takes effect on next reboot, you will have to move it to /etc/console/boottime.kmap.gz manually. Template: console-data/keymap/family Type: select Choices: ${choices} Default: qwerty _Description: Keyboard layout family: Please specify the generic family name for the keyboard layout. Usually, the layout family name is taken from the first keys on the left of the top letters row of the keymap. Template: console-data/keymap/template/layout Type: select Choices: ${choices} _Description: Keyboard layout: In order to refine the keymap choice, please mention the physical layout of the keyboard. Template: console-data/keymap/template/variant Type: select Choices: ${choices} _Description: Keyboard variant: The selected layout has several variants. Please select the one matching the keyboard. Template: console-data/keymap/template/keymap Type: select Choices: ${choices} _Description: Keymap: The selected keyboard allows to choose among several keymaps. Usually these were designed either for specific tastes (eg. dead keys or not), or for specific needs (eg. programmer's keymaps). Template: console-data/keymap/full Type: select Choices: ${choices} _Description: Keymap: If the keyboard is designd for a different computer architecture, you should choose a specific keymap in the full map. Template: console-data/keymap/powerpcadb Type: boolean _Description: Are you ready for the ADB keycodes transition? The kernel is configured to have the keyboard send ADB keycodes. This behaviour is now deprecated and no longer supported. . For best results, you should reconfigure the kernel with CONFIG_MAC_ADBKEYCODES=n. Alternatively, you can pass 'keyboard_sends_linux_keycodes=1' as an argument to the kernel. . Please be aware that the transition will most probably break the X configuration, so it is strongly recommended to close all X sessions now and adapt the configuration afterwards by running 'dpkg-reconfigure console-data'. Template: console-data/bootmap-md5sum Type: string Default: none Description: for internal use
--- ../console-common.old/debian/templates.in 2007-06-12 06:12:04.917863979 +0200 +++ debian/templates.in 2007-06-20 11:39:00.328546777 +0200 @@ -27,13 +27,12 @@ Template: console-data/keymap/ignored Type: note _Description: Ignored boot-time keymap in an old location - You have asked the keymap configuration tool not to touch an existing - keymap you installed, or you asked for higher-priority questions only to - be asked and the tool decided not to mess with your existing setup. + The keymap configuration tool has been setup not to touch an existing + keymap. . - However, you have file(s) that were recognized as boot-time keymaps by - older versions of the console utilities, either in /etc/kbd/ or in - /etc/console-tools/, named default.kmap(.gz) and these are now ignored. + However, some 'default.kmap(.gz)' file(s), that were recognized as + boot-time keymaps by older versions of the console utilities, exist + either in /etc/kbd/ or in /etc/console-tools/. . If you wish that one of them takes effect on next reboot, you will have to move it to /etc/console/boottime.kmap.gz manually. @@ -43,30 +42,29 @@ Choices: ${choices} Default: qwerty _Description: Keyboard layout family: - Please specify the generic family name for your keyboard + Please specify the generic family name for the keyboard layout. Usually, the layout family name is taken from the first keys on the - left of the top letters row of the keymap (this is at least true for - qwerty and azerty layouts). + left of the top letters row of the keymap. Template: console-data/keymap/template/layout Type: select Choices: ${choices} _Description: Keyboard layout: - In order to refine your choice for a keymap, please mention the - physical layout of your keyboard. + In order to refine the keymap choice, please mention the + physical layout of the keyboard. Template: console-data/keymap/template/variant Type: select Choices: ${choices} _Description: Keyboard variant: - The layout you selected has several variants. Please select the one - matching your keyboard. + The selected layout has several variants. Please select the one + matching the keyboard. Template: console-data/keymap/template/keymap Type: select Choices: ${choices} _Description: Keymap: - The keyboard you selected allows you to choose among several keymaps. + The selected keyboard allows to choose among several keymaps. Usually these were designed either for specific tastes (eg. dead keys or not), or for specific needs (eg. programmer's keymaps). @@ -74,23 +72,23 @@ Type: select Choices: ${choices} _Description: Keymap: - If you use a keyboard from a different computer architecture, you can + If the keyboard is designd for a different computer architecture, you should choose a specific keymap in the full map. Template: console-data/keymap/powerpcadb Type: boolean _Description: Are you ready for the ADB keycodes transition? The kernel is configured to have the keyboard send ADB keycodes. This - behaviour is now deprecated and no longer supported by Debian. + behaviour is now deprecated and no longer supported. . - For best results you should reconfigure your kernel with - CONFIG_MAC_ADBKEYCODES=n. If you can't or don't want to do this for some - reason, pass keyboard_sends_linux_keycodes=1 as an argument to the kernel. + For best results, you should reconfigure the kernel with + CONFIG_MAC_ADBKEYCODES=n. Alternatively, you can pass + 'keyboard_sends_linux_keycodes=1' as an argument to the kernel. . - Beware that the transition will most probably break your X configuration - so it is strongly recommended that you exit all X sessions now and adapt - your configuration afterwards (start "dpkg-reconfigure console-data" as - root). + Please be aware that the transition will most probably break the X + configuration, so it is strongly recommended to close all X sessions + now and adapt the configuration afterwards by running + 'dpkg-reconfigure console-data'. Template: console-data/bootmap-md5sum Type: string --- ../console-common.old/debian/control 2007-06-12 06:12:04.917863979 +0200 +++ debian/control 2007-06-20 11:39:44.826281148 +0200 @@ -13,9 +13,9 @@ Depends: debianutils (>= 1.13), console-data, kbd | console-tools (>=1:0.2.3dbs-54), lsb-base (>= 3.0) Conflicts: console-data (<< 1999.08.29-20) Replaces: console-tools (<< 1:0.2.3-18), kbd (<< 0.99-12), console-data (<< 1999.08.29-18) -Description: Basic infrastructure for text console configuration +Description: basic infrastructure for text console configuration This package contains the install-keymap(8) utility, which is the - official way to specify a boot-time keymap to the system, as well + recommended tool to specify a boot-time keymap to the system, as well as tools for internal use of keymap-providing packages. Package: dh-consoledata @@ -24,6 +24,6 @@ Architecture: all Depends: debhelper (>> 2) Enhances: debhelper -Description: Debhelper-based script to help packaging console data file +Description: debhelper-based script to help packaging console data files This package allows to build consistent packages of data-files for the - Linux text console (keymaps for now, later fonts and others). + Linux text console.
Source: console-common Section: utils Priority: optional Maintainer: Alastair McKinstry <mckinstry@debian.org> Uploaders: Wartan Hachaturow <wart@softhome.net>, Christian Perrier <bubulle@debian.org> Build-Depends-Indep: docbook-to-man, po-debconf Build-Depends: debhelper (>= 5.0.0) Standards-Version: 3.7.2 Package: console-common Architecture: all Pre-Depends: debconf | debconf-2.0 Depends: debianutils (>= 1.13), console-data, kbd | console-tools (>=1:0.2.3dbs-54), lsb-base (>= 3.0) Conflicts: console-data (<< 1999.08.29-20) Replaces: console-tools (<< 1:0.2.3-18), kbd (<< 0.99-12), console-data (<< 1999.08.29-18) Description: basic infrastructure for text console configuration This package contains the install-keymap(8) utility, which is the recommended tool to specify a boot-time keymap to the system, as well as tools for internal use of keymap-providing packages. Package: dh-consoledata Section: devel Priority: extra Architecture: all Depends: debhelper (>> 2) Enhances: debhelper Description: debhelper-based script to help packaging console data files This package allows to build consistent packages of data-files for the Linux text console.
Attachment:
signature.asc
Description: Digital signature