Hello community, here is the log from the commit of package kdeadmin4 checked in at Fri Sep 14 16:13:49 CEST 2007. -------- --- KDE/kdeadmin4/kdeadmin4.changes 2007-09-01 19:16:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2007-09-13 14:48:44.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 13 14:48:40 CEST 2007 - stbinner@suse.de + +- update to 3.93.0.svn712059 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeadmin4.spec ++++++ --- /var/tmp/diff_new_pack.m11710/_old 2007-09-14 16:13:40.000000000 +0200 +++ /var/tmp/diff_new_pack.m11710/_new 2007-09-14 16:13:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeadmin4 (Version 3.93.0) +# spec file for package kdeadmin4 (Version 3.93.0.svn712059) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,10 +14,11 @@ License: GPL v2 or later Group: System/GUI/KDE Summary: kdeadmin base package -URL: http://www.kde.org -Version: 3.93.0 +Url: http://www.kde.org +Version: 3.93.0.svn712059 Release: 1 -Source0: kdeadmin-%version.tar.bz2 +%define rversion 3.93.0 +Source0: kdeadmin-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime @@ -38,7 +39,7 @@ The KDE Team <kde@kde.org> %prep -%setup -q -n kdeadmin-%version +%setup -q -n kdeadmin-%rversion %build %cmake_kde4 -d build @@ -58,6 +59,7 @@ %clean rm -rf $RPM_BUILD_ROOT + %package -n kde4-kcron Group: System/GUI/KDE Summary: Cron job configuration tool @@ -72,7 +74,6 @@ -------- The KDE Team <kde@kde.org> - %post -n kde4-kcron %run_ldconfig @@ -84,10 +85,10 @@ %doc COPYING COPYING-DOCS README /usr/bin/kcron /usr/share/applications/kde4/kcron.desktop - %_kde_share_dir/apps/kcron %doc %lang(en) /usr/share/doc/kde/HTML/en/kcron /usr/share/icons/hicolor/*/apps/kcron.* + %package -n kde4-kpackage Group: System/Packages Summary: RPM Handling Tool @@ -102,7 +103,6 @@ -------- The KDE Team <kde@kde.org> - %post -n kde4-kpackage %run_ldconfig @@ -114,10 +114,10 @@ %doc COPYING COPYING-DOCS README /usr/bin/kpackage /usr/share/applications/kde4/kpackage.desktop - %_kde_share_dir/apps/kpackage %doc %lang(en) /usr/share/doc/kde/HTML/en/kpackage /usr/share/icons/hicolor/*/apps/kpackage.* + %package -n kde4-kuser Group: System/GUI/KDE Summary: User Account Manager @@ -133,7 +133,6 @@ -------- The KDE Team <kde@kde.org> - %post -n kde4-kuser %run_ldconfig @@ -145,12 +144,11 @@ %doc COPYING COPYING-DOCS README /usr/bin/kuser /usr/share/applications/kde4/kuser.desktop - %_kde_share_dir/apps/kuser - %_kde_share_dir/config.kcfg/kuser.kcfg %doc %lang(en) /usr/share/doc/kde/HTML/en/kuser /usr/share/icons/hicolor/*/apps/kuser.* + %package -n kde4-secpolicy Group: System/GUI/KDE Summary: PAM Setup Viewer @@ -165,7 +163,6 @@ -------- The KDE Team <kde@kde.org> - %post -n kde4-secpolicy %run_ldconfig @@ -176,6 +173,7 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/bin/secpolicy + %package -n kde4-knetworkconf Group: System/GUI/KDE Summary: KDE Network Configuration Module @@ -191,7 +189,6 @@ -------- The KDE Team <kde@kde.org> - %post -n kde4-knetworkconf %run_ldconfig @@ -202,7 +199,6 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/%_lib/kde4/kcm_knetworkconfmodule.so - %_kde_share_dir/apps/knetworkconf %doc %lang(en) /usr/share/doc/kde/HTML/en/knetworkconf /usr/share/icons/hicolor/*/apps/knetworkconf.* @@ -210,7 +206,6 @@ /usr/share/icons/hicolor/*/actions/network_disconnected_lan.* /usr/share/icons/hicolor/*/actions/network_disconnected_wlan.* /usr/share/icons/hicolor/*/actions/network_traffic_wlan.* - %_kde_share_dir/services/kcm_knetworkconfmodule.desktop /usr/%_lib/pkgconfig/system-tools-backends.pc @@ -219,6 +214,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Thu Sep 13 2007 - stbinner@suse.de +- update to 3.93.0.svn712059 * Sat Sep 01 2007 - stbinner@suse.de - update to KDE 4.0 Beta 2 * Thu Aug 23 2007 - stbinner@suse.de ++++++ kdeadmin-3.93.0.tar.bz2 ++++++ Files old/kdeadmin-3.93.0/doc/kcron/index.cache.bz2 and new/kdeadmin-3.93.0/doc/kcron/index.cache.bz2 differ Files old/kdeadmin-3.93.0/doc/kdat/index.cache.bz2 and new/kdeadmin-3.93.0/doc/kdat/index.cache.bz2 differ Files old/kdeadmin-3.93.0/doc/knetworkconf/index.cache.bz2 and new/kdeadmin-3.93.0/doc/knetworkconf/index.cache.bz2 differ Files old/kdeadmin-3.93.0/doc/kpackage/index.cache.bz2 and new/kdeadmin-3.93.0/doc/kpackage/index.cache.bz2 differ Files old/kdeadmin-3.93.0/doc/ksysv/index.cache.bz2 and new/kdeadmin-3.93.0/doc/ksysv/index.cache.bz2 differ Files old/kdeadmin-3.93.0/doc/kuser/index.cache.bz2 and new/kdeadmin-3.93.0/doc/kuser/index.cache.bz2 differ Files old/kdeadmin-3.93.0/doc/lilo-config/index.cache.bz2 and new/kdeadmin-3.93.0/doc/lilo-config/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/kcron.desktop new/kdeadmin-3.93.0/kcron/kcron.desktop --- old/kdeadmin-3.93.0/kcron/kcron.desktop 2007-08-29 11:56:12.000000000 +0200 +++ new/kdeadmin-3.93.0/kcron/kcron.desktop 2007-09-06 17:47:04.000000000 +0200 @@ -3,7 +3,7 @@ Type=Application Exec=kcron %i -caption "%c" Icon=kcron -DocPath=kcron/index.html +X-DocPath=kcron/index.html Name=KCron Name[af]= kcron Name[eo]=Taskoplanilo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kcron/ktvariable.cpp new/kdeadmin-3.93.0/kcron/ktvariable.cpp --- old/kdeadmin-3.93.0/kcron/ktvariable.cpp 2007-08-29 11:56:12.000000000 +0200 +++ new/kdeadmin-3.93.0/kcron/ktvariable.cpp 2007-08-31 20:59:31.000000000 +0200 @@ -49,15 +49,24 @@ titleWidget = new KTitleWidget(page); layout->addWidget(titleWidget, 0, 0, 1, 2); + // comment + labComment = new QLabel(i18n("Co&mment:"), page); + labComment->setObjectName("labComment"); + layout->addWidget(labComment, 1, 0, Qt::AlignLeft | Qt::AlignTop); + + teComment = new KLineEdit(page); + layout->addWidget(teComment, 1, 1, 1, 1); + labComment->setBuddy(teComment); + // variable labVariable = new QLabel(i18nc("The environmental variable name ie HOME, MAILTO etc", "&Variable:"), page ); labVariable->setObjectName("labVariable"); - layout->addWidget(labVariable, 1, 0, Qt::AlignLeft | Qt::AlignTop); + layout->addWidget(labVariable, 2, 0, Qt::AlignLeft | Qt::AlignTop); cmbVariable = new KComboBox(page); cmbVariable->setEditable(true); cmbVariable->setObjectName("cmbVariable"); - layout->addWidget(cmbVariable, 1, 1, 1, 1); + layout->addWidget(cmbVariable, 2, 1, 1, 1); cmbVariable->addItem("HOME"); cmbVariable->addItem("MAILTO"); @@ -69,23 +78,14 @@ // value labValue = new QLabel(i18n("Va&lue:"), page); labValue->setObjectName("labValue"); - layout->addWidget(labValue, 2, 0, Qt::AlignLeft | Qt::AlignTop); + layout->addWidget(labValue, 3, 0, Qt::AlignLeft | Qt::AlignTop); leValue = new KLineEdit(page); leValue->setObjectName("leValue"); - layout->addWidget(leValue, 2, 1, 1, 1); + layout->addWidget(leValue, 3, 1, 1, 1); leValue->setMaxLength(255); labValue->setBuddy(leValue); - // comment - labComment = new QLabel(i18n("Co&mment:"), page); - labComment->setObjectName("labComment"); - layout->addWidget(labComment, 3, 0, Qt::AlignLeft | Qt::AlignTop); - - teComment = new KLineEdit(page); - layout->addWidget(teComment, 3, 1, 1, 1); - labComment->setBuddy(teComment); - // enabled chkEnabled = new QCheckBox(i18n("&Enabled"), page); chkEnabled->setObjectName("chkEnabled"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kdat/kdat.desktop new/kdeadmin-3.93.0/kdat/kdat.desktop --- old/kdeadmin-3.93.0/kdat/kdat.desktop 2007-08-29 11:56:07.000000000 +0200 +++ new/kdeadmin-3.93.0/kdat/kdat.desktop 2007-09-06 17:47:04.000000000 +0200 @@ -72,7 +72,7 @@ Icon=kdat Type=Application X-KDE-StartupNotify=true -DocPath=kdat/index.html +X-DocPath=kdat/index.html Terminal=false X-DBUS-StartupType=Multi Categories=Qt;KDE;System;X-KDE-More; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop new/kdeadmin-3.93.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop --- old/kdeadmin-3.93.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2007-09-05 08:29:55.000000000 +0200 @@ -89,6 +89,7 @@ Name[it]=Impostazioni di rete Name[ja]=ネットワーク設定 Name[kk]=Желінің параметрлері +Name[lt]=Tinklo nustatymai Name[mk]=Поставувања на мрежа Name[nb]=Nettverksoppsett Name[nds]=Nettwark-Instellen diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/knetworkconf/knetworkconf/knetworkconf.desktop new/kdeadmin-3.93.0/knetworkconf/knetworkconf/knetworkconf.desktop --- old/kdeadmin-3.93.0/knetworkconf/knetworkconf/knetworkconf.desktop 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/knetworkconf/knetworkconf/knetworkconf.desktop 2007-09-06 17:47:04.000000000 +0200 @@ -4,7 +4,7 @@ Type=Application Exec=kdesu knetworkconf -caption "%c" %i Icon=knetworkconf -DocPath=knetworkconf/index.docbook +X-DocPath=knetworkconf/index.docbook Comment=Configure TCP/IP settings Comment[be]=Наставіць TCP/IP Comment[bg]=Настройване настройките на TCP/IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/kpackage.desktop new/kdeadmin-3.93.0/kpackage/kpackage.desktop --- old/kdeadmin-3.93.0/kpackage/kpackage.desktop 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/kpackage/kpackage.desktop 2007-09-06 17:47:04.000000000 +0200 @@ -75,7 +75,7 @@ Exec=kpackage -caption "%c" %i %u Icon=kpackage Type=Application -DocPath=kpackage/index.html +X-DocPath=kpackage/index.html Terminal=false Path= InitialPreference=5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/managementWidget.cpp new/kdeadmin-3.93.0/kpackage/managementWidget.cpp --- old/kdeadmin-3.93.0/kpackage/managementWidget.cpp 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/kpackage/managementWidget.cpp 2007-09-12 17:27:49.000000000 +0200 @@ -587,7 +587,7 @@ packageInfo *ptree; QString pkgId = name; -// kDebug() << "pkgId=" << pkgId << "\n"; + kDebug() << "pkgId=" << pkgId << "\n"; if (haveInstall) { ptree = dirInstPackages.value(pkgId); // remove installed entry @@ -608,12 +608,12 @@ } } -// dirInstPackages->insert(pkgId,pnew); + pki->rmInfo("old-version"); pki->packageState = packageInfo::INSTALLED; q = pki->place(treeList,true); -// allPackages.append(pnew); + if (!q) { -// kDebug() << "N=" << pki->getInfo("name") << "\n"; + kDebug() << "N=" << pki->getInfo("name") << "\n"; } else { treeList->sweep(true); searchLine->updateSearch(); @@ -623,11 +623,11 @@ dirInstPackages.remove(pkgId); KpTreeListItem *qt = pki->getItem(); if (qt) { -// kDebug() << "qt pkgId=" << pkgId << "\n"; + kDebug() << "qt pkgId=" << pkgId << "\n"; treeList->stackRemove(qt); treeList->setSelected(qt,false); -// kDebug() << "treeList->setSelected(qt,false);" << "\n"; + kDebug() << "treeList->setSelected(qt,false);" << "\n"; if (treeList->markPkg == qt) treeList->markPkg = 0; pki->deleteItem(); @@ -637,7 +637,7 @@ packageInfo *pb = dirUninstPackages.value(pkgId); if (pb) { // available package matching the one just uninstalled -// kDebug() << "pb pkgId=" << pkgId << "\n"; + kDebug() << "pb pkgId=" << pkgId << "\n"; pb->packageState = packageInfo::NEW; dirUninstPackages.insert(pkgId, pb); dirInstPackages.remove(pkgId); @@ -649,6 +649,18 @@ searchLine->updateSearch(); return q; } + } else { + pki->packageState = packageInfo::NEW; + dirUninstPackages.insert(pkgId, pki); + q = pki->place(treeList,true); + if (!q) { + kDebug() << "NOTP=" << qPrintable(pb->getInfo("name")) << "\n"; + } else { + treeList->sweep(true); + searchLine->updateSearch(); + return q; + } + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/packageInfo.cpp new/kdeadmin-3.93.0/kpackage/packageInfo.cpp --- old/kdeadmin-3.93.0/kpackage/packageInfo.cpp 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/kpackage/packageInfo.cpp 2007-09-12 17:27:49.000000000 +0200 @@ -109,6 +109,14 @@ } } +// Delete a property +void packageInfo::rmInfo(const QString &property) +{ + if (info.contains(property)) { + info.remove(property); + } +} + // Initialize fields if missing void packageInfo::fixup() { @@ -363,7 +371,7 @@ } else { n = pnewer(myVersion,hisVersion); if (n) { -// kDebug() < "W2=" << n << "myVersion=" << myVersion << " hisVersion=" << hisVersion <<"\n"; +// kDebug() << "W2=" << n << "myVersion=" << myVersion << " hisVersion=" << hisVersion <<"\n"; return n; } else { n = pnewer(myRelease,hisRelease); @@ -587,7 +595,7 @@ bool installed, bool infoPackage) { QString pname = getInfo("name"); -// kDebug() << "U=" << pname << " I=" << installed << " IP=" << infoPackage << "\n"; +// kDebug() << "U=" << pname << " I=" << installed << " IP=" << infoPackage << "\n"; bool shouldUpdate = true; bool hidden = false; @@ -596,10 +604,10 @@ if (pi) { // installed version exists if ((pi->packageState != BAD_INSTALL) && (pi->packageState != NOLIST)) { -// kDebug() << "U1=" << pname << "\n"; +// kDebug() << "U1=" << pname << "\n"; if (newer(pi) >= 0) { -// kDebug() << "H=" << pname << "\n"; +// kDebug() << "H=" << pname << "\n"; hidden = true; } } @@ -609,9 +617,9 @@ if (pu) { // available version exists if ((pu->packageState != BAD_INSTALL) && (pu->packageState != NOLIST)) { -// kDebug() << "U2=" << pname << "\n"; +// kDebug() << "U2=" << pname << "\n"; if (newer(pu) > 0) { -// kDebug() << "H1=" << pname << "\n"; +// kDebug() << "H1=" << pname << "\n"; if (installed) { pu->packageState = UPDATED; shouldUpdate = true; @@ -619,10 +627,10 @@ } else { shouldUpdate = false; } - } else if (!installed) { // If older available package exists, remove it -// kDebug() << "H2=" << pname << "\n"; - kpackage->management->dirUninstPackages.take(*(pu->info.find("name"))); - pki.removeAll(pu); + } else { + kDebug() << "H2=" << pname << "\n"; + kpackage->management->dirUninstPackages.take(*(pu->info.find("name"))); + pki.removeAll(pu); } } } @@ -630,43 +638,13 @@ if (!hasInfo("version")) { shouldUpdate = true; } - + if (shouldUpdate) { - if (packageState != BAD_INSTALL) { - if (installed) - packageState = INSTALLED; - else if (pi) { // installed version exists - if (hidden) { - packageState = HIDDEN; - } else { - QString version = pi->getInfo("version"); - if (version.isEmpty()) { - if (pi->packageState == NOLIST) - packageState = NEW; - else - packageState = UPDATED; - } else { - packageState = UPDATED; - if (pi->hasInfo("old-version")) { - info.insert("old-version", - pi->getInfo("old-version")); - } else { - info.insert("old-version",version); - } - QString group = getInfo("group"); - if (group == "NEW") { - if (pi->hasInfo("group")) { - info.insert("group", pi->getInfo("group") ); - } - } - } - } - } else - packageState = NEW; - } - + pkgUpdate(this,pi,installed,false); + pki.append(this); - +// kDebug() << "Inst=" << installed << " Info=" << infoPackage << "\n"; + if (installed) { if (infoPackage) kpackage->management->dirInfoPackages.insert(pname,this); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/packageInfo.h new/kdeadmin-3.93.0/kpackage/packageInfo.h --- old/kdeadmin-3.93.0/kpackage/packageInfo.h 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/kpackage/packageInfo.h 2007-09-12 17:27:49.000000000 +0200 @@ -82,6 +82,9 @@ */ bool hasInfo(const QString &property); +// Delete a property + void rmInfo(const QString &property); + void fixup(); // Initialize fields if missing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/pkgInterface.cpp new/kdeadmin-3.93.0/kpackage/pkgInterface.cpp --- old/kdeadmin-3.93.0/kpackage/pkgInterface.cpp 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/kpackage/pkgInterface.cpp 2007-09-12 17:27:49.000000000 +0200 @@ -355,7 +355,7 @@ } i->packType = pType; i->fixup(); - // kDebug() << "==" << packName << "\n"; +// kDebug() << "==" << packName << "\n"; return i; } else { return 0; @@ -363,6 +363,22 @@ } ////////////////////////////////////////////////////////////////////////////// +void pkgInterface::removeLastEmpty(QStringList &list) +{ + if (list.count() > 0) { + QMutableListIterator<QString> i(list); + i.toBack(); + if (i.peekPrevious().isEmpty()) { + i.previous(); + i.remove(); + } + if (i.peekPrevious().isEmpty()) { + i.previous(); + i.remove(); + } + } + kDebug() << "R1" << list <<"\n"; +} QStringList pkgInterface::listInstalls(const QStringList &packs, bool install, bool &) { @@ -386,15 +402,12 @@ kDebug() << "L=" << list << "\n"; if (!kpty->Result) { + removeLastEmpty(list); QMutableListIterator<QString> i(list); i.toBack(); - // rmove last two lines - i.previous(); - i.remove(); - i.previous(); - i.remove(); + kDebug() << "L2=" << list << "\n"; - // Skip non-blank lines (wanted text) + // Skip non-blank lines (wanted text) while (i.hasPrevious()) { if (!i.peekPrevious().isEmpty()) { i.previous(); @@ -408,7 +421,8 @@ i.previous(); i.remove(); } - + kDebug() << "L3=" << list << "\n"; + return list; } else { return QStringList(); @@ -437,13 +451,9 @@ // kDebug() << "s=" << s << "LS=" << list.count() << "\n"; // kDebug() << "Status=" << list << "\n"; + removeLastEmpty(list); + QMutableListIterator<QString> i(list); - i.toBack(); - // rmove last two lines - i.previous(); - i.remove(); - i.previous(); - i.remove(); i.toFront(); @@ -489,14 +499,9 @@ // kDebug() << "s=" << s << "LS=" << list.count() << "\n"; // kDebug() << "Status=" << list << "\n"; - QMutableListIterator<QString> i(list); - i.toBack(); - // rmove last two lines - i.previous(); - i.remove(); - i.previous(); - i.remove(); + removeLastEmpty(list); + QMutableListIterator<QString> i(list); i.toFront(); // Remove non-blank lines forward (cache access info) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kpackage/pkgInterface.h new/kdeadmin-3.93.0/kpackage/pkgInterface.h --- old/kdeadmin-3.93.0/kpackage/pkgInterface.h 2007-08-29 11:56:11.000000000 +0200 +++ new/kdeadmin-3.93.0/kpackage/pkgInterface.h 2007-09-12 17:27:49.000000000 +0200 @@ -160,7 +160,8 @@ QString doUninstall(int uninstallFlags, const QString &packs, bool &test); QString doInstall(int installFlags, const QString &packs, bool &test); - + void removeLastEmpty(QStringList &list); + QString uninstall(int uninstallFlags, QList<packageInfo *> p, bool &test); QString uninstall(int uninstallFlags, packageInfo *p, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/ksysv/ksysv.desktop new/kdeadmin-3.93.0/ksysv/ksysv.desktop --- old/kdeadmin-3.93.0/ksysv/ksysv.desktop 2007-08-29 11:56:07.000000000 +0200 +++ new/kdeadmin-3.93.0/ksysv/ksysv.desktop 2007-09-06 17:47:04.000000000 +0200 @@ -54,7 +54,7 @@ Exec=ksysv -caption "%c" %i Icon=ksysv Path= -DocPath=ksysv/index.html +X-DocPath=ksysv/index.html Type=Application Terminal=false X-KDE-StartupNotify=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_groupldap.cpp new/kdeadmin-3.93.0/kuser/ku_groupldap.cpp --- old/kdeadmin-3.93.0/kuser/ku_groupldap.cpp 2007-08-29 11:56:09.000000000 +0200 +++ new/kdeadmin-3.93.0/kuser/ku_groupldap.cpp 2007-09-02 12:44:34.000000000 +0200 @@ -156,7 +156,10 @@ mProg->setAutoClose( false ); mProg->setMaximum( 100 ); mAdv = 1; - + mOk = true; + mProg->show(); + qApp->processEvents(); + KLDAP::LdapSearch search; connect( &search, SIGNAL( data( KLDAP::LdapSearch*, const KLDAP::LdapObject& ) ), @@ -172,6 +175,7 @@ kDebug() << "search failed"; mOk = false; mErrorString = KLDAP::LdapConnection::errorString(search.error()); + mErrorDetails = search.errorString(); } delete mProg; return( mOk ); @@ -189,12 +193,14 @@ mErrorString = conn.connectionError(); return false; } - if ( conn.bind() != KLDAP_SUCCESS ) { + + KLDAP::LdapOperation op( conn ); + + if ( op.bind_s() != KLDAP_SUCCESS ) { mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode()); mErrorDetails = conn.ldapErrorString(); return false; } - KLDAP::LdapOperation op( conn ); KLDAP::LdapOperation::ModOps ops; mProg = new QProgressDialog( 0 ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/kuser.desktop new/kdeadmin-3.93.0/kuser/kuser.desktop --- old/kdeadmin-3.93.0/kuser/kuser.desktop 2007-08-29 11:56:09.000000000 +0200 +++ new/kdeadmin-3.93.0/kuser/kuser.desktop 2007-09-06 17:47:04.000000000 +0200 @@ -79,7 +79,7 @@ Exec=kuser %i -caption "%c" Icon=kuser Type=Application -DocPath=kuser/index.html +X-DocPath=kuser/index.html Terminal=false X-KDE-StartupNotify=true X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_userldap.cpp new/kdeadmin-3.93.0/kuser/ku_userldap.cpp --- old/kdeadmin-3.93.0/kuser/ku_userldap.cpp 2007-08-29 11:56:09.000000000 +0200 +++ new/kdeadmin-3.93.0/kuser/ku_userldap.cpp 2007-09-02 12:44:34.000000000 +0200 @@ -86,11 +86,12 @@ void KU_UserLDAP::result( KLDAP::LdapSearch *search ) { - kDebug() << "LDAP result: " << search->error(); + kDebug() << "LDAP result: " << search->error() << " " << search->errorString(); mProg->hide(); if ( search->error() ) { mErrorString = KLDAP::LdapConnection::errorString(search->error()); + mErrorDetails = search->errorString(); mOk = false; } else { mOk = true; @@ -229,7 +230,9 @@ mProg->setAutoReset( false ); mProg->setMaximum( 100 ); mAdv = 1; - + mOk = true; + mProg->show(); + qApp->processEvents(); KLDAP::LdapSearch search; connect( &search, @@ -246,6 +249,7 @@ kDebug() << "search failed"; mOk = false; mErrorString = KLDAP::LdapConnection::errorString(search.error()); + mErrorDetails = search.errorString(); } delete mProg; return( mOk ); @@ -503,13 +507,15 @@ mErrorString = conn.connectionError(); return false; } - if ( conn.bind() != KLDAP_SUCCESS ) { + + KLDAP::LdapOperation op( conn ); + + if ( op.bind_s() != KLDAP_SUCCESS ) { mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode()); mErrorDetails = conn.ldapErrorString(); return false; } - KLDAP::LdapOperation op( conn ); KLDAP::LdapOperation::ModOps ops; mProg = new QProgressDialog( 0 ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/kuser/ku_usermodel.cpp new/kdeadmin-3.93.0/kuser/ku_usermodel.cpp --- old/kdeadmin-3.93.0/kuser/ku_usermodel.cpp 2007-08-29 11:56:09.000000000 +0200 +++ new/kdeadmin-3.93.0/kuser/ku_usermodel.cpp 2007-09-07 14:21:59.000000000 +0200 @@ -82,7 +82,7 @@ default: return QVariant(); } case Qt::TextColorRole: - if ( user.getDisabled() ) return KColorScheme( KColorScheme::View ).foreground( KColorScheme::VisitedText ); + if ( user.getDisabled() ) return KColorScheme( QPalette::Active, KColorScheme::View ).foreground( KColorScheme::VisitedText ); } return QVariant(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.93.0/README new/kdeadmin-3.93.0/README --- old/kdeadmin-3.93.0/README 2007-08-29 11:56:12.000000000 +0200 +++ new/kdeadmin-3.93.0/README 2007-09-11 22:36:44.000000000 +0200 @@ -10,15 +10,9 @@ The kdeadmin package contains packages that usually only a system administrator might need: -* debian - Files needed to create Debian packages. - * doc XML based documentation for the programs -* kcmlinuz - Linux Kernel configurator - * kcron Editor for the cron command scheduler. @@ -37,9 +31,6 @@ * kuser An user manager. -* kxconfig - Configure X-Windows display properties. - * lilo-config A plugin for KControl to manage the Linux boot loader LILO. ++++++ _upstream ++++++ --- KDE/kdeadmin4/_upstream 2007-06-08 19:41:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeadmin4/_upstream 2007-09-13 14:46:53.000000000 +0200 @@ -1,6 +1,6 @@ <upstream> <source> - <file archive='tar' compress='bzip2'>kdeadmin.tar.bz2</file> + <file archive='tar' compress='bzip2'>kdeadmin-3.93.0.tar.bz2</file> <svn> <url>svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeadmin</url> <destdir/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org