summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgnome2-libs/goffice/CONFLICTS4
-rw-r--r--gnome2-libs/goffice/HISTORY4
2 files changed, 6 insertions, 2 deletions
diff --git a/gnome2-libs/goffice/CONFLICTS b/gnome2-libs/goffice/CONFLICTS
index d2334a60b2..3b93106b92 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 eefb84ad4d..3b8dc6449d 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,7 @@
+2008-10-14 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflict with deprecated packages
+ Fixes Bug #14828
+
2008-09-03 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.6.5