Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (f8db63c47ab30b255dd66dc54ddbbc1ddf6b30b1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (f8db63c47ab30b255dd66dc54ddbbc1ddf6b30b1)
  • Date: Fri, 9 May 2008 08:18:55 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

kde4/kdebase4/CONFLICTS | 5 +++++
kde4/kdebase4/HISTORY | 2 ++
2 files changed, 7 insertions(+)

New commits:
commit f8db63c47ab30b255dd66dc54ddbbc1ddf6b30b1
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdebase4: Conflict with kdebase4-runtime and kdebase-workspace4 if
installing the SVN version, they are included.

diff --git a/kde4/kdebase4/CONFLICTS b/kde4/kdebase4/CONFLICTS
new file mode 100644
index 0000000..9005ec5
--- /dev/null
+++ b/kde4/kdebase4/CONFLICTS
@@ -0,0 +1,5 @@
+# kdebase4 from svn includes these two
+if [[ $KDE_VER == devel ]]; then
+ conflicts kdebase4-runtime &&
+ conflicts kdebase-workspace4
+fi
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 1a0f7ae..d78ffab 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,5 +1,7 @@
2008-05-09 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Added SVN version.
+ * CONFLICTS: Added, the SVN version includes kdebase4-runtime
+ and kdebase-workspace4 and thus conflicts with them.

2008-05-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.73



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (f8db63c47ab30b255dd66dc54ddbbc1ddf6b30b1), Juuso Alasuutari, 05/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page