Hello community, here is the log from the commit of package kdebase3 checked in at Tue Oct 31 15:37:09 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-10-31 12:49:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-31 14:55:35.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 31 14:55:21 CET 2006 - dmueller@suse.de + +- fix kdesu prompt again (#216563) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.Bdnzrg/_old 2006-10-31 15:34:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Bdnzrg/_new 2006-10-31 15:34:30.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 29 +Release: 30 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -368,7 +368,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 158 +Release: 159 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1475,6 +1475,8 @@ %endif %changelog -n kdebase3 +* Tue Oct 31 2006 - dmueller@suse.de +- fix kdesu prompt again (#216563) * Tue Oct 31 2006 - coolo@suse.de - update 3.5 branch and kickoff diff to fix restart (#216092) * Mon Oct 30 2006 - coolo@suse.de ++++++ less_verbal_kdesu.patch ++++++ --- /var/tmp/diff_new_pack.Bdnzrg/_old 2006-10-31 15:34:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Bdnzrg/_new 2006-10-31 15:34:31.000000000 +0100 @@ -1,18 +1,24 @@ --- kdesu/kdesu/sudlg.cpp +++ kdesu/kdesu/sudlg.cpp -@@ -35,13 +35,9 @@ - prompt = i18n("Please enter your password." ); +@@ -29,18 +29,10 @@ + setCaption(i18n("Run as %1").arg(user)); + + QString prompt; +- if (superUserCommand == "sudo" && m_User == "root") { +- prompt = i18n("Please enter your password." ); ++ if (m_User == "root") { ++ prompt = i18n("Please enter the Administrator (root) password to continue."); } else { - if (m_User == "root") { +- if (m_User == "root") { - prompt = i18n("The action you requested needs root 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 { +- } 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); + ++++++ suspend-unmount.diff ++++++ --- /var/tmp/diff_new_pack.Bdnzrg/_old 2006-10-31 15:34:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Bdnzrg/_new 2006-10-31 15:34:32.000000000 +0100 @@ -1,13 +1,15 @@ ---- kioslave/media/mediamanager/mediamanager.cpp +Index: kioslave/media/mediamanager/mediamanager.cpp +=================================================================== +--- kioslave/media/mediamanager/mediamanager.cpp.orig +++ kioslave/media/mediamanager/mediamanager.cpp -@@ -326,7 +326,29 @@ +@@ -326,6 +326,28 @@ void MediaManager::slotMediumChanged(con emit mediumChanged(name); } +QString MediaManager::unmountAllManual() +{ + QPtrList<Medium> list = m_mediaList.list(); - ++ + QPtrList<Medium>::const_iterator it = list.begin(); + QPtrList<Medium>::const_iterator end = list.end(); + @@ -26,13 +28,14 @@ + // return last error + return result; +} -+ + extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj) - { ---- kioslave/media/mediamanager/mediamanager.h +Index: kioslave/media/mediamanager/mediamanager.h +=================================================================== +--- kioslave/media/mediamanager/mediamanager.h.orig +++ kioslave/media/mediamanager/mediamanager.h -@@ -57,6 +57,8 @@ +@@ -57,6 +57,8 @@ k_dcop: bool removablePlug(const QString &devNode, const QString &label); bool removableUnplug(const QString &devNode); bool removableCamera(const QString &devNode); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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@suse.de