diff options
| author | Jaka Kranjc | 2008-10-14 13:17:37 +0200 |
|---|---|---|
| committer | Jaka Kranjc | 2008-10-14 13:17:37 +0200 |
| commit | 218d6ff0cc5adf1d0dbe354f6b99f173a348dc24 (patch) | |
| tree | c3b558b54f7b77ab0a7e4ac80dda13770a9e80d3 | |
| parent | b4f609cb3e88f830cab1b8f50d57cfea6251870e (diff) | |
goffice: Auto-conflict with deprecated spells (Bug #14828)stable-rc-0.26
(cherry-picked from commit 7e6e41ccbedec7442b16e3afddd5ee208a754322)
| -rwxr-xr-x | gnome2-libs/goffice/CONFLICTS | 4 | ||||
| -rw-r--r-- | gnome2-libs/goffice/HISTORY | 4 |
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 |