X Strike Force X.Org X11 SVN commit: r975 - trunk/debian
Author: dnusinow
Date: 2005-12-28 18:39:09 -0500 (Wed, 28 Dec 2005)
New Revision: 975
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Allow xserver-xorg maintainer script to be used in locales other than C.
Thanks Denis Barbier. (closes: #343602)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-12-28 23:30:59 UTC (rev 974)
+++ trunk/debian/changelog 2005-12-28 23:39:09 UTC (rev 975)
@@ -9,11 +9,13 @@
* Remove obsolete patch general/033_radeon_fix_for_no_accel.diff
* Fix xserver-xorg config script to properly output resolutions other than
640x480. Thanks Colin Watson. (closes: #344785, #328259)
+ * Allow xserver-xorg maintainer script to be used in locales other than C.
+ Thanks Denis Barbier. (closes: #343602)
* Translation updates
+ Swedish. Thanks Daniel Nylander. (closes: #333833)
+ Greek. Thanks Konstantinos Margaritis. (closes: #344590)
- -- David Nusinow <dnusinow@debian.org> Wed, 28 Dec 2005 18:28:56 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 28 Dec 2005 18:37:33 -0500
xorg-x11 (6.8.99.903.dfsg.1-1) experimental; urgency=low
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-12-28 23:30:59 UTC (rev 974)
+++ trunk/debian/xserver-xorg.config.in 2005-12-28 23:39:09 UTC (rev 975)
@@ -244,13 +244,13 @@
#
# Accept any non-null sequence of lowercase letters followed by a
# non-null sequence of decimal digits. This handles "fbN" and "nameN".
- expr "$RET" : "SBUS:[a-z]\+[0-9]\+" >/dev/null 2>&1 && break
+ LC_ALL=C expr "$RET" : "SBUS:[a-z]\+[0-9]\+" >/dev/null 2>&1 && break
# Now for the PROM path. I am lazy; accept a slash followed a non-null
# sequence of letters and commas, an at sign, a non-null sequence of
# hexadecimal digits, a comma, and another non-null sequence of
# hexadecimal digits. Furthermore, accept multiple occurences of this
# entire sequence. Whew.
- expr "$RET" : "SBUS:\(/[A-Za-z,]\+@[0-9A-Fa-f]\+,[0-9A-Fa-f]\+\)\+$" \
+ LC_ALL=C expr "$RET" : "SBUS:\(/[A-Za-z,]\+@[0-9A-Fa-f]\+,[0-9A-Fa-f]\+\)\+$" \
>/dev/null 2>&1 && break
;;
[0-9])
Reply to: