Skip to Content.
Sympa Menu

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

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 (fa9dbb4c7cd76b040388015184e900c820c90f9e)
  • Date: Sat, 10 May 2008 06:38:13 -0500

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

ChangeLog | 5 +++++
kde4-apps/KDE_DEPENDS | 10 ++--------
kde4-look/KDE_DEPENDS | 10 ++--------
kde4/KDE_DEPENDS | 8 ++------
kde4/kdebase4/CONFLICTS | 5 -----
kde4/kdebase4/HISTORY | 4 ++++
kde4/plasma/DEPENDS | 6 +-----
kde4/plasma/DETAILS | 2 +-
kde4/plasma/HISTORY | 3 ---
9 files changed, 17 insertions(+), 36 deletions(-)

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

kdebase4: Remove SVN version's conflict with kdebase4-runtime and
kdebase-workspace4, they're still needed.

commit b7dc3ca4e8e7121eb1da4e116cd904779e44fef3
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kde4-look/KDE_DEPENDS: Corrected mistake in my previous commit;
kdebase4-runtime and kdebase-workspace4 are
needed also with the KDE 4 devel branch.

commit a390ce28485e459aa147c4b4fba2e78f383875ae
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Corrected mistake in my previous commit; kdebase4-runtime and
kdebase-workspace4 are needed also with the devel
version.

commit b5dd32240a3ba1a4722ef10098d7f3074d3b3710
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kde4/KDE_DEPENDS: Corrected mistake in my previous commit;
kdebase4-runtime and kdebase-workspace4 are needed
even with the devel version.

commit f1c08d6279d140e4d98994031764c5b2e3505255
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Revert "plasma: Make deprecation work also when KDE_VER is 'devel'."

This reverts commit 676ee25aee2450a09b8994c90c957c185ad3a5d0.

kdebase4-runtime and kdebase-workspace4 are needed also with kdebase4
devel

diff --git a/ChangeLog b/ChangeLog
index f55cac5..1ef1010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-10 Juuso Alasuutari <iuso AT sourcemage.org>
+ * kde4/KDE_DEPENDS: Corrected mistake in previous commit.
+ * kde4-apps/KDE_DEPENDS: Corrected mistake in previous commit.
+ * kde4-look/KDE_DEPENDS: Corrected mistake in previous commit.
+
2008-05-09 Juuso Alasuutari <iuso AT sourcemage.org>
* kde4/KDE_DEPENDS: Removed deprecated plasma,
added support for SVN version.
diff --git a/kde4-apps/KDE_DEPENDS b/kde4-apps/KDE_DEPENDS
index 11cf873..0e33b29 100755
--- a/kde4-apps/KDE_DEPENDS
+++ b/kde4-apps/KDE_DEPENDS
@@ -1,11 +1,5 @@
-persistent_read kdelibs4 KDE_VER KDE_VER
-
depends g++ &&
depends cmake &&

-if [[ $KDE_VER != devel ]]; then
- depends kdebase4-runtime &&
- optional_depends kdebase-workspace4 '' '' 'kde desktop'
-else
- depends kdebase4
-fi
+depends kdebase4-runtime &&
+optional_depends kdebase-workspace4 '' '' 'kde desktop'
diff --git a/kde4-look/KDE_DEPENDS b/kde4-look/KDE_DEPENDS
index 11cf873..0e33b29 100755
--- a/kde4-look/KDE_DEPENDS
+++ b/kde4-look/KDE_DEPENDS
@@ -1,11 +1,5 @@
-persistent_read kdelibs4 KDE_VER KDE_VER
-
depends g++ &&
depends cmake &&

-if [[ $KDE_VER != devel ]]; then
- depends kdebase4-runtime &&
- optional_depends kdebase-workspace4 '' '' 'kde desktop'
-else
- depends kdebase4
-fi
+depends kdebase4-runtime &&
+optional_depends kdebase-workspace4 '' '' 'kde desktop'
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 80ea795..00099bd 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -40,11 +40,7 @@ case $SPELL in
depends X11-SERVER
;;

- *) if [[ $KDE_VER != devel ]]; then
- depends kdebase4-runtime &&
- optional_depends kdebase-workspace4 '' '' 'kde desktop'
- else
- depends kdebase4
- fi
+ *) depends kdebase4-runtime &&
+ optional_depends kdebase-workspace4 '' '' 'kde desktop'
;;
esac
diff --git a/kde4/kdebase4/CONFLICTS b/kde4/kdebase4/CONFLICTS
deleted file mode 100644
index 9005ec5..0000000
--- a/kde4/kdebase4/CONFLICTS
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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 d78ffab..eaeb83b 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,7 @@
+2008-05-10 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFLICTS: Deleted, kdebase4-runtime and kdebase-workspace4
+ are needed also with the SVN version.
+
2008-05-09 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Added SVN version.
* CONFLICTS: Added, the SVN version includes kdebase4-runtime
diff --git a/kde4/plasma/DEPENDS b/kde4/plasma/DEPENDS
index bb62657..d2acafc 100755
--- a/kde4/plasma/DEPENDS
+++ b/kde4/plasma/DEPENDS
@@ -1,5 +1 @@
-if [[ $KDE_VER != devel ]]; then
- depends kdebase-workspace4
-else
- depends kdebase4
-fi
+depends kdebase-workspace4
diff --git a/kde4/plasma/DETAILS b/kde4/plasma/DETAILS
index 1bc3ba4..c1b2e7a 100755
--- a/kde4/plasma/DETAILS
+++ b/kde4/plasma/DETAILS
@@ -1,8 +1,8 @@
SPELL=plasma
-persistent_read kdelibs4 KDE_VER KDE_VER
VERSION=0
PATCHLEVEL=9999
SHORT="deprecated"
cat << EOF
deprecated spell [replaced by kdebase-workspace4]
EOF
+
diff --git a/kde4/plasma/HISTORY b/kde4/plasma/HISTORY
index 669b4dd..8a67a62 100644
--- a/kde4/plasma/HISTORY
+++ b/kde4/plasma/HISTORY
@@ -1,6 +1,3 @@
-2008-05-09 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: Make deprecation work also when KDE_VER is 'devel'.
-
2008-05-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0
PATCHLEVEL=9999




Archive powered by MHonArc 2.6.24.

Top of Page