xorg: Changes to 'debian-experimental'
debian/changelog | 15 +
debian/local/dexconf | 50 -----
debian/xserver-xorg.postinst.in | 395 ++--------------------------------------
debian/xserver-xorg.templates | 139 --------------
4 files changed, 45 insertions(+), 554 deletions(-)
New commits:
commit 63acc0fa9b0015913c9400c0aa9acbe9c07743de
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 9 00:35:27 2009 +0100
xserver-xorg.postinst: allow setting the PCI domain in the BusID string.
diff --git a/debian/changelog b/debian/changelog
index 2b42865..8ffdcb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* Set the BusID in xorg.conf if we find more than one graphics card, to work
around breakage in post-pciaccess xserver (can't find the primary PCI
device).
+ * xserver-xorg.postinst: allow setting the PCI domain in the BusID string.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index f4e6383..7f75de2 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -90,8 +90,9 @@ validate_bus_id_db_input () {
PCI:*)
# Looks like a PCI bus ID specification; validate it. (We can use &&
# outside a conditional here because of the "set +e" above.)
- expr "$RET" : "PCI:[0-9]\{1,3\}:[0-9]\{1,3\}:[0-9]\{1,3\}$" >/dev/null \
- 2>&1 && break
+ (expr "$RET" : "PCI:[0-9]\{1,3\}@[0-9]\{1,3\}:[0-9]\{1,3\}:[0-9]\{1,3\}$" >/dev/null 2>&1 \
+ || expr "$RET" : "PCI:[0-9]\{1,3\}:[0-9]\{1,3\}:[0-9]\{1,3\}$" >/dev/null 2>&1) \
+ && break
;;
SBUS:*)
# Looks like an SBUS bus ID specification; validate it. (We can use &&
@@ -292,12 +293,12 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# Recent versions of lspci report a four-digit domain as the first field.
if expr "$VIDEO_CARD" : ".*:.*:.*\..*" >/dev/null 2>&1; then
# We have an entry in "hex:hex:hex.hex" format; we need
- # "PCI:decimal:decimal:decimal" (we don't use the domain).
+ # "PCI:decimal@decimal:decimal:decimal".
DOMAIN=$(printf "%d" 0x$(echo $VIDEO_CARD | cut -d: -f1) )
BUS=$(printf "%d" 0x$(echo $VIDEO_CARD | cut -d: -f2) )
DEVICE=$(printf "%d" 0x$(echo $VIDEO_CARD | cut -d: -f3 | cut -d. -f1) )
FUNCTION=$(printf "%d" 0x$(echo $VIDEO_CARD | cut -d. -f2) )
- DEFAULT="PCI:$BUS:$DEVICE:$FUNCTION"
+ DEFAULT="PCI:$BUS@$DOMAIN:$DEVICE:$FUNCTION"
elif expr "$VIDEO_CARD" : ".*:.*\..*" >/dev/null 2>&1; then
# We have an entry in "hex:hex.hex" format; we need
# "PCI:decimal:decimal:decimal".
commit 0528862765fbcfa8085d7efe0a36e5e9afcf8692
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 9 00:32:47 2009 +0100
Restore multicard guessing
Try to see if we have more than one card and need to set BusID.
This got dropped when the device detection was removed, but the server
is currently broken and can't find the primary device.
diff --git a/debian/changelog b/debian/changelog
index 6bd5c4c..2b42865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
xserver-xorg.postinst, kill the debconf template and unregister it.
* xserver-xorg.postinst: remove unused input validation functions. Also
remove the corresponding debconf templates.
+ * Set the BusID in xorg.conf if we find more than one graphics card, to work
+ around breakage in post-pciaccess xserver (can't find the primary PCI
+ device).
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 87d4b1b..f4e6383 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -274,6 +274,10 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
PRIORITY=low
DEFAULT=
+ if [ `lspci -n 2>/dev/null | grep ' 0300: '| wc -l` -gt 1 ]; then
+ MULTIHEAD=yes
+ fi
+
# Some PowerPCs need to be told where to find the video card even if there is
# only one in the machine (broken PCI bus code in the XFree86 X server, most
# likely). If there are multiple video cards, we need to configure one as the
commit 86a4cee36f7f23c334156b02a0c2c15230012b0d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 22:00:30 2009 +0100
Move unregistering of the config/device/driver debconf question for consistency
... and some whitespace fixes
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 1e6aedc..87d4b1b 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -389,25 +389,22 @@ if [ -n "$UPGRADE" ]; then
fi
if dpkg --compare-versions "$2" lt-nl 1:7.4; then
for QUESTION in \
- xserver-xorg/config/null_string_error \
- xserver-xorg/config/doublequote_in_string_error \
- xserver-xorg/config/nonnumeric_string_error \
- xserver-xorg/config/device/use_fbdev \
- xserver-xorg/config/inputdevice/keyboard/rules \
- xserver-xorg/config/inputdevice/keyboard/model \
- xserver-xorg/config/inputdevice/keyboard/layout \
- xserver-xorg/config/inputdevice/keyboard/variant \
- xserver-xorg/config/inputdevice/keyboard/options \
- xserver-xorg/autodetect_keyboard; do
+ xserver-xorg/config/null_string_error \
+ xserver-xorg/config/doublequote_in_string_error \
+ xserver-xorg/config/nonnumeric_string_error \
+ xserver-xorg/config/device/use_fbdev \
+ xserver-xorg/config/device/driver \
+ xserver-xorg/config/inputdevice/keyboard/rules \
+ xserver-xorg/config/inputdevice/keyboard/model \
+ xserver-xorg/config/inputdevice/keyboard/layout \
+ xserver-xorg/config/inputdevice/keyboard/variant \
+ xserver-xorg/config/inputdevice/keyboard/options \
+ xserver-xorg/autodetect_keyboard; do
db_unregister $QUESTION || true
done
fi
fi
-if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" lt 1:7.4+6; then
- db_unregister xserver-xorg/config/device/driver || true
-fi
-
# no debconf interaction should be done after this point
# (the dexconf call below invokes db_stop)
commit 3614e34fae35069e516bb37df27f3cecd288bd05
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:52:11 2009 +0100
xserver-xorg.postinst: don't accept BusID values matching "ISA:*".
diff --git a/debian/changelog b/debian/changelog
index 6973941..6bd5c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* remove keyboard-related debconf templates; unregister them on upgrade.
* xserver-xorg.templates: don't give an ISA example for the BusID question,
ISA support has been removed from the server.
+ * xserver-xorg.postinst: don't accept BusID values matching "ISA:*".
* Don't set the UseFBDev option. Remove the detection code from
xserver-xorg.postinst, kill the debconf template and unregister it.
* xserver-xorg.postinst: remove unused input validation functions. Also
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 241869e..1e6aedc 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -87,14 +87,6 @@ validate_bus_id_db_input () {
# An empty string is valid.
break
;;
- ISA:*)
- # Looks like an ISA bus ID specification string. At least up to a
- # point; upstream (xf86ParseIsaBusString() in
- # xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c) doesn't actually
- # *supply* a specification. So if the user's gotten this far, it's good
- # enough.
- break
- ;;
PCI:*)
# Looks like a PCI bus ID specification; validate it. (We can use &&
# outside a conditional here because of the "set +e" above.)
commit 05475bb3f458020aebf5a3b76e152214a9b03479
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:49:15 2009 +0100
xserver-xorg.postinst: remove unused input validation functions.
Also remove the corresponding debconf templates.
diff --git a/debian/changelog b/debian/changelog
index 1db11b8..6973941 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
ISA support has been removed from the server.
* Don't set the UseFBDev option. Remove the detection code from
xserver-xorg.postinst, kill the debconf template and unregister it.
+ * xserver-xorg.postinst: remove unused input validation functions. Also
+ remove the corresponding debconf templates.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 3618da6..241869e 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -61,91 +61,6 @@ debug_report_status () {
debug_echo "$1 exited with status $2"
}
-validate_string_db_input () {
- # Syntax: validate_string_db_input priority template
- #
- # validate string input; can't have doublequotes
- # If $MAY_BE_NULL is a non-null value (e.g., "yes"), the string may be null.
- if [ $# -ne 2 ]; then
- echo "internal error: validate_string_db_input() called with wrong number of arguments: $*" >&2
- exit 1
- fi
- PRIORITY=$1
- TEMPLATE=$2
- db_get "$TEMPLATE"
- SAFE="$RET"
- set +e
- while :; do
- db_input "$PRIORITY" "$TEMPLATE"
- # is the question going to be asked?
- if [ $? -eq 30 ]; then
- break # no; bail out of validation loop
- fi
- db_go
- db_get "$TEMPLATE"
- if [ -n "$RET" ]; then
- if ! expr "$RET" : '.*".*' > /dev/null 2>&1; then
- break # valid input
- else
- ERROR=xserver-xorg/config/doublequote_in_string_error
- fi
- else
- if [ -n "$MAY_BE_NULL" ]; then
- break # valid (null) input
- else
- ERROR=xserver-xorg/config/null_string_error
- fi
- fi
- # we only get to this point if the input was invalid; restore the known
- # good value in case we are interrupted before the user provides a valid
- # one
- db_set "$TEMPLATE" "$SAFE"
- db_fset "$TEMPLATE" seen false
- # now show the user the error message
- db_fset "$ERROR" seen false
- db_input critical "$ERROR"
- db_go
- done
- set -e
-}
-
-validate_numeric_db_input () {
- # Syntax: validate_numeric_db_input priority template
- #
- # validate numeric input; must have only digits, can be null
- if [ $# -ne 2 ]; then
- echo "internal error: validate_numeric_db_input() called with wrong number of arguments: $*" >&2
- exit 1
- fi
- PRIORITY=$1
- TEMPLATE=$2
- db_get "$TEMPLATE"
- SAFE="$RET"
- set +e
- while :; do
- db_input "$PRIORITY" "$TEMPLATE"
- # is the question going to be asked?
- if [ $? -eq 30 ]; then
- break # no; bail out of validation loop
- fi
- db_go
- db_get "$TEMPLATE"
- if [ -z "$RET" ] || expr "$RET" : "[0-9]\+$" > /dev/null 2>&1; then
- break # valid input
- fi
- # we only get to this point if the input was invalid; restore the known
- # good value in case we are interrupted before the user provides a valid
- # one
- db_set "$TEMPLATE" "$SAFE"
- db_fset "$TEMPLATE" seen false
- # now show the user the error message
- db_fset xserver-xorg/config/nonnumeric_string_error seen false
- db_input critical xserver-xorg/config/nonnumeric_string_error
- db_go
- done
- set -e
-}
-
validate_bus_id_db_input () {
# Syntax: validate_bus_id_db_input priority template
#
@@ -482,6 +397,9 @@ if [ -n "$UPGRADE" ]; then
fi
if dpkg --compare-versions "$2" lt-nl 1:7.4; then
for QUESTION in \
+ xserver-xorg/config/null_string_error \
+ xserver-xorg/config/doublequote_in_string_error \
+ xserver-xorg/config/nonnumeric_string_error \
xserver-xorg/config/device/use_fbdev \
xserver-xorg/config/inputdevice/keyboard/rules \
xserver-xorg/config/inputdevice/keyboard/model \
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index bc0be3c..aa1dff2 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -30,18 +30,3 @@ _Description: Video card's bus identifier:
Template: xserver-xorg/config/device/bus_id_error
Type: note
_Description: Incorrect format for the bus identifier
-
-Template: xserver-xorg/config/null_string_error
-Type: note
-_Description: Empty value
- A null entry is not permitted for this value.
-
-Template: xserver-xorg/config/doublequote_in_string_error
-Type: note
-_Description: Invalid double-quote characters
- Double-quote (") characters are not permitted in the entry value.
-
-Template: xserver-xorg/config/nonnumeric_string_error
-Type: note
-_Description: Numerical value needed
- Characters other than digits are not allowed in the entry.
commit 395c2684bd0642f0638819cfcbbdedc1f9302a67
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:43:10 2009 +0100
Don't set the UseFBDev option.
Remove the detection code from xserver-xorg.postinst,
kill the debconf template and unregister it.
diff --git a/debian/changelog b/debian/changelog
index d16baa1..1db11b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* remove keyboard-related debconf templates; unregister them on upgrade.
* xserver-xorg.templates: don't give an ISA example for the BusID question,
ISA support has been removed from the server.
+ * Don't set the UseFBDev option. Remove the detection code from
+ xserver-xorg.postinst, kill the debconf template and unregister it.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 21375f5..8261cad 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -179,8 +179,6 @@ SECTION
db_get xserver-$SERVER/config/device/bus_id
DEVICE_BUSID="$RET"
-db_get xserver-$SERVER/config/device/use_fbdev
-DEVICE_USE_FBDEV="$RET"
exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
Section "Device"
@@ -189,9 +187,6 @@ SECTION
if [ -n "$DEVICE_BUSID" ]; then
printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >&4
fi
-if [ "$DEVICE_USE_FBDEV" = "true" ]; then
- printf "\tOption\t\t\"UseFBDev\"\t\t\"$DEVICE_USE_FBDEV\"\n" >&4
-fi
printf "EndSection\n" >&4
# Close file descriptor 4 before we delete temporary files
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 009bca8..3618da6 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -422,44 +422,6 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
else
db_set xserver-xorg/config/device/bus_id ""
fi
-
- # use fbcon kernel functions?
-
- case "$ARCH" in
- alpha|hurd-i386|i386|amd64)
- USE_FBDEV=false
- ;;
- *)
- USE_FBDEV=true
- ;;
- esac
-
- if [ -e /proc/fb ]; then
- FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')"
- # did we actually get back anything?
- if [ -n "$FB_TYPE" ]; then
- if echo "$FB_TYPE" | grep -Eiq '(OFfb|VESA|VGA16)'; then
- USE_FBDEV=false
- else
- # other framebuffers do support UseFBDEV
- USE_FBDEV=true
- fi
- fi
- else
- USE_FBDEV=false
- fi
-
- if [ -n "$XORG_USE_FBDEV" ] && [ "$XORG_USE_FBDEV" = "no" ]; then
- USE_FBDEV=false
- fi
-
- db_get xserver-xorg/config/device/use_fbdev || debug_report_status "db_get xserver-xorg/config/device/use_fbdev"
- if [ "$RET" = "true" ] && [ "$USE_FBDEV" = "false" ]; then
- debug_echo "xserver-xorg/config/device/use_fbdev is \"true\" but /proc/fb does not exist, is empty, or reports a framebuffer type with which UseFBDev cannot be used; setting template to \"false\""
- db_set xserver-xorg/config/device/use_fbdev false
- fi
-
- auto_answer db_input "$(priority_ceil medium)" xserver-xorg/config/device/use_fbdev "$USE_FBDEV"
fi
# files and dri sections
@@ -520,6 +482,7 @@ if [ -n "$UPGRADE" ]; then
fi
if dpkg --compare-versions "$2" lt-nl 1:7.4; then
for QUESTION in \
+ xserver-xorg/config/device/use_fbdev \
xserver-xorg/config/inputdevice/keyboard/rules \
xserver-xorg/config/inputdevice/keyboard/model \
xserver-xorg/config/inputdevice/keyboard/layout \
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 5444ef4..bc0be3c 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -4,17 +4,6 @@
# Please consider interacting with the team if you intend
# to modify the templates or add new templates
-Template: xserver-xorg/config/device/use_fbdev
-Type: boolean
-_Description: Use kernel framebuffer device interface?
- Rather than communicating directly with the video hardware, the X server may
- be configured to perform some operations, such as video mode switching, via
- the kernel's framebuffer driver.
- .
- In theory, either approach should work, but in practice, sometimes one does
- and the other does not. Enabling this option is the safe bet, but feel free
- to turn it off if it appears to cause problems.
-
Template: xserver-xorg/config/device/bus_id
Type: string
#flag:translate!:4
commit f05859f4611ed5cf7936068f3be8da02a977d9f7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:31:21 2009 +0100
xserver-xorg.templates: don't give an ISA example for the BusID question
ISA support has been removed from the server.
diff --git a/debian/changelog b/debian/changelog
index 54d839d..d16baa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* dexconf: don't output an InputDevice section for keyboards.
* xserver-xorg.postinst: don't configure the keyboard layout.
* remove keyboard-related debconf templates; unregister them on upgrade.
+ * xserver-xorg.templates: don't give an ISA example for the BusID question,
+ ISA support has been removed from the server.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index e8accfb..5444ef4 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -25,7 +25,6 @@ _Description: Video card's bus identifier:
.
Examples:
.
- ISA:1
PCI:0:16:0
SBUS:/iommu@0,10000000/sbus@0,10001000/SUNW,tcx@2,800000
.
commit 8edec9be3b7fbc01d515c584b47dbae27312b8bf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:20:48 2009 +0100
remove keyboard-related debconf templates; unregister them on upgrade.
diff --git a/debian/changelog b/debian/changelog
index e819161..54d839d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* dexconf: don't output an InputDevice section for mice.
* dexconf: don't output an InputDevice section for keyboards.
* xserver-xorg.postinst: don't configure the keyboard layout.
+ * remove keyboard-related debconf templates; unregister them on upgrade.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index d62ae50..009bca8 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -488,7 +488,8 @@ elif [ `readlink "$SERVER_SYMLINK"` = "/bin/true" ]; then
ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
fi
-if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
+if [ -n "$UPGRADE" ]; then
+ if dpkg --compare-versions "$2" le "1:7.3+5"; then
# Clean up our old crap
rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
for QUESTION in "shared/default-x-server" \
@@ -516,6 +517,18 @@ if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
"xserver-xorg/multiple_possible_x-drivers"; do
db_unregister "$QUESTION" || true
done
+ fi
+ if dpkg --compare-versions "$2" lt-nl 1:7.4; then
+ for QUESTION in \
+ xserver-xorg/config/inputdevice/keyboard/rules \
+ xserver-xorg/config/inputdevice/keyboard/model \
+ xserver-xorg/config/inputdevice/keyboard/layout \
+ xserver-xorg/config/inputdevice/keyboard/variant \
+ xserver-xorg/config/inputdevice/keyboard/options \
+ xserver-xorg/autodetect_keyboard; do
+ db_unregister $QUESTION || true
+ done
+ fi
fi
if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" lt 1:7.4+6; then
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 6701c29..e8accfb 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -43,108 +43,6 @@ Template: xserver-xorg/config/device/bus_id_error
Type: note
_Description: Incorrect format for the bus identifier
-Template: xserver-xorg/config/inputdevice/keyboard/rules
-Type: string
-_Description: XKB rule set to use:
- For the X server to handle the keyboard correctly, an XKB rule set must be
- chosen.
- .
- Users of most keyboards should enter "xorg".
- .
- 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".
-
-Template: xserver-xorg/config/inputdevice/keyboard/model
-Type: string
-_Description: Keyboard model:
- For the X server to handle the keyboard correctly, a keyboard model must be
- entered. Available models depend on which XKB rule set is in use.
- .
- With the "xorg" rule set:
- - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in
- the United States. Has no "logo" or "menu" keys;
- - pc104: similar to pc101 model, with additional keys, usually engraved
- with a "logo" symbol and a "menu" symbol;
- - pc102: similar to pc101 and often found in Europe. Includes a "< >" key;
- - pc105: similar to pc104 and often found in Europe. Includes a "< >" key;
- - macintosh: Macintosh keyboards using the new input layer with Linux
- keycodes;
- - macintosh_old: Macintosh keyboards not using the new input layer;
- - type4: Sun Type4 keyboards;
- - type5: Sun Type5 keyboards.
- .
- Laptop keyboards often do not have as many keys as standalone models; laptop
- users should select the keyboard model most closely approximated by the
- above.
- .
- Experienced users can use any model defined by the selected XKB rule set. If
- 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
- most other keyboards should generally enter "pc105".
-
-Template: xserver-xorg/config/inputdevice/keyboard/layout
-Type: string
-_Description: Keyboard layout:
- For the X server to handle the keyboard correctly, a keyboard layout must be
- entered. Available layouts depend on which XKB rule set and keyboard model
- were previously selected.
- .
- Experienced users can use any layout supported by the selected XKB rule set. If
- 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
- localized for other countries should generally enter their ISO 3166 country
- code. E.g., France uses "fr", and Germany uses "de".
-
-Template: xserver-xorg/config/inputdevice/keyboard/variant
-Type: string
-_Description: Keyboard variant:
- For the X server to handle the keyboard as desired, a keyboard variant
- may be entered. Available variants depend on which XKB rule set, model, and
- layout were previously selected.
- .
- Many keyboard layouts support an option to treat "dead" keys such as
- non-spacing accent marks and diaereses as normal spacing keys, and if this is
- the preferred behavior, enter "nodeadkeys".
- .
- Experienced users can use any variant supported by the selected XKB layout. If
- the xkb-data package has been unpacked, see the /usr/share/X11/xkb/symbols
- directory for the file corresponding to your selected layout for available
- variants.
- .
- Users of U.S. English keyboards should generally leave this entry blank.
-
-Template: xserver-xorg/config/inputdevice/keyboard/options
-Type: string
-_Description: Keyboard options:
- For the X server to handle the keyboard as desired, keyboard options may
- be entered. Available options depend on which XKB rule set was previously
- selected. Not all options will work with every keyboard model and layout.
- .
- For example, if you wish the Caps Lock key to behave as an additional
- Control key, you may enter "ctrl:nocaps"; if you would like to switch the
- Caps Lock and left Control keys, you may enter "ctrl:swapcaps".
- .
- As another example, some people prefer having the Meta keys available on
- their keyboard's Alt keys (this is the default), while other people prefer
- having the Meta keys on the Windows or "logo" keys instead. If you
- prefer to use your Windows or logo keys as Meta keys, you may enter
- "altwin:meta_win".
- .
- You can combine options by separating them with a comma, for instance
- "ctrl:nocaps,altwin:meta_win".
- .
- Experienced users can use any options compatible with the selected XKB model,
- layout and variant.
- .
- When in doubt, this value should be left blank.
-
Template: xserver-xorg/config/null_string_error
Type: note
_Description: Empty value
@@ -159,13 +57,3 @@ Template: xserver-xorg/config/nonnumeric_string_error
Type: note
_Description: Numerical value needed
Characters other than digits are not allowed in the entry.
-
-Template: xserver-xorg/autodetect_keyboard
-Type: boolean
-Default: false
-_Description: Autodetect keyboard layout?
- The default keyboard layout selection for the Xorg server will be based on a
- combination of the language and the keyboard layout selected in the installer.
- .
- Choose this option if you want the keyboard layout to be redetected. Do not
- choose it if you want to keep your current layout.
commit 623ff02bd09944331d139339e522e9de654f95f8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:14:58 2009 +0100
xserver-xorg.postinst: don't configure the keyboard layout.
diff --git a/debian/changelog b/debian/changelog
index 30cc9fb..e819161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* dexconf: don't write empty Monitor and Screen sections.
* dexconf: don't output an InputDevice section for mice.
* dexconf: don't output an InputDevice section for keyboards.
+ * xserver-xorg.postinst: don't configure the keyboard layout.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 484e4ec..d62ae50 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -349,20 +349,6 @@ priority_ceil() {
esac
}
-non_latin_keyboard () {
- NONLATINMAPS="am ar bg by cs el gr il ir iu lo lt mk ml mm mn ru th tj ua"
- for i in $NONLATINMAPS; do
- if [ "$XMAP" = "$i" ]; then
- NON_LATIN="true"
- fi
- done
-
- # Turkish F keyboards are non-Latin; Turkish Q aren't.
- if [ "$XMAP" = "tr" ] && [ "$VARIANT" = "f" ]; then
- NON_LATIN="true"
- fi
-}
-
# analyze arguments; used by auto_answer()
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE=true
@@ -476,219 +462,6 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
auto_answer db_input "$(priority_ceil medium)" xserver-xorg/config/device/use_fbdev "$USE_FBDEV"
fi
-# keyboard setup
-PRIORITY="medium"
-
-if [ -n "$FIRSTINST" ]; then
- AUTODETECT_KB="true"
-else
- AUTODETECT_KB="false"
-fi
-
-auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xorg/autodetect_keyboard "$AUTODETECT_KB" || debug_echo "db_input xserver-xorg/autodetect_keyboard"
-db_get xserver-xorg/autodetect_keyboard || debug_report_status "db_get server-xorg/autodetect_keyboard"
-if [ "$RET" = "true" ]; then
- DOKBDETECT="true"
- debug_echo "Redetecting keyboard layout; resetting flag to false."
- db_set xserver-xorg/autodetect_keyboard false
-fi
-
-if [ -n "$DOKBDETECT" ] && [ -f /etc/default/console-setup ]; then
- # Hmm. At least for now, none of the variables in this file will clash
- # with our own variables ...
- . /etc/default/console-setup
-fi
-
-if [ "$XKBLAYOUT" ]; then
- debug_echo "Fetched keyboard layout from console configuration:"
- debug_echo "layout: '$XKBLAYOUT', options: '$XKBOPTIONS', variant: '$XKBVARIANT', model: '$XKBMODEL'"
- PRIORITY=low
-elif [ -n "$DOKBDETECT" ]; then
- # generated by a small bit of Perl from a static list of keymaps provided
- # by Matthias Urlichs
- REALLANG=${LANG%%@*}
- REALLANG=${REALLANG%%.*}
-
- db_get debian-installer/keymap || debug_report_status "db_get debian-installer/keymap"
- DI_KEYMAP="${RET##mac-usb-}"
- DI_KEYMAP="${DI_KEYMAP%%-latin1}"
-
- case "$DI_KEYMAP" in
- be2) XMAP="be";;
- bg) XMAP="bg"; VARIANT="bds";;
- br) XMAP="us"; VARIANT="intl"; MODEL="pc104";;
- br-abnt2) XMAP="br"; VARIANT="abnt2"; MODEL="abnt2";;
- by) XMAP="by";;
- ca-multi) XMAP="ca"; VARIANT="multi";;
- cf) XMAP="ca"; VARIANT="fr";;
- croat) XMAP="hr";;
- cz-lat2) XMAP="cz";;
- de-latin1-nodeadkeys) XMAP="de"; VARIANT="nodeadkeys";;
- de) XMAP="de";;
- dvorak) XMAP="us"; VARIANT="dvorak"; MODEL="pc104";;
- dk) XMAP="dk";;
- es) XMAP="es";;
- et) XMAP="ee";;
- fi) XMAP="fi";;
- fr) XMAP="fr"; VARIANT="oss";;
- fr_CH) XMAP="ch"; VARIANT="fr";;
- fr-latin9) XMAP="fr"; VARIANT="latin9";;
- gb) XMAP="gb";;
- gr) XMAP="gr";;
- hebrew) XMAP="il";;
- hu) XMAP="hu";;
- is) XMAP="is";;
- it) XMAP="it";;
- jp106) XMAP="jp"; MODEL="jp106";;
- la) XMAP="latam";;
- lfc-cat) XMAP="es"; VARIANT="cat";;
- lt) XMAP="lt";;
- lv-latin4) XMAP="lv";;
- # XXX should these be MODEL="macintosh"?
- mac-us-std) XMAP="us";;
- mac-de2-ext) XMAP="de"; VARIANT="nodeadkeys";;
- mac-fr2-ext) XMAP="fr";;
- mac-fr3) XMAP="fr";;
- mac-es) XMAP="es";;
- mac-usb-de_CH) XMAP="ch"; VARIANT="de";;
- mk) XMAP="mk";;
- nl) XMAP="nl";;
- no) XMAP="no";;
- pl) XMAP="pl";;
- pt) XMAP="pt";;
- ro) XMAP="ro";;
- ru) XMAP="ru";;
- se) XMAP="se";;
- sg) XMAP="ch"; VARIANT="de";;
- sk-qwerty) XMAP="sk"; VARIANT="qwerty";;
- slovene) XMAP="si";;
- sr-cy) XMAP="cs";;
- trf|trfu) XMAP="tr"; VARIANT="f";;
- trq|trqu) XMAP="tr";;
- ua) XMAP="ua";;
- uk) XMAP="gb";;
- us) XMAP="us"; MODEL="pc104";;
- *) XMAP="UNKNOWN";;
- esac
-
- if [ "$XMAP" = "us" ] && [ "${DI_LANG}" = "ko_KR" ]; then
- XMAP=kr # Uses US keyboard on the console.
- MODEL=
- fi
-
- if [ "$XMAP" = "UNKNOWN" ]; then
- warn "failed to infer keyboard layout from layout/lang '$DI_KEYMAP--$REALLANG'"
- PRIORITY=medium
- XMAP="us"
- MODEL="pc104"
- # prompt for layout if we ended up with French Canadian; apparently having
- # US-layout keyboards is common there
- elif [ "$XMAP" = "ca" ] && [ "$VARIANT" = "fr" ]; then
- PRIORITY=high
- else
- PRIORITY=low
- fi
-
- # we can't do non-Latin usernames, so people with Latin layouts need a US
- # layout so they can log in, and then switch to writing native text. Bit hard
- # to work out which one should be the default.
- non_latin_keyboard
- if [ -n "$NON_LATIN" ]; then
- warn "selected layout '$XMAP' from '$DI_KEYMAP--$REALLANG' is non-Latin; " \
- "adding us to the layout list, Alt+Shift toggles"
- if [ -z "$OPTIONS" ]; then
- OPTIONS="grp:alt_shift_toggle"
- else
- OPTIONS="$OPTIONS,grp:alt_shift_toggle"
- fi
- XMAP="us,$XMAP"
- fi
-
- if [ -n "$LEVEL2" ]; then
- warn "selected layout '$XMAP' from '$DI_KEYMAP--$REALLANG' is l2-only"
- fi
-
- XKBLAYOUT="$XMAP"
- XKBOPTIONS="$OPTIONS"
- XKBVARIANT="$VARIANT"
- XKBMODEL="$MODEL"
-else
- db_get xserver-xorg/config/inputdevice/keyboard/layout || debug_report_status "db_get xserver-xorg/config/inputdevice/keyboard/layout"
- XKBLAYOUT="$RET"
- db_get xserver-xorg/config/inputdevice/keyboard/options || debug_report_status "db_get xserver-xorg/config/inputdevice/keyboard/options"
- XKBOPTIONS="$RET"
- db_get xserver-xorg/config/inputdevice/keyboard/variant || debug_report_status "db_get xserver-xorg/config/inputdevice/keyboard/variant"
- XKBVARIANT="$RET"
- db_get xserver-xorg/config/inputdevice/keyboard/model || debug_report_status "db_get xserver-xorg/config/inputdevice/keyboard/model"
- XKBMODEL="$RET"
- PRIORITY=low
-fi
-
-MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/keyboard/layout "$XKBLAYOUT"
-
-# these questions require input validation
-PRIORITY=medium
-
-DEFAULT=xorg
-MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/keyboard/rules "$DEFAULT"
-
-if [ -z "$XKBMODEL" ]; then
- db_get xserver-xorg/config/inputdevice/keyboard/rules
- if [ "$RET" = "sun" ]; then
- db_set xserver-xorg/config/inputdevice/keyboard/rules "xorg"
- XKBMODEL=pc105
- elif [ "$RET" = "xorg" ]; then
- if [ "$ARCH" = "powerpc" ] && \
- [ -e /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ] && \
- [ "$(cat /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes)" = "0" ]; then
- XKBMODEL=macintosh_old
- else
- XKBMODEL=pc105
- fi
- fi
-fi
-MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/keyboard/model "$XKBMODEL"
-
-# ugly kludge, I know; map Apple->AltGr for most European Macs
-db_get xserver-xorg/config/inputdevice/keyboard/model
-if [ "$ARCH" = "powerpc" ] && [ "$RET" = "pc105" ]; then
- if [ -n "$XKBOPTIONS" ]; then
- if ! echo "$XKBOPTIONS" | grep -q "lv3:"; then
- XKBOPTIONS="$XKBOPTIONS,lv3:lwin_switch"
- fi
- else
- XKBOPTIONS="lv3:lwin_switch"
- fi
-fi
-
-# kill me now.
-if echo "$XKBOPTIONS" | grep -q "nodeadkeys"; then
- if [ -z "$XKBVARIANT" ]; then
- XKBVARIANT="nodeadkeys"
- NEWOPTIONS=""
- IFS_SAVE="$IFS"
- IFS=","
- for i in $XKBOPTIONS; do
- IFS="$IFS_SAVE"
- if [ "$i" != "nodeadkeys" ]; then
- NEWOPTIONS="${NEWOPTIONS:+$NEWOPTIONS,}$i"
- fi
- IFS=","
- done
- IFS="$IFS_SAVE"
- XKBOPTIONS="$NEWOPTIONS"
- db_set xserver-xorg/config/inputdevice/keyboard/variant "$XKBVARIANT"
- db_set xserver-xorg/config/inputdevice/keyboard/options "$XKBOPTIONS"
- else
- warn "wanted to migrate nodeadkeys from options -> variant, but variant" \
- "is already $XKBVARIANT; not migrating"
- fi
-fi
-
-MAY_BE_NULL=yes auto_answer validate_string_db_input "$(priority_ceil low)" xserver-xorg/config/inputdevice/keyboard/variant "$XKBVARIANT"
-
-MAY_BE_NULL=yes auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/keyboard/options "$XKBOPTIONS"
-
# files and dri sections
if [ -e "$CONFIG_AUX_DIR/.migrateconfig" ]; then
AUTODETECT_VIDEO="yes"
commit 1ad02cdfddb88f81fd7e346eefee81c1522898f1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 8 17:13:10 2009 +0100
dexconf: don't output an InputDevice section for keyboards.
diff --git a/debian/changelog b/debian/changelog
index e08061a..30cc9fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
detection), so stop adding Recommends on them.
* dexconf: don't write empty Monitor and Screen sections.
* dexconf: don't output an InputDevice section for mice.
+ * dexconf: don't output an InputDevice section for keyboards.
[ David Nusinow ]
* Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples.
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 0022619..21375f5 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -140,7 +140,7 @@ fi
# Files File pathnames NOT USED BY DEXCONF
# ServerFlags Server flags NOT USED BY DEXCONF
# Module Dynamic module loading NOT USED BY DEXCONF
-# InputDevice Input device description
+# InputDevice Input device description NOT USED BY DEXCONF
# Device Graphics device description
# VideoAdaptor Xv video adaptor description NOT USED BY DEXCONF
# Monitor Monitor description NOT USED BY DEXCONF
@@ -175,37 +175,6 @@ cat >&4 <<SECTION
# sudo dpkg-reconfigure -phigh xserver-xorg
SECTION
-### KEYBOARD / INPUTDEVICE
-
-fetch xserver-$SERVER/config/inputdevice/keyboard/rules
-XKB_RULES="$RET"
-fetch xserver-$SERVER/config/inputdevice/keyboard/model
-XKB_MODEL="$RET"
-fetch xserver-$SERVER/config/inputdevice/keyboard/layout
-XKB_LAYOUT="$RET"
-# XkbVariant and XkbOptions are permitted to be null.
-db_get xserver-$SERVER/config/inputdevice/keyboard/variant
-XKB_VARIANT="$RET"
-db_get xserver-$SERVER/config/inputdevice/keyboard/options
-XKB_OPTIONS="$RET"
-
-exec 4>"$DEXCONFTMPDIR/InputDeviceKeyboard"
-cat >&4 <<SECTION
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "kbd"
- Option "XkbRules" "$XKB_RULES"
- Option "XkbModel" "$XKB_MODEL"
- Option "XkbLayout" "$XKB_LAYOUT"
-SECTION
-if [ -n "$XKB_VARIANT" ]; then
- printf "\tOption\t\t\"XkbVariant\"\t\"$XKB_VARIANT\"\n" >&4
-fi
-if [ -n "$XKB_OPTIONS" ]; then
Reply to: