[Lunar-commits] <moonbase> Revert "fixesproto: version bumped to 4.1."

[Florin Braescu]

commit c0b0dfc44aec845aacc98c6143408cf928ca6fa1
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sat Jul 25 14:01:35 2009 +0300

    Revert "fixesproto: version bumped to 4.1."
    
    This reverts commit b192366a00304762d7f96774e7caf18290fe3759.
    
    fixesproto: revert it to 4.0 as it breaks xorg-server compile.
---
 kde4/utils/soprano/DETAILS       |    6 +++---
 xorg7/proto/fixesproto/CONFLICTS |   10 +++++-----
 xorg7/proto/fixesproto/DETAILS   |   10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kde4/utils/soprano/DETAILS b/kde4/utils/soprano/DETAILS
index 49c83c0..0c3fc93 100644
--- a/kde4/utils/soprano/DETAILS
+++ b/kde4/utils/soprano/DETAILS
@@ -1,11 +1,11 @@
           MODULE=soprano
-         VERSION=2.3.0
+         VERSION=2.2.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:7452957588be84e212c46b54034e907e61c277c9
+      SOURCE_VFY=sha1:55af2c0a1f62ea038814e35b8effe2436d47ebe8
         WEB_SITE=http://soprano.sourceforge.net
          ENTERED=20080123
-         UPDATED=20090725
+         UPDATED=20090701
            SHORT="A highly usable C++/QT4 library for RDF data"
 
 cat << EOF
diff --git a/xorg7/proto/fixesproto/CONFLICTS b/xorg7/proto/fixesproto/CONFLICTS
index fa885b1..5013182 100644
--- a/xorg7/proto/fixesproto/CONFLICTS
+++ b/xorg7/proto/fixesproto/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/fixesproto/DETAILS b/xorg7/proto/fixesproto/DETAILS
index 38f5500..b95bcc0 100644
--- a/xorg7/proto/fixesproto/DETAILS
+++ b/xorg7/proto/fixesproto/DETAILS
@@ -1,12 +1,12 @@
           MODULE=fixesproto
-         VERSION=4.1
+         VERSION=4.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$XORG_URL/individual/proto
-      SOURCE_VFY=sha1:8b2e6009c629649556d45ef847d5b31591bb6f96
+      SOURCE_URL=$XORG_URL/individual/proto/
+      SOURCE_VFY=sha1:de9139e4836f1ab234583406ea2ee6446ad7965f
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
-        WEB_SITE=http://www.x.org
+        WEB_SITE=http://www.x.org/
          ENTERED=20060120
-         UPDATED=20090725
+         UPDATED=20060523
            SHORT="the X.Org Fixes protocol headers"
 
 cat << EOF