From 587f3b215c7af4e310de0f2dd647638ba569dfac Mon Sep 17 00:00:00 2001 From: Eric Sandall Date: Wed, 24 Aug 2011 11:12:35 -0700 Subject: Revert "xkeyboard-config: commented unrecognized option (issue #30)" This reverts commit 85645575ef1105eddf8bd5dacd258199df1f70ee. Does not apply to xkeyboard-config 2.1+. Conflicts: xorg-data/xkeyboard-config/HISTORY --- xorg-data/xkeyboard-config/BUILD | 2 +- xorg-data/xkeyboard-config/HISTORY | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'xorg-data') diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD index 4fe83eb881..d60d8c828c 100755 --- a/xorg-data/xkeyboard-config/BUILD +++ b/xorg-data/xkeyboard-config/BUILD @@ -1,4 +1,4 @@ -#OPTS="$OPTS --enable-xkbcomp-symlink" && +OPTS="$OPTS --enable-xkbcomp-symlink" && OPTS="$OPTS --enable-compat-rules" && OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb" && OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86" && diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY index 3f5f6735b5..3f71d2a4df 100644 --- a/xorg-data/xkeyboard-config/HISTORY +++ b/xorg-data/xkeyboard-config/HISTORY @@ -1,6 +1,3 @@ -2011-08-19 Bor Kraljič - * BUILD: commented unrecognized option (issue #30) - 2011-04-25 Eric Sandall * DETAILS: Updated to 2.2.1 2.2.x requires libx11 1.4.3+ -- cgit v1.2.3