Bug#373175: xserver-xorg: [debconf] updated templates for xorg/X11R7
Package: xserver-xorg
Version: 1:7.0.21
Severity: normal
Tags: patch
The xserver-xorg template refers to paths and packages that are no
longer correct for the X11R7 packages. Specifically,
s,/etc/X11/xkb/rules,/usr/share/X11/xkb/rules, and
s,xkeyboard-config,xkb-data,
Trivial patch against svn is attached. Seeing as these strings don't
get translated, the same changes can probably safely be made to the po
files.
Vince
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-2-amd64-k8-smp
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Versions of packages xserver-xorg depends on:
ii debconf 1.5.1 Debian configuration management sy
ii nvidia-glx [xserver-xorg-vid 1.0.8762-2 NVIDIA binary XFree86 4.x driver
ii x11-common 1:7.0.21 X Window System (X.Org) infrastruc
ii xbase-clients 1:7.0.1-2 miscellaneous X clients
ii xkb-data 0.8-5 X Keyboard Extension (XKB) configu
ii xserver-xorg-core 1:1.0.2-8 X.Org X server -- core server
ii xserver-xorg-input-evdev [xs 1:1.1.2-1 X.Org X server -- evdev input driv
ii xserver-xorg-input-kbd [xser 1:1.0.1.3-2 X.Org X server -- keyboard input d
ii xserver-xorg-input-mouse [xs 1:1.0.4-3 X.Org X server -- mouse input driv
Versions of packages xserver-xorg recommends:
ii discover1 1.7.18 hardware identification system
ii laptop-detect 0.12.1 attempt to detect a laptop
ii mdetect 0.5.2.1 mouse device autodetection tool
ii xresprobe 0.4.23debian1 X Resolution Probe
-- debconf information excluded
Index: xserver-xorg.templates
===================================================================
--- xserver-xorg.templates (revision 2327)
+++ xserver-xorg.templates (working copy)
@@ -178,8 +178,8 @@
Users of most keyboards should enter "xorg". Users of Sun Type 4 and Type
5 keyboards, however, should enter "sun".
.
- Experienced users can use any defined XKB rule set. If the xkeyboard-config
- package has been unpacked, see the /etc/X11/xkb/rules directory for
+ Experienced users can use any defined XKB rule set. If the xkb-data
+ package has been unpacked, see the /usr/share/X11/xkb/rules directory for
available rule sets.
.
When in doubt, this value should be set to "xorg".
@@ -209,7 +209,7 @@
above.
.
Experienced users can use any model defined by the selected XKB rule set. If
- the xkeyboard-config package has been unpacked, see the /etc/X11/xkb/rules
+ the xkb-data package has been unpacked, see the /usr/share/X11/xkb/rules
directory for available rule sets.
.
Users of U.S. English keyboards should generally enter "pc104". Users of
@@ -223,7 +223,7 @@
were previously selected.
.
Experienced users can use any layout supported by the selected XKB rule set. If
- the xkeyboard-config package has been unpacked, see the /etc/X11/xkb/rules
+ the xkb-data package has been unpacked, see the /usr/share/X11/xkb/rules
directory for available rule sets.
.
Users of U.S. English keyboards should enter "us". Users of keyboards
@@ -242,7 +242,7 @@
the preferred behavior, enter "nodeadkeys".
.
Experienced users can use any variant supported by the selected XKB layout. If
- the xkeyboard-config package has been unpacked, see the /etc/X11/xkb/symbols
+ the xkb-data package has been unpacked, see the /etc/X11/xkb/symbols
directory for the file corresponding to your selected layout for available
variants.
.
Reply to: