[Lunar-commits] <moonbase> xf86-video-s3: version bumped to 0.6.1.

[Florin Braescu]

commit dc221707d1a533ccfabbb9e8d7a0ecaba5f8efd0
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Dec 25 20:12:57 2008 +0200

    xf86-video-s3: version bumped to 0.6.1.
    
    Bugfixes and code cleanups.
---
 xorg7/driver/xf86-video-s3/CONFLICTS |   10 +++++-----
 xorg7/driver/xf86-video-s3/DETAILS   |   14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xorg7/driver/xf86-video-s3/CONFLICTS b/xorg7/driver/xf86-video-s3/CONFLICTS
index 5013182..fa885b1 100644
--- a/xorg7/driver/xf86-video-s3/CONFLICTS
+++ b/xorg7/driver/xf86-video-s3/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/driver/xf86-video-s3/DETAILS b/xorg7/driver/xf86-video-s3/DETAILS
index 7d40337..749dd32 100644
--- a/xorg7/driver/xf86-video-s3/DETAILS
+++ b/xorg7/driver/xf86-video-s3/DETAILS
@@ -1,17 +1,17 @@
           MODULE=xf86-video-s3
-         VERSION=0.6.0
+         VERSION=0.6.1
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$XORG_URL/individual/driver/
-      SOURCE_VFY=sha1:8167d89ab2e548246a341aa3ca34a8fa58de285a
+      SOURCE_URL=$XORG_URL/individual/driver
+      SOURCE_VFY=sha1:6dcc29988ce89a68a5011b156fc95b8d0755dd70
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
-        WEB_SITE=http://www.x.org/
+        WEB_SITE=http://www.x.org
          ENTERED=20060303
-         UPDATED=20080415
-           SHORT="the X.Org video driver for legacy S3 based cards"
+         UPDATED=20081225
+           SHORT="The X.Org video driver for legacy S3 based cards"
 
 cat << EOF
 xf86-video-s3 provides the X.Org video driver for certain legacy S3
-based video cards, including the Trio64 and 96x cards.  It does not
+based video cards, including the Trio64 and 96x cards. It does not
 provide support the ViRGE/Trio3D or Savage chipsets; support for those
 cards is provides by xf86-video-s3virge and xf86-video-savage,
 respectively.