Hello community, here is the log from the commit of package kdebase4-workspace checked in at Wed May 28 16:08:50 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-27 01:26:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-28 16:07:37.258088000 +0200 @@ -1,0 +2,5 @@ +Tue May 27 23:36:39 CEST 2008 - dmueller@suse.de + +- call kde4-migrate if present (bnc#372170) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change New: ---- kde4-migrate.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.iX3931/_old 2008-05-28 16:08:21.000000000 +0200 +++ /var/tmp/diff_new_pack.iX3931/_new 2008-05-28 16:08:21.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.4 -Release: 18 +Release: 19 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Wed May 28 2008 dmueller@suse.de +- call kde4-migrate if present (bnc#372170) * Tue May 27 2008 stbinner@suse.de - backport unmounting in device notifier (bnc#391223) * Mon May 26 2008 stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.iX3931/_old 2008-05-28 16:08:21.000000000 +0200 +++ /var/tmp/diff_new_pack.iX3931/_new 2008-05-28 16:08:21.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.4 -Release: 16 +Release: 17 %define rversion 4.0.4 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -69,6 +69,7 @@ Patch85: windeco-color.diff Patch86: ksmserver-text-color.diff Patch87: klipperrc.diff +Patch88: kde4-migrate.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD %if %suse_version > 1030 @@ -138,6 +139,7 @@ %patch85 %patch86 %patch87 +%patch88 %build %cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm @@ -697,6 +699,8 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Wed May 28 2008 dmueller@suse.de +- call kde4-migrate if present (bnc#372170) * Tue May 27 2008 stbinner@suse.de - backport unmounting in device notifier (bnc#391223) * Mon May 26 2008 stbinner@suse.de ++++++ kde4-migrate.diff ++++++ --- startkde.cmake +++ startkde.cmake @@ -48,12 +48,17 @@ # # * Then ksmserver is started which takes control of the rest of the startup sequence -# The user's personal KDE directory is usually ~/.kde, but this setting +# The user's personal KDE directory is usually ~/.kde4, but this setting # may be overridden by setting KDEHOME. kdehome=$HOME/.kde4 test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` +# first, migrate settings from kde3, if available +if test -x /usr/bin/kde4-migrate; then + /usr/bin/kde4-migrate || true +fi + # see kstartupconfig source for usage mkdir -m 700 -p $kdehome mkdir -m 700 -p $kdehome/share ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de