[SM-Commit] GIT changes to master grimoire by Eric Sandall (7e6e41ccbedec7442b16e3afddd5ee208a754322)

Eric Sandall scm at sourcemage.org
Tue Oct 14 05:51:48 EDT 2008


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

 gnome2-libs/goffice/CONFLICTS |    4 ++--
 gnome2-libs/goffice/HISTORY   |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7e6e41ccbedec7442b16e3afddd5ee208a754322
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    goffice: Auto-conflict with deprecated spells (Bug #14828)

diff --git a/gnome2-libs/goffice/CONFLICTS b/gnome2-libs/goffice/CONFLICTS
index d2334a6..3b93106 100755
--- a/gnome2-libs/goffice/CONFLICTS
+++ b/gnome2-libs/goffice/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts goffice-0.5 &&
-conflicts goffice-0.6
+conflicts goffice-0.5 y &&
+conflicts goffice-0.6 y
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index eefb84a..3b8dc64 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,7 @@
+2008-10-14 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Auto-conflict with deprecated packages
+	  Fixes Bug #14828
+
 2008-09-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.6.5
 



More information about the SM-Commit mailing list