Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ba1a470a1ae8905cb1bb2cebcffd93127d7e92fe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (ba1a470a1ae8905cb1bb2cebcffd93127d7e92fe)
  • Date: Fri, 12 Feb 2010 13:17:13 -0600

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

kde4/kdelibs4/CONFLICTS | 9 +++++++++
kde4/kdelibs4/HISTORY | 30 ++++++++++++++++++++----------
kde4/kdelibs4/UP_TRIGGERS | 11 +++++++++++
3 files changed, 40 insertions(+), 10 deletions(-)

New commits:
commit ba1a470a1ae8905cb1bb2cebcffd93127d7e92fe
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kdelibs4: Cleanup whitespace

commit 0f4b05f848f6a3792dcfca4f43b233feff93824d
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.

diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index 03c4a33..d612832 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -1,2 +1,11 @@
conflicts kdelibs4-experimental y
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" ]]
+then
+ conflicts kdebase-workspace4 y
+fi
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index f3104b2..81bc9bb 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,18 +1,28 @@
-2010-02-11 Treeve Jelbert <treeve AT sourcemage.org>
+2010-02-12 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflict with kdebase-workspace4 when updating from
KDE4.3
+ to KDE4.4
+ Bug #15573
+ * UP_TRIGGERS: Recast kdebase-workspace4 after updating from KDE4.3 to
+ KDE4.4
+ Bug #15573
+
+2010-02-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update hash
- there was a last minute change upstream, see
+ there was a last minute change upstream, see
http://mail.kde.org/pipermail/release-team/2010-February/003708.html
-
-2010-02-09 Treeve Jelbert <treeve AT sourcemage.org>
+
+2010-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.0 (stable)

2010-01-28 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.3.5
-2010-01-25 Treeve Jelbert <treeve AT sourcemage.org>
+
+2010-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.95 (unstable)

-2010-01-08 Treeve Jelbert <treeve AT sourcemage.org>
+2010-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.90 (unstable)
+
2010-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add attica
* CONLICTS: add polkit-qt
@@ -38,7 +48,7 @@
* SUB_DEPENDS, PRE_SUB_DEPENDS: deleted
soprano is standard for kde4 now
libart_lgpl is not used by kde4 anyway
-
+
2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: remove self

@@ -49,14 +59,14 @@
2009-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: soprano needs redland & raptor

-2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS, PRE_BUILD: make hal optional - it always crashed for me
* hal.diff: added

-2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

-2009-11-06 Treeve Jelbert <treeve AT sourcemage.org>
+2009-11-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.74svn1044032 (unstable)

2009-11-04 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/kde4/kdelibs4/UP_TRIGGERS b/kde4/kdelibs4/UP_TRIGGERS
new file mode 100755
index 0000000..f6f23e3
--- /dev/null
+++ b/kde4/kdelibs4/UP_TRIGGERS
@@ -0,0 +1,11 @@
+#
+# Nepomuk was installed by kdebase-workspace4 in KDE 4.3, but now it is
+# installed by kdelibs4 in KDE 4.4.
+# Rebuild kdebase-workspace4 from KDE 4.3 after updating kdelibs4 to KDE 4.4
+# 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)" ]]
+then
+ up_trigger kdebase-workspace4 cast_self
+fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ba1a470a1ae8905cb1bb2cebcffd93127d7e92fe), Eric Sandall, 02/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page