sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (73666e8aca16fc26ec55cf91b26613972e39eb5b)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (73666e8aca16fc26ec55cf91b26613972e39eb5b)
Date: Thu, 21 Jan 2010 23:56:36 -0600

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

x11-toolkits/qt4/CONFLICTS | 8 +-------
x11-toolkits/qt4/HISTORY | 3 +++
2 files changed, 4 insertions(+), 7 deletions(-)

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

qt4: Looks like qt4 needs to conflict even for minor revisions

diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
index 6c9828d..be85071 100755
--- a/x11-toolkits/qt4/CONFLICTS
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -1,7 +1 @@
-if spell_ok $SPELL;then
- OLDQT=`installed_version $SPELL| cut -c-3` &&
- NEWQT=`echo $VERSION | cut -c-3`
- if [[ $OLDQT != $NEWQT ]];then
- conflicts qt4 y
- fi
-fi
+conflicts qt4 y
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ac137a5..570e16a 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2010-01-21 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Looks like qt4 needs to conflict even for minor revisions
+
2010-01-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.6.1

[SM-Commit] GIT changes to master grimoire by Eric Sandall (73666e8aca16fc26ec55cf91b26613972e39eb5b), Eric Sandall, 01/22/2010