[Lunar-commits] <moonbase> xf86-video-neomagic: version bumped to 1.2.1.

[Florin Braescu]

commit 250599cbc5281637dd93c63246d26cb4e019ac4d
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Jun 1 10:45:22 2008 +0300

    xf86-video-neomagic: version bumped to 1.2.1.
    
    Bugfixes.
---
 xorg7/driver/xf86-video-neomagic/CONFLICTS |   10 +++++-----
 xorg7/driver/xf86-video-neomagic/DETAILS   |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xorg7/driver/xf86-video-neomagic/CONFLICTS b/xorg7/driver/xf86-video-neomagic/CONFLICTS
index 5013182..fa885b1 100644
--- a/xorg7/driver/xf86-video-neomagic/CONFLICTS
+++ b/xorg7/driver/xf86-video-neomagic/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-neomagic/DETAILS b/xorg7/driver/xf86-video-neomagic/DETAILS
index 114c552..613d504 100644
--- a/xorg7/driver/xf86-video-neomagic/DETAILS
+++ b/xorg7/driver/xf86-video-neomagic/DETAILS
@@ -1,13 +1,13 @@
           MODULE=xf86-video-neomagic
-         VERSION=1.2.0
+         VERSION=1.2.1
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$XORG_URL/individual/driver/
-      SOURCE_VFY=sha1:5b4e383dca832f80c6a3d308e9faab0defa68e18
+      SOURCE_URL=$XORG_URL/individual/driver
+      SOURCE_VFY=sha1:fcb919e8a78fb75654b21b2358783df14d2c8dfc
    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 Neomagic MagicGraph based cards"
+         UPDATED=20080601
+           SHORT="The X.Org video driver for Neomagic MagicGraph based cards"
 
 cat << EOF
 xf86-video-neomagic provides the driver for Neomagic MagicGraph based