sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dc896f5cca70c256d6d60aca6ed49302de0f4f5a)

From: Ladislav Hagara <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dc896f5cca70c256d6d60aca6ed49302de0f4f5a)
Date: Sun, 31 Oct 2010 13:01:42 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

x11-toolkits/gtk+2/CONFLICTS | 4 +++-
x11-toolkits/gtk+2/HISTORY | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit dc896f5cca70c256d6d60aca6ed49302de0f4f5a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gtk+2: CONFLICTS: removed gail, added gtk+2, #15899

diff --git a/x11-toolkits/gtk+2/CONFLICTS b/x11-toolkits/gtk+2/CONFLICTS
index 50f6d21..39cbbb7 100755
--- a/x11-toolkits/gtk+2/CONFLICTS
+++ b/x11-toolkits/gtk+2/CONFLICTS
@@ -1 +1,3 @@
-conflicts gail y
+if spell_ok gtk+2 && [[ $(installed_version gtk+2) < 2.22 ]]; then
+ conflicts gtk+2 y
+fi
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index e6933bc..adba9c4 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2010-10-31 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: removed gail, added gtk+2, #15899
+
2010-10-25 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: removed --with-lib{png,jpeg,tiff,jasper} #15889

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dc896f5cca70c256d6d60aca6ed49302de0f4f5a), Ladislav Hagara, 10/31/2010