Hello community, here is the log from the commit of package kdebase3 checked in at Wed Aug 23 20:53:08 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-08-17 14:32:03.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-08-23 11:01:53.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 23 11:01:33 CEST 2006 - stbinner@suse.de + +- update 3_5_BRANCH.diff (mostly Konqueror, Kicker and Kwin fixes) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.WeswHd/_old 2006-08-23 20:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.WeswHd/_new 2006-08-23 20:52:45.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.4 -Release: 3 +Release: 5 %define kde_version 3.5.4 Source0: kdebase-%{kde_version}.tar.bz2 Source1: SuSEconfig.kdm3 @@ -311,7 +311,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 104 +Release: 106 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -328,7 +328,7 @@ %define sysconfdir /etc %prep %setup -q -b 8 -b 13 -b 14 -n kdebase-%{kde_version} -#%patch0 +%patch0 %patch1 %patch3 %patch5 @@ -582,8 +582,10 @@ FILLUP_DIR=$RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $FILLUP_DIR install %SOURCE4 $FILLUP_DIR/sysconfig.windowmanager-kdebase3 +%if %suse_version > 1010 mkdir -p $RPM_BUILD_ROOT/sbin/conf.d install %SOURCE1 $RPM_BUILD_ROOT/sbin/conf.d +%endif # # solve file conflicts with theme packages ... # @@ -1311,7 +1313,9 @@ %config(noreplace) /opt/kde3/share/config/kdm %ghost /var/run/xdmctl /usr/sbin/rckdm +%if %suse_version > 1010 /sbin/conf.d/SuSEconfig.kdm3 +%endif %dir /etc/opt/kde3/share %dir /etc/opt/kde3/share/config %dir /etc/opt/kde3/share/config/kdm @@ -1377,6 +1381,8 @@ %endif %changelog -n kdebase3 +* Wed Aug 23 2006 - stbinner@suse.de +- update 3_5_BRANCH.diff (mostly Konqueror, Kicker and Kwin fixes) * Thu Aug 17 2006 - dmueller@suse.de - add SuSEconfig.kdm3 script from the theme flavour package (#181572) ++++++ 3_5_BRANCH.diff ++++++ ++++ 27058 lines (skipped) ++++ between KDE/kdebase3/3_5_BRANCH.diff ++++ and kdebase3/3_5_BRANCH.diff ++++++ less_verbal_kdesu.patch ++++++ --- /var/tmp/diff_new_pack.WeswHd/_old 2006-08-23 20:52:47.000000000 +0200 +++ /var/tmp/diff_new_pack.WeswHd/_new 2006-08-23 20:52:47.000000000 +0200 @@ -1,25 +1,18 @@ ---- kdesu/kdesu/sudlg.cpp 2006/04/20 08:36:56 1.1 -+++ kdesu/kdesu/sudlg.cpp 2006/04/20 08:39:10 -@@ -20,20 +20,9 @@ - - QString prompt; - if (m_User == "root") -- { -- if ( withIgnoreButton ) -- prompt = i18n("The action you requested needs root privileges. " -- "Please enter root's password below or click " -- "Ignore to continue with your current privileges."); -- else +--- kdesu/kdesu/sudlg.cpp 2006/08/23 09:05:46 1.3 ++++ kdesu/kdesu/sudlg.cpp 2006/08/23 09:31:34 +@@ -35,13 +35,9 @@ + prompt = i18n("Please enter your password." ); + } else { + if (m_User == "root") { - prompt = i18n("The action you requested needs root privileges. " -- "Please enter root's password below "); -- } -- -+ prompt = i18n("Please enter the Administrator (root) password to continue."); - else -- prompt = i18n("The action you requested needs additional privileges. " +- "Please enter root's password below or click " +- "Ignore to continue with your current privileges."); ++ prompt = i18n("Please enter the Administrator (root) password to continue."); + } else { +- prompt = i18n("The action you requested needs additional privileges. " - "Please enter the password for \"%1\" below or click " - "Ignore to continue with your current privileges.").arg(m_User); -+ prompt = i18n("Please enter password for \"%1\" to continue.").arg(m_User); ++ prompt = i18n("Please enter password for \"%1\" to continue.").arg(m_User); + } + } setPrompt(prompt); - - if( withIgnoreButton ) ++++++ use-full-hinting-by-default.diff ++++++ --- /var/tmp/diff_new_pack.WeswHd/_old 2006-08-23 20:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.WeswHd/_new 2006-08-23 20:52:48.000000000 +0200 @@ -11,15 +11,6 @@ xft.setHintStyle(hStyle); xft.apply(); // Save this setting kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle)); -@@ -391,7 +391,7 @@ - excludeTo->setValue(15.0); - useSubPixel->setChecked(false); - #ifdef HAVE_FONTCONFIG -- hintingStyle->setCurrentItem(getIndex(KXftConfig::Hint::Medium)); -+ hintingStyle->setCurrentItem(getIndex(KXftConfig::Hint::Full)); - #endif - enableWidgets(); - } @@ -447,7 +447,7 @@ if(hintingStyle->currentText()==i18n(KXftConfig::description((KXftConfig::Hint::Style)s).utf8())) return (KXftConfig::Hint::Style)s; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org