Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue Apr 15 20:11:20 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-14 20:00:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-15 20:09:48.457509000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 19:39:38 CEST 2008 - dmueller@suse.de + +- fix file conflicts + +------------------------------------------------------------------- kdebase4-workspace.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.c26237/_old 2008-04-15 20:10:59.000000000 +0200 +++ /var/tmp/diff_new_pack.c26237/_new 2008-04-15 20:10:59.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.3 -Release: 8 +Release: 10 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Mon Apr 14 2008 dmueller@suse.de +- fix file conflicts * Mon Apr 14 2008 stbinner@suse.de - improve logout, shutdown, restart confirmation and add countdown - draw rounded background behind system tray windows ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.c26237/_old 2008-04-15 20:10:59.000000000 +0200 +++ /var/tmp/diff_new_pack.c26237/_new 2008-04-15 20:10:59.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.3 -Release: 8 +Release: 10 %define rversion 4.0.3 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -239,6 +239,7 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README %dir /usr/share/kde4/services/kwin +%exclude /usr/share/kde4/apps/kwin/titlebar_decor.png %package devel License: GPL v2 or later @@ -398,7 +399,6 @@ %_kde_share_dir/services/plasma-dataengine-tasks.desktop %_kde_share_dir/services/plasma-pager-default.desktop %_kde_share_dir/services/plasma-runner-bookmarks.desktop -%_kde_share_dir/services/desktop.desktop %_kde_share_dir/services/plasma-runner-calculator.desktop %_kde_share_dir/services/plasma-runner-webshortcuts.desktop %_kde_share_dir/apps/plasmoidviewer @@ -430,12 +430,9 @@ /usr/%_lib/kde4/krunner_calculatorrunner.so /usr/%_lib/kde4/krunner_bookmarksrunner.so /usr/%_lib/kde4/kstyle_keramik_config.so -/usr/%_lib/kde4/kcm_kwincompositing.so -/usr/%_lib/kde4/kwin4_effect_builtins.so #/usr/%_lib/kde4/kxkb_panelapplet.so /usr/%_lib/kde4/libexec/test_kcm_xinerama /usr/%_lib/kde4/plugins/designer/ksysguardwidgets.so -/usr/%_lib/libkdecorations.so.* /usr/%_lib/libkdeinit4_kaccess.so /usr/%_lib/libkdeinit4_plasma.so /usr/%_lib/libkdeinit4_kcminit.so @@ -450,7 +447,6 @@ /usr/%_lib/libkdeinit4_kxkb.so /usr/%_lib/libkscreensaver.so.* /usr/%_lib/libksgrd.so.* -/usr/%_lib/libkwineffects.so.* /usr/%_lib/libkworkspace.so.* /usr/%_lib/libplasma.so.* /usr/%_lib/libprocesscore.so.* @@ -477,7 +473,6 @@ %_kde_share_dir/apps/kconf_update/ksmserver.upd %_kde_share_dir/apps/kconf_update/mouse_cursor_theme.upd %_kde_share_dir/apps/kconf_update/move_session_config.sh -%_kde_share_dir/apps/kconf_update/pluginlibFix.pl %_kde_share_dir/apps/kcontroledit %_kde_share_dir/apps/kcontrol %_kde_share_dir/apps/kdisplay @@ -526,7 +521,6 @@ %_kde_share_dir/services/kcmaccess.desktop %_kde_share_dir/services/kcmlaunch.desktop %_kde_share_dir/services/kcmsmserver.desktop -%_kde_share_dir/services/kwincompositing.desktop %_kde_share_dir/services/kded/khotkeys.desktop %_kde_share_dir/services/keyboard.desktop %_kde_share_dir/services/keyboard_layout.desktop @@ -547,7 +541,6 @@ %_kde_share_dir/servicetypes/plasma-runner.desktop %_kde_share_dir/servicetypes/screensaver.desktop /usr/share/wallpapers -/usr/share/sounds/pop.wav /etc/systemsettingsrc /usr/bin/systemsettings /usr/bin/solidshell @@ -639,6 +632,8 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Mon Apr 14 2008 dmueller@suse.de +- fix file conflicts * Mon Apr 14 2008 stbinner@suse.de - improve logout, shutdown, restart confirmation and add countdown - draw rounded background behind system tray windows ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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