Hello community, here is the log from the commit of package kdebase3 checked in at Tue Feb 19 02:27:59 CET 2008. -------- --- KDE/kdebase3/kdebase3.changes 2008-02-09 06:21:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2008-02-18 13:42:41.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 18 13:42:36 CET 2008 - dmueller@suse.de + +- add missing split provides + +------------------------------------------------------------------- +Wed Feb 13 23:18:17 CET 2008 - dmueller@suse.de + +- update to 3.5.9 + * bugfixes, translation update + +------------------------------------------------------------------- Old: ---- kdebase-3.5.8.tar.bz2 New: ---- kdebase-3.5.9.tar.bz2 remove-beagle-stuff.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.ZR6742/_old 2008-02-19 02:27:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ZR6742/_new 2008-02-19 02:27:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase3 (Version 3.5.8) +# spec file for package kdebase3 (Version 3.5.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,6 +10,7 @@ # norootforbuild + Name: kdebase3 BuildRequires: OpenEXR-devel cups-devel db-devel doxygen fdupes graphviz hal-devel kdelibs3-devel krb5-devel libsmbclient-devel mDNSResponder-devel openldap2 openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel pcsc-lite-devel qt3-devel-doc samba-client utempter xorg-x11 %if %suse_version > 1010 @@ -59,9 +60,9 @@ Summary: The KDE Core Components BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ -Version: 3.5.8 -Release: 53 -%define kde_version 3.5.8 +Version: 3.5.9 +Release: 1 +%define kde_version 3.5.9 Requires: kdebase3-runtime == %{version} Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -167,9 +168,9 @@ Patch157: kcmsamba_log.diff Patch160: khelpcenter-localindices.patch Patch161: applet-lock-logout.diff -# svn diff $BASE/branches/KDE/3.5/kdebase/kicker@723316 $BASE/branches/work/suse_kickoff_qstyle/kicker +# svn diff $BASE/branches/KDE/3.5/kdebase/kicker@755866 $BASE/branches/work/suse_kickoff_qstyle/kicker | clean_patch Patch162: kickoff.diff -# svn diff $BASE/branches/KDE/3.5/kdebase/kcontrol/kicker@723316 $BASE/branches/work/suse_kickoff/kcontrol/kicker +# svn diff $BASE/branches/KDE/3.5/kdebase/kcontrol/kicker@755866 $BASE/branches/work/suse_kickoff_qstyle/kcontrol/kicker Patch158: kickoff-kcm.diff # svn diff -r 551296:HEAD khelpcenter Patch159: khelpcenter-beagle.diff @@ -215,6 +216,7 @@ Patch227: arts-start-on-demand.diff Patch228: media-teardown_crypto.diff Patch229: beagle-0.3.diff +Patch230: remove-beagle-stuff.diff %description This package contains kdebase, one of the basic packages of the K @@ -236,6 +238,7 @@ Group: System/GUI/KDE Provides: kio_fish Obsoletes: kio_fish +Provides: kdebase3:/opt/kde3/%_lib/libkonq.so.4 %description runtime This package contains runtime dependencies of KDE3 applications like @@ -427,7 +430,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 430 +Release: 437 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -621,6 +624,7 @@ %endif %if %suse_version > 1030 %patch229 +%patch230 %endif rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png @@ -1611,6 +1615,11 @@ /opt/kde3/%_lib/libkdecorations.* %changelog +* Mon Feb 18 2008 dmueller@suse.de +- add missing split provides +* Thu Feb 14 2008 dmueller@suse.de +- update to 3.5.9 + * bugfixes, translation update * Sat Feb 09 2008 stbinner@suse.de - fix position of kdebase3-runtime requirement * Fri Feb 08 2008 stbinner@suse.de ++++++ 3_5_BRANCH.diff ++++++ ++++ 4977 lines (skipped) ++++ between KDE/kdebase3/3_5_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/3_5_BRANCH.diff ++++++ fix-desktop-icons.diff ++++++ --- /var/tmp/diff_new_pack.ZR6742/_old 2008-02-19 02:27:31.000000000 +0100 +++ /var/tmp/diff_new_pack.ZR6742/_new 2008-02-19 02:27:31.000000000 +0100 @@ -1,5 +1,16 @@ ---- ./kcontrol/componentchooser/componentchooser.desktop 2007/03/09 15:10:09 1.1 -+++ ./kcontrol/componentchooser/componentchooser.desktop 2007/03/09 15:10:20 +--- kcontrol/colors/colors.desktop ++++ kcontrol/colors/colors.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Exec=kcmshell colors +-Icon=colorscm ++Icon=kcmcolors + Type=Application + DocPath=kcontrol/colors/index.html + +--- kcontrol/componentchooser/componentchooser.desktop ++++ kcontrol/componentchooser/componentchooser.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 @@ -9,50 +20,71 @@ Type=Application ---- ./kcontrol/performance/kcmperformance.desktop 2007/03/09 15:10:41 1.1 -+++ ./kcontrol/performance/kcmperformance.desktop 2007/03/09 15:10:50 +--- kcontrol/crypto/crypto.desktop ++++ kcontrol/crypto/crypto.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 --Icon=launch -+Icon=kcmperformance +-Icon=encrypted ++Icon=kcmcrypto Type=Application - Exec=kcmshell kcmperformance - ---- ./kcontrol/kded/kcmkded.desktop 2007/03/09 15:11:12 1.1 -+++ ./kcontrol/kded/kcmkded.desktop 2007/03/09 15:11:22 + Exec=kcmshell crypto + DocPath=kcontrol/crypto/index.html +--- kcontrol/dnssd/kcm_kdnssd.desktop ++++ kcontrol/dnssd/kcm_kdnssd.desktop +@@ -69,7 +69,7 @@ + Exec=kcmshell kcm_kdnssd + GenericName= + GenericName[ko]=일반 +-Icon=blockdevice ++Icon=kcmkdnssd + MimeType= + Name=Service Discovery + Name[af]=Dienste ontdekker +--- kcontrol/input/mouse.desktop ++++ kcontrol/input/mouse.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 - Exec=kcmshell kcmkded --Icon=services -+Icon=kcmkded + Exec=kcmshell mouse +-Icon=mouse ++Icon=kcmmouse Type=Application + DocPath=kcontrol/mouse/index.html - ---- ./kcontrol/smserver/kcmsmserver.desktop 2007/03/09 15:11:41 1.1 -+++ ./kcontrol/smserver/kcmsmserver.desktop 2007/03/09 15:11:54 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 --Icon=exit -+Icon=kcmsmserver - Type=Application - DocPath=kcontrol/kcmsmserver/index.html - Exec=kcmshell kcmsmserver ---- ./kcontrol/spellchecking/spellchecking.desktop 2007/03/09 15:12:12 1.1 -+++ ./kcontrol/spellchecking/spellchecking.desktop 2007/03/09 15:12:27 +--- kcontrol/joystick/joystick.desktop ++++ kcontrol/joystick/joystick.desktop +@@ -170,5 +170,5 @@ + X-KDE-FactoryName=kcm_joystick + X-KDE-Library=joystick + X-KDE-Test-Module=true +-Icon=joystick ++Icon=kcmjoystick + Categories=Qt;KDE;X-KDE-settings-hardware; +--- kcontrol/kded/kcmkded.desktop ++++ kcontrol/kded/kcmkded.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 - Exec=kcmshell spellchecking --Icon=spellcheck -+Icon=kcmspellchecking + Exec=kcmshell kcmkded +-Icon=services ++Icon=kcmkded Type=Application - DocPath=kcontrol/spellchecking/index.html ---- ./kcontrol/konq/desktopbehavior.desktop 2007/03/09 15:12:49 1.1 -+++ ./kcontrol/konq/desktopbehavior.desktop 2007/03/09 15:12:58 + +--- kcontrol/kio/netpref.desktop ++++ kcontrol/kio/netpref.desktop +@@ -75,7 +75,7 @@ + Comment[zh_TW]=設定一般網路喜好設定,例如逾時值 + Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma + Exec=kcmshell netpref +-Icon=network ++Icon=kcmnetpref + Keywords=timeout,iopref,netpref,network preferences,ftp + Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp + Keywords[bg]=просрочка, време, времето, пауза, прекъсване, връзка, timeout, iopref, netpref, network preferences, ftp +--- kcontrol/konq/desktopbehavior.desktop ++++ kcontrol/konq/desktopbehavior.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application @@ -62,8 +94,8 @@ Exec=kcmshell desktopbehavior ---- ./kcontrol/konq/desktop.desktop 2007/03/09 15:13:12 1.1 -+++ ./kcontrol/konq/desktop.desktop 2007/03/09 15:13:20 +--- kcontrol/konq/desktop.desktop ++++ kcontrol/konq/desktop.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application @@ -73,29 +105,19 @@ Exec=kcmshell desktop ---- ./kcontrol/taskbar/kcmtaskbar.desktop 2007/03/09 15:13:38 1.1 -+++ ./kcontrol/taskbar/kcmtaskbar.desktop 2007/03/09 15:13:47 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 --Icon=kmenu -+Icon=kcmtaskbar - Type=Application - DocPath=kcontrol/kcmtaskbar/index.html - Exec=kcmshell kcmtaskbar ---- ./kcontrol/colors/colors.desktop 2007/03/09 15:14:05 1.1 -+++ ./kcontrol/colors/colors.desktop 2007/03/09 15:14:15 -@@ -1,7 +1,7 @@ - [Desktop Entry] +--- kcontrol/konqhtml/khtml_filter.desktop ++++ kcontrol/konqhtml/khtml_filter.desktop +@@ -2,7 +2,7 @@ Encoding=UTF-8 - Exec=kcmshell colors --Icon=colorscm -+Icon=kcmcolors Type=Application - DocPath=kcontrol/colors/index.html + DocPath=kcontrol/khtml/index.html#khtml-adblock +-Icon=filter ++Icon=kcmkhtml_filter + Exec=kcmshell khtml_filter ---- ./kcontrol/launch/kcmlaunch.desktop 2007/03/09 15:14:37 1.1 -+++ ./kcontrol/launch/kcmlaunch.desktop 2007/03/09 15:14:45 + X-KDE-Library=konqhtml +--- kcontrol/launch/kcmlaunch.desktop ++++ kcontrol/launch/kcmlaunch.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 @@ -104,80 +126,78 @@ Type=Application DocPath=kcontrol/kcmlaunch/index.html Exec=kcmshell kcmlaunch ---- ./kcontrol/konqhtml/khtml_filter.desktop 2007/03/09 15:15:12 1.1 -+++ ./kcontrol/konqhtml/khtml_filter.desktop 2007/03/09 15:15:24 -@@ -2,7 +2,7 @@ +--- kcontrol/nics/nic.desktop ++++ kcontrol/nics/nic.desktop +@@ -3,7 +3,7 @@ + Exec=kcmshell nic + Type=Application + DocPath=kinfocenter/nics/index.html +-Icon=network ++Icon=kcmnic + + + X-KDE-Library=nic +--- kcontrol/performance/kcmperformance.desktop ++++ kcontrol/performance/kcmperformance.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] Encoding=UTF-8 +-Icon=launch ++Icon=kcmperformance Type=Application - DocPath=kcontrol/khtml/index.html#khtml-adblock --Icon=filter -+Icon=kcmkhtml_filter - Exec=kcmshell khtml_filter + Exec=kcmshell kcmperformance - X-KDE-Library=konqhtml ---- ./kioslave/cgi/kcmcgi/kcmcgi.desktop 2007/03/09 15:15:42 1.1 -+++ ./kioslave/cgi/kcmcgi/kcmcgi.desktop 2007/03/09 15:15:50 +--- kcontrol/privacy/privacy.desktop ++++ kcontrol/privacy/privacy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] --Icon=run -+Icon=kcmcgi - Type=Application - Exec=kcmshell kcmcgi - DocPath= ---- ./konqueror/sidebar/trees/history_module/kcmhistory.desktop 2007/03/09 15:16:05 1.1 -+++ ./konqueror/sidebar/trees/history_module/kcmhistory.desktop 2007/03/09 15:16:12 +-Icon=trashcan_empty ++Icon=kcmprivacy + Encoding=UTF-8 + Comment=Privacy - a kcontrol module to clean unwanted traces the user leaves on the system + Comment[af]=Privaatheid - 'n Beheer module wat voetspore wat deur gebruikers op die stelsel gelaat word skoon maak +--- kcontrol/smserver/kcmsmserver.desktop ++++ kcontrol/smserver/kcmsmserver.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 --Icon=history -+Icon=kcmhistory +-Icon=exit ++Icon=kcmsmserver Type=Application - Exec=kcmshell kcmhistory - ---- ./kcontrol/kio/netpref.desktop 2007/03/09 15:16:28 1.1 -+++ ./kcontrol/kio/netpref.desktop 2007/03/09 15:16:37 -@@ -70,7 +70,7 @@ - Comment[zh_TW]=設定一般網路喜好設定,例如逾時值 - Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma - Exec=kcmshell netpref --Icon=network -+Icon=kcmnetpref - Keywords=timeout,iopref,netpref,network preferences,ftp - Keywords[bg]=просрочка, време, времето, пауза, прекъсване, връзка, timeout, iopref, netpref, network preferences, ftp - Keywords[bs]=timeout,iopref,netpref,network preferences,ftp,mreža ---- ./kcontrol/dnssd/kcm_kdnssd.desktop 2007/03/09 15:16:55 1.1 -+++ ./kcontrol/dnssd/kcm_kdnssd.desktop 2007/03/09 15:17:07 -@@ -61,7 +61,7 @@ - Encoding=UTF-8 - Exec=kcmshell kcm_kdnssd - GenericName= --Icon=blockdevice -+Icon=kcmkdnssd - MimeType= - Name=Service Discovery - Name[af]=Dienste ontdekker ---- ./kcontrol/joystick/joystick.desktop 2007/03/09 15:17:26 1.1 -+++ ./kcontrol/joystick/joystick.desktop 2007/03/09 15:17:36 -@@ -153,5 +153,5 @@ - X-KDE-FactoryName=kcm_joystick - X-KDE-Library=joystick - X-KDE-Test-Module=true --Icon=joystick -+Icon=kcmjoystick - Categories=Qt;KDE;X-KDE-settings-hardware; ---- ./kcontrol/input/mouse.desktop 2007/03/09 15:17:56 1.1 -+++ ./kcontrol/input/mouse.desktop 2007/03/09 15:18:02 + DocPath=kcontrol/kcmsmserver/index.html + Exec=kcmshell kcmsmserver +--- kcontrol/spellchecking/spellchecking.desktop ++++ kcontrol/spellchecking/spellchecking.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 - Exec=kcmshell mouse --Icon=mouse -+Icon=kcmmouse + Exec=kcmshell spellchecking +-Icon=spellcheck ++Icon=kcmspellchecking Type=Application - DocPath=kcontrol/mouse/index.html + DocPath=kcontrol/spellchecking/index.html ---- ./kioslave/media/kcmodule/media.desktop 2007/03/09 15:18:28 1.1 -+++ ./kioslave/media/kcmodule/media.desktop 2007/03/09 15:18:36 +--- kcontrol/taskbar/kcmtaskbar.desktop ++++ kcontrol/taskbar/kcmtaskbar.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Icon=kmenu ++Icon=kcmtaskbar + Type=Application + DocPath=kcontrol/kcmtaskbar/index.html + Exec=kcmshell kcmtaskbar +--- kioslave/cgi/kcmcgi/kcmcgi.desktop ++++ kioslave/cgi/kcmcgi/kcmcgi.desktop +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Icon=run ++Icon=kcmcgi + Type=Application + Exec=kcmshell kcmcgi + DocPath= +--- kioslave/media/kcmodule/media.desktop ++++ kioslave/media/kcmodule/media.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application @@ -187,33 +207,13 @@ Exec=kcmshell media ---- ./kcontrol/crypto/crypto.desktop 2007/03/09 15:18:56 1.1 -+++ ./kcontrol/crypto/crypto.desktop 2007/03/09 15:19:04 +--- konqueror/sidebar/trees/history_module/kcmhistory.desktop ++++ konqueror/sidebar/trees/history_module/kcmhistory.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 --Icon=encrypted -+Icon=kcmcrypto - Type=Application - Exec=kcmshell crypto - DocPath=kcontrol/crypto/index.html ---- ./kcontrol/privacy/privacy.desktop 2007/03/09 15:19:22 1.1 -+++ ./kcontrol/privacy/privacy.desktop 2007/03/09 15:19:38 -@@ -1,5 +1,5 @@ - [Desktop Entry] --Icon=trashcan_empty -+Icon=kcmprivacy - Encoding=UTF-8 - Comment=Privacy - a kcontrol module to clean unwanted traces the user leaves on the system - Comment[af]=Privaatheid - 'n Beheer module wat voetspore wat deur gebruikers op die stelsel gelaat word skoon maak ---- ./kcontrol/nics/nic.desktop 2007/03/09 15:19:58 1.1 -+++ ./kcontrol/nics/nic.desktop 2007/03/09 15:20:10 -@@ -3,7 +3,7 @@ - Exec=kcmshell nic +-Icon=history ++Icon=kcmhistory Type=Application - DocPath=kinfocenter/nics/index.html --Icon=network -+Icon=kcmnic - + Exec=kcmshell kcmhistory - X-KDE-Library=nic ++++++ kdebase-3.5.8.tar.bz2 -> kdebase-3.5.9.tar.bz2 ++++++ KDE/kdebase3/kdebase-3.5.8.tar.bz2 /mounts/work_src_done/STABLE/kdebase3/kdebase-3.5.9.tar.bz2 differ: byte 11, line 1 ++++++ kickoff.diff ++++++ ++++ 1657 lines (skipped) ++++ between KDE/kdebase3/kickoff.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/kickoff.diff ++++++ kickoff-kcm.diff ++++++ ++++ 1149 lines (skipped) ++++ between KDE/kdebase3/kickoff-kcm.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/kickoff-kcm.diff ++++++ remove-beagle-stuff.diff ++++++ a "make it compile " patch from Stephan Binner --- kicker/kicker/plugins/beaglesearch.cpp +++ kicker/kicker/plugins/beaglesearch.cpp @@ -291,11 +291,11 @@ beagle_query_set_max_hits (beagle_query, max_hits_per_source); // this is per source! kdDebug () << "Creating query from \"" << query_str << "\"" << endl; - for ( QStringList::Iterator it = sources_menu.begin(); it != sources_menu.end(); ++it ) + /* for ( QStringList::Iterator it = sources_menu.begin(); it != sources_menu.end(); ++it ) beagle_query_add_source (beagle_query, g_strdup ((*it).utf8 ())); for ( QStringList::Iterator it = types_menu.begin(); it != types_menu.end(); ++it ) - beagle_query_add_hit_type (beagle_query, g_strdup ((*it).utf8 ())); + beagle_query_add_hit_type (beagle_query, g_strdup ((*it).utf8 ()));*/ QStringList query_terms; QString start_date, end_date; @@ -307,13 +307,13 @@ else if (key_value_pair.count () == 2) { QString key = key_value_pair [0].lower (); QString value = key_value_pair [1]; - if (key == "mime") + if /*(key == "mime") beagle_query_add_mime_type (beagle_query, g_strdup (value.utf8 ())); else if (key == "type") beagle_query_add_hit_type (beagle_query, g_strdup (value.utf8 ())); else if (key == "source") beagle_query_add_source (beagle_query, g_strdup (value.utf8 ())); - else if (key == "start") + else if */ (key == "start") start_date = value; else if (key == "end") end_date = value; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org