[Lunar-commits] <moonbase> xkeyboard-config: version bumped to 1.7.

[Florin Braescu]

commit 52b16045de4a1f614c71b5c4cbd9782d50b7405b
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Oct 1 23:01:04 2009 +0300

    xkeyboard-config: version bumped to 1.7.
    
    Some bugs are fixed (~30), new configuration components added.
    Updated translations are included.
---
 xorg7/data/xkeyboard-config/CONFLICTS |   12 ++++++------
 xorg7/data/xkeyboard-config/DETAILS   |    8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/xorg7/data/xkeyboard-config/CONFLICTS b/xorg7/data/xkeyboard-config/CONFLICTS
index 18646c7..fdf5f3e 100644
--- a/xorg7/data/xkeyboard-config/CONFLICTS
+++ b/xorg7/data/xkeyboard-config/CONFLICTS
@@ -1,7 +1,7 @@
-conflicts XOrg6  &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs &&
+conflicts XOrg6
+conflicts XOrg-test
+conflicts XOrg-fonts-base
+conflicts XOrg-fonts-extra
+conflicts XOrg-drm
+conflicts XOrg-drm-cvs
 conflicts xkbdata
diff --git a/xorg7/data/xkeyboard-config/DETAILS b/xorg7/data/xkeyboard-config/DETAILS
index 0c5fb01..b2522c9 100644
--- a/xorg7/data/xkeyboard-config/DETAILS
+++ b/xorg7/data/xkeyboard-config/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xkeyboard-config
-         VERSION=1.6
+         VERSION=1.7
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://xlibs.freedesktop.org/xkbdesc
-      SOURCE_VFY=sha1:312f2e142f7d2bea6cabe6fcd8da4fb6c0711396
+      SOURCE_VFY=sha1:d6df43bfc0596be04865f2be7c4e794e198358c8
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
-        WEB_SITE=http://www.x.org/
+        WEB_SITE=http://www.x.org
          ENTERED=20070329
-         UPDATED=20090706
+         UPDATED=20091001
            SHORT="keyboard data files for the X.Org server"
 
 cat << EOF