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

Juuso Alasuutari iuso at sourcemage.org
Sat May 10 07:46:27 EDT 2008


Juuso Alasuutari wrote:
> 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.
> +

I apologize for the ambiguousness of some of these messages; my brain 
isn't fully in gear yet.

Some explanation: I initially thought that building the SVN branch of 
kdebase4 would remove the need for kdebase4-runtime and 
kdebase-workspace4, as these two are sub-dirs of kdebase4 SVN. Indeed 
kdebase4 from SVN installs _most_ of the files that kdebase4-runtime and 
kdebase-workspace4 provide, but after an unsuccesful reboot it became 
obvious to me that that isn't quite enough.

So, currently if you build KDE 4 from SVN, you will get a big bunch of 
files which are shared by kdebase4, kdebase4-runtime, and 
kdebase-workspace4. This is OK from a practical point of view, but of 
course it's redundant and dirty. I'll try to find out how to separate 
these three better.

Sorry about the mix-up!

Juuso



More information about the SM-Commit mailing list