[Lunar-commits] <moonbase> xkbcomp: version bumped to 1.1.0.

[Florin Braescu]

commit e2ac25b34d9c00f4dca0bb9eec71cc5e5515633b
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Fri Jul 10 16:02:37 2009 +0300

    xkbcomp: version bumped to 1.1.0.
    
    The most interesting feature is the ability to configure the xkb data dir at
    configure time rather than being forced to the hardcoded default.
    Other changes include a few bug fixes, cleanups, comments and a run of
    'indent' over the repository.
---
 xorg7/app/xkbcomp/BUILD     |    2 +-
 xorg7/app/xkbcomp/CONFLICTS |   10 +++++-----
 xorg7/app/xkbcomp/DETAILS   |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xorg7/app/xkbcomp/BUILD b/xorg7/app/xkbcomp/BUILD
index cfe3408..7875861 100644
--- a/xorg7/app/xkbcomp/BUILD
+++ b/xorg7/app/xkbcomp/BUILD
@@ -1,6 +1,6 @@
 (
-  . /etc/profile.d/x11r7.rc &&
 
+  . /etc/profile.d/x11r7.rc  &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/app/xkbcomp/CONFLICTS b/xorg7/app/xkbcomp/CONFLICTS
index 5013182..fa885b1 100644
--- a/xorg7/app/xkbcomp/CONFLICTS
+++ b/xorg7/app/xkbcomp/CONFLICTS
@@ -1,6 +1,6 @@
-conflicts XOrg6  &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
+conflicts XOrg6
+conflicts XOrg-test
+conflicts XOrg-fonts-base
+conflicts XOrg-fonts-extra
+conflicts XOrg-drm
 conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xkbcomp/DETAILS b/xorg7/app/xkbcomp/DETAILS
index cb387a4..da0af31 100644
--- a/xorg7/app/xkbcomp/DETAILS
+++ b/xorg7/app/xkbcomp/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xkbcomp
-         VERSION=1.0.5
+         VERSION=1.1.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/app
-      SOURCE_VFY=sha1:9485bb7763ae06e48f12638deeed5b42abe61cbd
+      SOURCE_VFY=sha1:78d710d64e64df1894dd2b49ff9b0113b3af4746
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20080515
+         UPDATED=20090710
            SHORT="The X.Org XKB keyboard description compiler"
 
 cat << EOF