[Lunar-commits] <moonbase> Revert "xf86vidmodeproto: version bumped to 2.3."

[Florin Braescu]

commit cbede5bd717938ca272f500396980e1cc9e253c7
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Fri Oct 2 14:54:40 2009 +0300

    Revert "xf86vidmodeproto: version bumped to 2.3."
    
    This reverts commit 464edcefe56c7532966c1a7a5c09696414541f06.
    
    xf86vidmodeproto: revert it as it breaks mesa-lib compile.
---
 xorg7/proto/xf86vidmodeproto/CONFLICTS |   10 +++++-----
 xorg7/proto/xf86vidmodeproto/DETAILS   |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xorg7/proto/xf86vidmodeproto/CONFLICTS b/xorg7/proto/xf86vidmodeproto/CONFLICTS
index fa885b1..5013182 100644
--- a/xorg7/proto/xf86vidmodeproto/CONFLICTS
+++ b/xorg7/proto/xf86vidmodeproto/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/proto/xf86vidmodeproto/DETAILS b/xorg7/proto/xf86vidmodeproto/DETAILS
index bb5db75..a10fb43 100644
--- a/xorg7/proto/xf86vidmodeproto/DETAILS
+++ b/xorg7/proto/xf86vidmodeproto/DETAILS
@@ -1,17 +1,17 @@
           MODULE=xf86vidmodeproto
-         VERSION=2.3
+         VERSION=2.2.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$XORG_URL/individual/proto
-      SOURCE_VFY=sha1:22d034c2f66985f8541b9ea3421096ceaa006355
+      SOURCE_URL=$XORG_URL/individual/proto/
+      SOURCE_VFY=sha1:4a228958879eb06206d13f4f09ec902f837fb8dd
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
-        WEB_SITE=http://www.x.org
+        WEB_SITE=http://www.x.org/
          ENTERED=20060120
          UPDATED=20060120
-           SHORT="The X.Org Video Mode protocol headers"
+           SHORT="the X.Org Video Mode protocol headers"
 
 cat << EOF
 xf86vidmodeproto provides the wire protocol for the XFree86-VidMode
-extension in X.Org. It is used to provide access to detailed timings
+extension in X.Org.  It is used to provide access to detailed timings
 of video modes currently in use, and provides a means to modify them.
 EOF