Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 x11-toolkits/qt4/CONFLICTS |    5 ++---
 x11-toolkits/qt4/HISTORY   |   14 +++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit de75814a7ffcba44ba9e9c9ef78cd5f98f43d097
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    qt4: Cleanup whitespace

commit b2548e171c451ae88c596a882ad787256a9634c6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    qt4: SELF -> SPELL, there is no SELF
    Remove debug message, corrupted conflict message to:
        qt4 conflicts with old=4.5,. Dispel old=4.5,? []
    Instead of:
        qt4 conflicts with qt4. Dispel qt4? [y]

diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
index 60697dd..6c9828d 100755
--- a/x11-toolkits/qt4/CONFLICTS
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -1,7 +1,6 @@
-if spell_ok $SELF;then
-  OLDQT=`installed_version $SELF| cut -c-3` &&
+if spell_ok $SPELL;then
+  OLDQT=`installed_version $SPELL| cut -c-3` &&
   NEWQT=`echo $VERSION | cut -c-3`
-message "old=$OLDQT, new=$NEWQT" &&
   if [[ $OLDQT != $NEWQT ]];then
     conflicts qt4 y
   fi
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 263a4a0..efdade3 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2009-12-01 Eric Sandall <sandalle AT sourcemage.org>
+       * CONFLICTS: SELF -> SPELL, there is no SELF
+         Remove debug message, corrupted conflict message to:
+         qt4 conflicts with old=4.5,. Dispel old=4.5,? []
+         Instead of:
+         qt4 conflicts with qt4. Dispel qt4? [y]
+
 2009-12-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.6.0
        * CONFLICTS: check old version before forcing conflict
@@ -19,7 +26,7 @@
        * DETAILS: version 4.6.0-beta1
        * CONFLICTS: add it back again unfortunately. when going from 4.5 to 
4.6
          tries to link old modules which don't have the new entrypoints
-       * BUILD HISTORY SUB_DEPENDS PRE_SUB_DEPENDS: 
+       * BUILD HISTORY SUB_DEPENDS PRE_SUB_DEPENDS:
          add multimedia, Accessibility and gtk options
        * CONFIGURE: delete obsolete stuff
        * DEPENDS: remove obsolete sqlite2 support
@@ -79,7 +86,7 @@
 2009-05-03 George Sherwood <gsherwood AT sourcemage.org>
        * PRE_BUILD: apply patch to build with odbc
        * odbc.patch: Added Fedora patch to fix build problem against
-         new unixODBC. 
+         new unixODBC.
          http://osdir.com/ml/fedora-extras-commits/2009-02/msg06899.html
 
 2009-04-29 Treeve Jelbert <treeve AT sourcemage.org>
@@ -118,7 +125,7 @@
        * DETAILS: version 4.5.0-rc1 (prerelease)
          4.5.0 ( snapshot )
        * grind.diff: fix compile of prerelease
-       * PRE_BUILD: apply patch 
+       * PRE_BUILD: apply patch
 
 2009-01-31 Juuso Alasuutari <iuso AT sourcemage.org>
        * DEPENDS: Remove optional_depends stlport.
@@ -696,3 +703,4 @@
        * ALL: created this changelog, updated version to 3.0.3
          spell now downloads .tar.bz2 rather than .tar.gz
          changed BUILD to install qt to /usr
+