[Lunar-commits] r26013 - moonbase/trunk/xorg7/data/xkeyboard-config

[Samuel Verstraete]

Author: elangelo
Date: 2007-10-01 18:27:54 +0200 (Mon, 01 Oct 2007)
New Revision: 26013

Modified:
   moonbase/trunk/xorg7/data/xkeyboard-config/BUILD
   moonbase/trunk/xorg7/data/xkeyboard-config/DETAILS
Log:
This should fix a lot 


Modified: moonbase/trunk/xorg7/data/xkeyboard-config/BUILD
===================================================================
--- moonbase/trunk/xorg7/data/xkeyboard-config/BUILD	2007-10-01 14:08:28 UTC (rev 26012)
+++ moonbase/trunk/xorg7/data/xkeyboard-config/BUILD	2007-10-01 16:27:54 UTC (rev 26013)
@@ -3,12 +3,11 @@
   
   OPTS+="--with-xkb-base=/usr/share/X11/xkb --enable-compat-rules \
          --disable-xkbcomp-symlink --with-xkb-rules-symlink=xorg"
-
-  # Otherwise the Makefile fails
-  rm -rf $MODULE_PREFIX/share/X11/xkb/compiled &&
-
-  # This directory has to be there.
+  
+  # This should not be needed, check in next release if still needed.
+  rm -fr /usr/share/X11/xkb/compiled &&
   mkdir -p /var/lib/xkb &&
+  ln -sf /var/lib/xkb /usr/share/X11/xkb/compiled &&
 
   default_build
 

Modified: moonbase/trunk/xorg7/data/xkeyboard-config/DETAILS
===================================================================
--- moonbase/trunk/xorg7/data/xkeyboard-config/DETAILS	2007-10-01 14:08:28 UTC (rev 26012)
+++ moonbase/trunk/xorg7/data/xkeyboard-config/DETAILS	2007-10-01 16:27:54 UTC (rev 26013)
@@ -6,7 +6,7 @@
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20070329
-         UPDATED=20070926
+         UPDATED=20071001
            SHORT="keyboard data files for the X.Org server"
 
 cat << EOF