Hello community,
here is the log from the commit of package kdebase3
checked in at Wed Jun 14 13:16:36 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-06-06 22:04:22.000000000 +0200
+++ kdebase3/kdebase3.changes 2006-06-12 17:29:06.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 12 15:19:14 CEST 2006 - stbinner@suse.de
+
+- update 3_5_BRANCH.diff to fix build (OpenEXR configure check)
+- obey chosen k menu item format when collapsing menus (#183244)
+
+-------------------------------------------------------------------
Old:
----
media_hal.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.OmrZjM/_old 2006-06-14 13:14:46.000000000 +0200
+++ /var/tmp/diff_new_pack.OmrZjM/_new 2006-06-14 13:14:46.000000000 +0200
@@ -37,7 +37,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.3
-Release: 6
+Release: 7
%define kde_version 3.5.3
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -75,7 +75,7 @@
Patch17: nsplugin-Preference.diff
Patch20: ksplashml.patch
# svn diff $BASE/branches/KDE/3.5/kdebase/kioslave/media@501904 $BASE/branches/work/coolos_media
-Patch21: media_hal.diff
+#Patch21: media_hal.diff
Patch22: libkonq-kdemm.diff
Patch39: kdesktop_icons.diff
Patch40: suse_default_move.diff
@@ -307,7 +307,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 95
+Release: 96
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -343,9 +343,9 @@
%patch17
%patch20
%if %suse_version > 1000
-cd kioslave/media
-%patch21
-cd ../..
+#cd kioslave/media
+#%patch21
+#cd ../..
%patch85
%endif
%patch39
@@ -1350,6 +1350,9 @@
%endif
%changelog -n kdebase3
+* Mon Jun 12 2006 - stbinner@suse.de
+- update 3_5_BRANCH.diff to fix build (OpenEXR configure check)
+- obey chosen k menu item format when collapsing menus (#183244)
* Tue Jun 06 2006 - stbinner@suse.de
- add 3_5_BRANCH.diff to fix screensaver not starting (#181122)
* Tue May 30 2006 - stbinner@suse.de
++++++ 3_5_BRANCH.diff ++++++
++++ 8624 lines (skipped)
++++ between KDE/kdebase3/3_5_BRANCH.diff
++++ and kdebase3/3_5_BRANCH.diff
++++++ short-menus.diff ++++++
--- /var/tmp/diff_new_pack.OmrZjM/_old 2006-06-14 13:14:51.000000000 +0200
+++ /var/tmp/diff_new_pack.OmrZjM/_new 2006-06-14 13:14:51.000000000 +0200
@@ -23,8 +23,8 @@
<entry name="MenuEntryHeight" type="Int" >
<label>Height of menu entries in pixels</label>
<default>0</default>
---- kicker/kicker/ui/service_mnu.cpp.sav 2006-02-10 14:55:12.000000000 +0100
-+++ kicker/kicker/ui/service_mnu.cpp 2006-02-10 15:07:24.000000000 +0100
+--- kicker/kicker/ui/service_mnu.cpp 2006/06/12 15:02:30 1.1
++++ kicker/kicker/ui/service_mnu.cpp 2006/06/12 15:04:53
@@ -111,6 +111,11 @@
QStringList suppressGenericNames = _root->suppressGenericNames();
@@ -37,7 +37,7 @@
bool separatorNeeded = false;
for (; it != _list.end(); ++it)
{
-@@ -118,19 +123,99 @@
+@@ -118,19 +123,108 @@
if (e->isType(KST_KServiceGroup))
{
@@ -64,9 +64,18 @@
+ key = s->genericName();
+ }
+ }
-+ else
++ else {
+ // we use the normal menu description
-+ key = g->caption();
++ key = s->name();
++ if( !s->genericName().isEmpty()) {
++ if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription)
++ key = s->name() + " (" + g->caption() + ")";
++ else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName)
++ key = g->caption() + " (" + s->name() + ")";
++ else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly)
++ key = g->caption();
++ }
++ }
+ specialTitle.insert( _e->name(), key );
+ categoryIcon.insert( _e->name(), g->icon() );
+ slist.insert( key.local8Bit(), _e );
@@ -142,7 +151,7 @@
QString inlineHeaderName = g->showInlineHeader() ? groupCaption : "";
// Item names may contain ampersands. To avoid them being converted
// to accelerators, replace them with two ampersands.
-@@ -214,7 +299,7 @@
+@@ -214,7 +308,7 @@
}
KService::Ptr s(static_cast