From: Tomas Pospisek <tpo_deb@sourcepole.ch>
Subject: Fix location of X11 configuration files in Debian
Forwarded: not-needed
--- a/tkinfo
+++ b/tkinfo
@@ -113,7 +113,7 @@
 The colors, fonts, and geometry of tkInfo can be customized using the
 standard X options database. A random example follows. You can either put
 (parts of) this in your .Xdefaults or .Xresources file or you can
-create a global file /usr/lib/X11/app-defaults/tkinfo that will apply
+create a global file /etc/X11/app-defaults/tkinfo that will apply
 to all users of your site. To have the new options take effect,
 restart your X server or use the program xrdb. More information about
 the X options mechanism is available from the X man page. Use tkman
@@ -745,13 +745,17 @@
 #   Searches for the app-default files corresponding to classNames in
 #   the order specified by X Toolkit Intrinsics (R5), and loads them with
 #   the priority specified (default: startupFile). From the Tcl FAQ.
+#
+# Modified by Tomas Pospisek <tpo_deb@sourcepole.ch>:
+#
+# 1. use Debian specific system wide app-defaults path under /etc/X11
+# 2. remove "lang" - I haven't ever seen paths that contain a "lang" specific part
+#
 proc _tkiLoadAppDefaults {classNameList {priority startupFile}} {
-  set lang [_tkiEnvVal LANG]
-  if {[string length $lang] > 0} { set lang /$lang }
   set filepath "\
-                /usr/lib/X11${lang}/app-defaults \
+                /etc/X11/app-defaults \
                 [split [_tkiEnvVal XFILESEARCHPATH] :] \
-                [_tkiEnvVal XAPPLRESDIR]${lang} \
+                [_tkiEnvVal XAPPLRESDIR]$ \
                 [split [_tkiEnvVal XUSERFILESEARCHPATH] :] \
                 "
   foreach i $classNameList {
