sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (4e740ef71375bee3cf4701c5d12c9766e4398b7c)
- 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 (4e740ef71375bee3cf4701c5d12c9766e4398b7c)
- Date: Fri, 12 Feb 2010 13:41:31 -0600
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
kde4/kdelibs4/CONFLICTS | 2 +-
kde4/kdelibs4/UP_TRIGGERS | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4e740ef71375bee3cf4701c5d12c9766e4398b7c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
kdelibs4: Migrate nepomuk from kdebase-workspace4 to kdelibs4 for KDE
4.3 -> 4.4 upgrade
Nepomuk was provided by kdebase-workspace4 in KDE 4.3, but in KDE 4.4 it
is now provided by kdelibs4. We need to remove kdebase-workspace4
*before* updating kdelibs4 and then recast kdebase-workspace4.
commit 307f9d1e92df5459adece3d0a2f55c6273edd04e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "kdelibs4: Migrate nepomuk from kdebase-workspace4 to kdelibs4 for
KDE"
This reverts commit 0f4b05f848f6a3792dcfca4f43b233feff93824d.
Use invalid version_installed command.
Conflicts:
kde4/kdelibs4/HISTORY
diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index d612832..1ccb050 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -5,7 +5,7 @@ conflicts polkit-qt y
# Need to remove kdebase-workspace4 4.3 before building kdelibs4 4.4
# Bug #15573
#
-if spell_ok kdebase-workspace4 && [[ "$(version_installed
kdebase-workspace4|cut -d. -f1,2)" == "4.3" ]]
+if spell_ok kdebase-workspace4 && [[ "$(installed_version
kdebase-workspace4|cut -d. -f1,2)" == "4.3" ]]
then
conflicts kdebase-workspace4 y
fi
diff --git a/kde4/kdelibs4/UP_TRIGGERS b/kde4/kdelibs4/UP_TRIGGERS
index f6f23e3..9f90f3a 100755
--- a/kde4/kdelibs4/UP_TRIGGERS
+++ b/kde4/kdelibs4/UP_TRIGGERS
@@ -5,7 +5,7 @@
# Bug #15573
#
if $(gaze from /opt/kde4/include/nepomuk/resource.h|grep -q
kdebase-workspace4-4.3) &&
- [[ "$(version_installed kdelibs4|cut -d. -f1,2)" -ne "$(version_installed
kdebase-workspace4|cut -d. -f1,2)" ]]
+ [[ "$(installed_version kdelibs4|cut -d. -f1,2)" -ne "$(installed_version
kdebase-workspace4|cut -d. -f1,2)" ]]
then
up_trigger kdebase-workspace4 cast_self
fi
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (4e740ef71375bee3cf4701c5d12c9766e4398b7c), Eric Sandall, 02/12/2010
Archive powered by MHonArc 2.6.24.