Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Mon Jun 23 22:40:53 CEST 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-05 17:59:46.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-23 22:39:49.193571000 +0200
@@ -1,0 +2,5 @@
+Mon Jun 23 09:13:14 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.82
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
Old:
----
4_0_BRANCH.diff
dateandtime.diff
kdebase-workspace-4.0.4.tar.bz2
kgreeter-generic.diff
krunner.diff
ksmserver-text-color.diff
ksplashx-scale.diff
libs.diff
oxygen-ozone-rename.diff
oxygen-windeco-colors.diff
oxygen-windeco-memory-usage.diff
plasma.diff
rediff-plasma.sh
show-runtime-only-in-kde.diff
solid-nm07.diff
New:
----
4_1_BRANCH.diff
kdebase-workspace-4.0.82.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:00.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.0.4)
+# spec file for package kdebase4-wallpapers (Version 4.0.82)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
Name: kdebase4-wallpapers
-BuildRequires: NetworkManager-devel bluez-libs libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel
+BuildRequires: NetworkManager-devel bluez-libs libQtWebKit-devel libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel
%if %suse_version > 1020
BuildRequires: libusb-devel
%else
@@ -21,8 +21,8 @@
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.0.4
-Release: 26
+Version: 4.0.82
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -55,10 +55,12 @@
%files
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING README
/usr/share/wallpapers
%changelog
+* Mon Jun 23 2008 dmueller@suse.de
+- update to 4.0.82
* Thu Jun 05 2008 wstephenson@suse.de
- minimal Solid NetworkManager 0.7 backend fixes network status is
always unknown (bnc#397072)
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:00.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.0.4)
+# spec file for package kdebase4-workspace (Version 4.0.82)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: kdebase4-workspace
BuildRequires: NetworkManager-devel bluez-libs libkde4-devel libqimageblitz-devel
BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel
-BuildRequires: audit-devel pam-devel
+BuildRequires: audit-devel libQtWebKit-devel pam-devel
%if %suse_version > 1030
BuildRequires: ConsoleKit-devel liblazy-devel
%endif
@@ -26,21 +26,15 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.0.4
-Release: 23
-%define rversion 4.0.4
-Source0: kdebase-workspace-%rversion.tar.bz2
+Version: 4.0.82
+Release: 1
+Source0: kdebase-workspace-%version.tar.bz2
Source2: titlebar_decor.png
-Source3: rediff-plasma.sh
Source90: _upstream
Source91: kdebase4-workspace-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch0: 4_0_BRANCH.diff
+Patch0: 4_1_BRANCH.diff
Patch1: dotkde4.diff
-Patch2: libs.diff
-Patch3: plasma.diff
-Patch4: krunner.diff
-Patch5: show-runtime-only-in-kde.diff
Patch8: kwin-suse.diff
Patch10: kwin-two-desktops.diff
Patch18: startkde.diff
@@ -54,29 +48,20 @@
Patch67: kdm-remove-duplicated-sessions.diff
Patch68: kdm-make_it_cool.diff
Patch69: kdm-all-users-nopass.diff
-Patch71: oxygen-windeco-colors.diff
Patch72: select-wm-gui.diff
-Patch73: kgreeter-generic.diff
Patch74: lowdiskspace.patch
Patch75: ksmserver-leave-countdown.diff
-Patch76: ksplashx-scale.diff
Patch77: systemsettings-desktop.diff
-Patch80: dateandtime.diff
-Patch81: oxygen-windeco-memory-usage.diff
Patch82: rotate-wacom-pointers.diff
Patch83: hotplug-kde3.diff
-Patch84: oxygen-ozone-rename.diff
Patch85: windeco-color.diff
-Patch86: ksmserver-text-color.diff
Patch87: klipperrc.diff
Patch88: kde4-migrate.diff
-Patch89: solid-nm07.diff
%kde4_runtime_requires
Conflicts: yast2-theme-NLD
%if %suse_version > 1030
Requires: %name-branding = 11.0
%endif
-Recommends: kdebase4-workspace-plasmoids
Recommends: kdebase4-SuSE
Recommends: kde4-kwin
Recommends: extragear-plasma
@@ -99,17 +84,9 @@
The KDE Team
%prep
-%setup -q -n kdebase-workspace-%rversion
+%setup -q -n kdebase-workspace-%version
%patch
%patch1
-cd libs
-%patch2
-cd ../plasma
-%patch3
-cd ../krunner
-%patch4
-cd ..
-%patch5
%patch8
%patch10
%patch18
@@ -125,23 +102,15 @@
%patch67
%patch68
%patch69
-%patch71
-%patch72
-%patch73
+#%patch72
%patch74
-%patch75
-%patch76
+#%patch75
%patch77
-%patch80
-%patch81
%patch82
-%patch83
-%patch84
+#%patch83
%patch85
-%patch86
%patch87
%patch88
-%patch89
%build
%cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm
@@ -164,7 +133,20 @@
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/circles.*,," filelists/kdm
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm
mv $RPM_BUILD_ROOT/usr/share/wallpapers/EOS $RPM_BUILD_ROOT/usr/share/
- rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/*
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Code_Poets_Dream
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Colorado_Farm
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Curls_on_Green
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Emotion
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Fields_of_Peace
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Finally_Summer_in_Germany
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Fresh_Morning
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Golden_Ripples
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Green_Concentration
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Ladybuggin
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Leafs_Labyrinth
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Red_Leaf
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Skeeter_Hawk
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/There_is_Rain_on_the_Table
mv $RPM_BUILD_ROOT/usr/share/EOS $RPM_BUILD_ROOT/usr/share/wallpapers/
mkdir -p $RPM_BUILD_ROOT/etc
mv $RPM_BUILD_ROOT/usr/etc/ksysguarddrc $RPM_BUILD_ROOT/etc/
@@ -173,7 +155,6 @@
%suse_update_desktop_file systemsettings X-SuSE-core
%suse_update_desktop_file ksysguard System Monitor
%suse_update_desktop_file kmenuedit Core-Configuration
- %suse_update_desktop_file -u ktip System Utility
%suse_update_desktop_file -r klipper System TrayIcon
%suse_update_desktop_file -r krandrtray Applet X-KDE-settings-desktop
%if %suse_version > 1020
@@ -270,7 +251,7 @@
%files ksysguardd
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
/usr/bin/ksysguardd
%config(noreplace) /etc/ksysguarddrc
@@ -298,7 +279,7 @@
%files -n kde4-kwin -f filelists/kwin
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/services/kwin
%exclude /usr/share/kde4/apps/kwin/titlebar_decor.png
/usr/share/kde4/apps/kwin/default_rules/plasma_desktop_containment.kwinrules
@@ -308,6 +289,7 @@
Requires: kdebase4-workspace = %version
Requires: libkde4-devel >= %_kde_platform_version
Requires: kde4-kwin = %version
+Requires: libQtWebKit-devel
Provides: plasma-devel = %version
Summary: The KDE Workspace Components
Group: System/GUI/KDE
@@ -324,7 +306,7 @@
%files devel -f filelists/devel
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
/usr/include/*
%_kde_share_dir/apps/cmake
%_libdir/libsolidcontrolifaces.so
@@ -341,6 +323,8 @@
%_libdir/libweather_ion.so
%_libdir/libkfontinst.so
%_libdir/libkfontinstui.so
+%_libdir/libplasmaclock.so
+%_libdir/libkhotkeysprivate.so
%package -n kde4-kdm
License: GPL v2 or later
@@ -377,7 +361,7 @@
%files -n kde4-kdm -f filelists/kdm
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%doc %lang(en) /usr/share/doc/kde/HTML/en/kdm
%dir %_kde_config_dir/kdm
%_libdir/kde4/kcm_kdm.so
@@ -385,11 +369,11 @@
%config %_kde_config_dir/kdm.knsrc
%dir /usr/share/kde4/apps/doc
%dir /usr/share/kde4/apps/doc/kdm
-%_kde_share_dir/apps/kdm/programs
+%_kde_share_dir/apps/kdm
%files -f filelists/exclude
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
/usr/bin/kaccess
/usr/bin/kfontinst
/usr/bin/kfontview
@@ -398,8 +382,6 @@
%verify(not mode) %attr(4755,root,shadow) %_kde4_modules/libexec/kcheckpass
/usr/bin/kcminit
/usr/bin/kcminit_startup
-/usr/bin/kcontroledit
-/usr/bin/kdeinstallktheme
/usr/bin/khotkeys
/usr/bin/klipper
/usr/bin/kmenuedit
@@ -407,14 +389,12 @@
/usr/bin/krandrtray
/usr/bin/krdb
/usr/bin/krunner
-/usr/bin/krunner_lock
/usr/bin/ksmserver
/usr/bin/ksplashsimple
/usr/bin/ksplashx
/usr/bin/ksplashx_scale
/usr/bin/ksysguard
/usr/bin/ksystraycmd
-/usr/bin/ktip
/usr/bin/kxkb
/usr/bin/startkde
/usr/bin/plasma
@@ -466,11 +446,9 @@
%_kde_share_dir/services/plasma-runner-bookmarks.desktop
%_kde_share_dir/services/plasma-runner-calculator.desktop
%_kde_share_dir/services/plasma-runner-webshortcuts.desktop
-%_kde_share_dir/apps/plasmoidviewer
#%_libdir/kde4/kickoff_plasma_applet_launcher.so
%dir /usr/%_lib/kconf_update_bin
/usr/%_lib/kconf_update_bin/khotkeys_update
-/usr/%_lib/kde4/kcm_accessibility.so
/usr/%_lib/kde4/kcm_access.so
/usr/%_lib/kde4/kcm_bell.so
/usr/%_lib/kde4/kcm_clock.so
@@ -483,7 +461,6 @@
/usr/%_lib/kde4/kcm_keys.so
/usr/%_lib/kde4/kcm_khotkeys.so
/usr/%_lib/kde4/kcm_ksplashthemes.so
-/usr/%_lib/kde4/kcm_kthememanager.so
/usr/%_lib/kde4/kcm_launch.so
/usr/%_lib/kde4/kcm_randr.so
/usr/%_lib/kde4/kcm_screensaver.so
@@ -502,7 +479,6 @@
/usr/%_lib/libkdeinit4_plasma.so
/usr/%_lib/libkdeinit4_kcminit.so
/usr/%_lib/libkdeinit4_kcminit_startup.so
-/usr/%_lib/libkdeinit4_kcontroledit.so
/usr/%_lib/libkdeinit4_khotkeys.so
/usr/%_lib/libkdeinit4_klipper.so
/usr/%_lib/libkdeinit4_kmenuedit.so
@@ -525,7 +501,6 @@
/usr/share/applications/kde4/kmenuedit.desktop
/usr/share/applications/kde4/krandrtray.desktop
/usr/share/applications/kde4/ksysguard.desktop
-/usr/share/applications/kde4/ktip.desktop
%exclude %_kde_share_dir/apps/desktoptheme/default/widgets/branding.svg
%_kde_share_dir/apps/desktoptheme
%_kde_share_dir/apps/kaccess
@@ -538,7 +513,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/kcontroledit
%_kde_share_dir/apps/kcontrol
%_kde_share_dir/apps/kdisplay
%_kde_share_dir/apps/khotkeys
@@ -555,7 +529,6 @@
/usr/share/autostart/khotkeys.desktop
/usr/share/autostart/klipper.desktop
/usr/share/autostart/krunner.desktop
-/usr/share/autostart/ktip.desktop
%config %_kde_config_dir/background.knsrc
#%_kde_share_dir/config.kcfg/kcm_useraccount_pass.kcfg
/usr/share/dbus-1/interfaces/org.kde.krunner.App.xml
@@ -566,13 +539,11 @@
/usr/share/dbus-1/interfaces/org.kde.krunner.Interface.xml
/usr/share/dbus-1/interfaces/org.kde.screensaver.xml
/usr/share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
-/usr/share/desktop-directories
/usr/share/kde4/services/colors.desktop
/usr/share/icons/hicolor/*/apps/khotkeys.*
/usr/share/icons/hicolor/*/apps/kmenuedit.*
/usr/share/icons/hicolor/*/apps/ksplash.*
/usr/share/icons/hicolor/*/apps/kxkb.*
-%_kde_share_dir/services/accessibility.desktop
%_kde_share_dir/services/bell.desktop
%_kde_share_dir/services/clock.desktop
%_kde_share_dir/services/display.desktop
@@ -580,7 +551,6 @@
%_kde_share_dir/services/fonts.desktop
%_kde_share_dir/services/fonts.protocol
%_kde_share_dir/services/ServiceMenus/installfont.desktop
-%_kde_share_dir/services/installktheme.desktop
%_kde_share_dir/services/joystick.desktop
%_kde_share_dir/services/kaccess.desktop
%_kde_share_dir/services/kcmaccess.desktop
@@ -592,7 +562,6 @@
%_kde_share_dir/services/keys.desktop
%_kde_share_dir/services/khotkeys.desktop
%_kde_share_dir/services/ksplashthememgr.desktop
-%_kde_share_dir/services/kthememanager.desktop
%_kde_share_dir/services/mouse.desktop
%_kde_share_dir/services/randr.desktop
%_kde_share_dir/services/screensaver.desktop
@@ -608,14 +577,15 @@
/usr/share/wallpapers
/etc/systemsettingsrc
/usr/bin/systemsettings
-/usr/bin/solidshell
%_libdir/kde4/kcm_solid.so
%_libdir/kde4/kded_networkstatus.so
%_libdir/kde4/solid_bluez.so
%_libdir/kde4/solid_fakebluetooth.so
%_libdir/kde4/solid_fakenet.so
%_libdir/kde4/solid_hal_power.so
-%if %suse_version >= 1030
+%if %suse_version > 1030
+%_libdir/kde4/solid_networkmanager07.so
+%else
%_libdir/kde4/solid_networkmanager.so
%endif
%_libdir/libsolidcontrol.so.*
@@ -628,7 +598,6 @@
#/usr/share/icons/hicolor/*/apps/systemsettings.*
/usr/share/kde4/apps/solidfakebluetoothbackend
/usr/share/kde4/apps/solidfakenetbackend
-/usr/share/kde4/apps/kdewizard
/usr/share/kde4/apps/systemsettings
/usr/share/kde4/services/kcm_solid.desktop
/usr/share/kde4/services/kded/networkstatus.desktop
@@ -695,8 +664,44 @@
/usr/%_lib/kde4/kfontviewpart.so
/usr/share/kde4/apps/kconf_update/khotkeys_printscreen.upd
/usr/%_lib/kde4/kgreet_*.so
+/usr/bin/plasmapkg
+/usr/bin/safestartkde
+/usr/bin/solid-bluetooth
+/usr/bin/solid-network
+/usr/bin/solid-powermanagement
+%_libdir/kde4/kcm_autostart.so
+%_libdir/kde4/krunner_services.so
+%_libdir/kde4/krunner_sessions.so
+%_libdir/kde4/krunner_shell.so
+%_libdir/kde4/krunner_xesam.so
+%_libdir/kde4/libexec/krunner_lock
+%_libdir/libkhotkeysprivate.so.*
+%_libdir/libplasmaclock.so.*
+%doc %lang(en) /usr/share/doc/kde/HTML/en/kcontrol
+%doc %lang(en) /usr/share/doc/kde/HTML/en/systemsettings
+%_kde_share_dir/apps/kcmkeys
+%_kde_share_dir/config/colorschemes.knsrc
+%_kde_share_dir/config/ksplash.knsrc
+%_kde_share_dir/config/plasma-themes.knsrc
+%_kde_share_dir/services/autostart.desktop
+%_kde_share_dir/services/plasma-applet-trash.desktop
+%_kde_share_dir/services/plasma-dataengine-nowplaying.desktop
+%_kde_share_dir/services/plasma-packagestructure-dashboard.desktop
+%_kde_share_dir/services/plasma-runner-services.desktop
+%_kde_share_dir/services/plasma-runner-sessions.desktop
+%_kde_share_dir/services/plasma-runner-shell.desktop
+%_kde_share_dir/services/plasma-runner-xesam.desktop
+%_kde_share_dir/services/plasma-scriptengine-applet-dashboard.desktop
+%_kde_share_dir/services/plasma-scriptengine-applet-web.desktop
+%_kde_share_dir/services/plasma-scriptengine-qscriptrunner.desktop
+%_kde_share_dir/servicetypes/plasma-containment.desktop
+%_kde_share_dir/servicetypes/plasma-packagestructure.desktop
+%exclude /usr/share/wallpapers/default_blue.jpg
+%exclude /usr/share/wallpapers/default_blue.jpg.desktop
%changelog
+* Mon Jun 23 2008 dmueller@suse.de
+- update to 4.0.82
* Thu Jun 05 2008 wstephenson@suse.de
- minimal Solid NetworkManager 0.7 backend fixes network status is
always unknown (bnc#397072)
++++++ 4_0_BRANCH.diff -> 4_1_BRANCH.diff ++++++
++++ 2866 lines (skipped)
++++ between KDE/kdebase4-workspace/4_0_BRANCH.diff
++++ and kdebase4-workspace/4_1_BRANCH.diff
++++++ dotkde4.diff ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:01.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:01.000000000 +0200
@@ -1,22 +1,11 @@
---- startkde.cmake 2007/08/07 17:24:08 1.1
-+++ startkde.cmake 2007/08/07 17:24:13
-@@ -55,7 +55,7 @@
- # The user's personal KDE directory is usually ~/.kde, but this setting
- # may be overridden by setting KDEHOME.
+--- ./startkde.cmake 2008/06/10 15:04:30 1.1
++++ ./startkde.cmake 2008/06/10 15:05:29
+@@ -69,7 +69,7 @@
--kdehome=$HOME/.kde
-+kdehome=$HOME/.kde4
+ kdehome=`kde4-config --localprefix`
+ if test $? -ne 0; then
+- kdehome=$HOME/.kde
++ kdehome=$HOME/.kde4
+ fi
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
- # see kstartupconfig source for usage
---- kstartupconfig/kstartupconfig.cpp 2007/08/16 01:03:52 1.1
-+++ kstartupconfig/kstartupconfig.cpp 2007/08/16 01:04:15
-@@ -81,7 +81,7 @@
- else if( getenv( "HOME" ))
- {
- strlcpy( kdehome, getenv( "HOME" ), 1024 );
-- strlcat( kdehome, "/.kde", 1024 );
-+ strlcat( kdehome, "/.kde4", 1024 );
- }
- else
- return 1;
++++++ kde4-migrate.diff ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:01.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:01.000000000 +0200
@@ -1,6 +1,6 @@
--- startkde.cmake
+++ startkde.cmake
-@@ -48,12 +48,17 @@
+@@ -48,15 +48,20 @@
#
# * Then ksmserver is started which takes control of the rest of the startup sequence
@@ -8,7 +8,10 @@
+# The user's personal KDE directory is usually ~/.kde4, but this setting
# may be overridden by setting KDEHOME.
- kdehome=$HOME/.kde4
+ kdehome=`kde4-config --localprefix`
+ if test $? -ne 0; then
+ kdehome=$HOME/.kde4
+ fi
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+# first, migrate settings from kde3, if available
++++++ kdebase-workspace-4.0.4.tar.bz2 -> kdebase-workspace-4.0.82.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.0.4.tar.bz2 kdebase4-workspace/kdebase-workspace-4.0.82.tar.bz2 differ: byte 11, line 1
++++++ kdm-remove-duplicated-sessions.diff ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:02.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:02.000000000 +0200
@@ -1,17 +1,14 @@
-Index: kdm/kfrontend/sessions/CMakeLists.txt
-===================================================================
---- kdm/kfrontend/sessions/CMakeLists.txt (Revision 773999)
-+++ kdm/kfrontend/sessions/CMakeLists.txt (Arbeitskopie)
-@@ -1,8 +1,6 @@
- configure_file(kde.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kde.desktop)
+--- kdm/kfrontend/sessions/CMakeLists.txt 2008/06/10 15:12:58 1.1
++++ kdm/kfrontend/sessions/CMakeLists.txt 2008/06/10 15:19:05
+@@ -2,7 +2,6 @@
+ configure_file(kde-safe.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kde-safe.desktop)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/kde.desktop
-- gnome.desktop
+ ${CMAKE_CURRENT_BINARY_DIR}/kde-safe.desktop
+ gnome.desktop
9wm.desktop
- aewm++.desktop
- aewm.desktop
-@@ -10,18 +8,13 @@
+@@ -12,19 +11,14 @@
amaterus.desktop
amiwm.desktop
asclassic.desktop
@@ -19,7 +16,8 @@
cde.desktop
ctwm.desktop
cwwm.desktop
-- enlightenment.desktop
+ e16.desktop
+- enlightenment.desktop
evilwm.desktop
fluxbox.desktop
flwm.desktop
@@ -30,7 +28,7 @@
ion.desktop
larswm.desktop
lwm.desktop
-@@ -44,9 +37,6 @@
+@@ -47,9 +41,6 @@
w9wm.desktop
waimea.desktop
wm2.desktop
++++++ kdm-suspend-hal.diff ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:02.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:02.000000000 +0200
@@ -283,7 +283,7 @@
include_directories(
${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background
${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
- ${BLITZ_INCLUDES}
+ ${QIMAGEBLITZ_INCLUDES}
+ ${LAZY_INCLUDE_DIRS}
)
++++++ klipperrc.diff ++++++
--- /var/tmp/diff_new_pack.v22464/_old 2008-06-23 22:40:02.000000000 +0200
+++ /var/tmp/diff_new_pack.v22464/_new 2008-06-23 22:40:02.000000000 +0200
@@ -3,7 +3,7 @@
@@ -276,7 +276,7 @@
Enabled=true
- [Action_1/Command_1]
+ [Action_1/Command_2]
-Commandline=ps x |grep -q '[m]ozilla' && mozilla -remote openURL(%s, new-window) || mozilla %s
+Commandline=ps x |grep -q '[m]ozilla' && "mozilla -remote openURL(%s, new-window)" || mozilla %s
Icon=mozilla
@@ -12,7 +12,7 @@
@@ -423,7 +423,7 @@
Enabled=true
- [Action_1/Command_3]
+ [Action_1/Command_4]
-Commandline=ps x |grep -q '[f]irefox' && firefox -remote openURL(%s, new-window) || firefox %s
+Commandline=ps x |grep -q '[f]irefox' && "firefox -remote openURL(%s, new-window)" || firefox "%s"
Icon=firefox
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org