Mailinglist Archive: opensuse-commit (858 mails)
| < Previous | Next > |
commit kdeadmin4
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 21 Nov 2007 17:16:22 +0100
- Message-id: <20071121161622.4A5A66780DE@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdeadmin4
checked in at Wed Nov 21 17:16:22 CET 2007.
--------
--- KDE/kdeadmin4/kdeadmin4.changes 2007-11-01 14:26:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2007-11-14
17:31:19.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov 14 17:31:19 CET 2007 - dmueller@xxxxxxx
+
+- update to 3.96.0
+
+-------------------------------------------------------------------
+Tue Nov 6 11:19:40 CET 2007 - dmueller@xxxxxxx
+
+- update to 3.95.2
+
+-------------------------------------------------------------------
Old:
----
kdeadmin-3.95.1.tar.bz2
New:
----
kdeadmin-3.96.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeadmin4.spec ++++++
--- /var/tmp/diff_new_pack.d28026/_old 2007-11-21 17:14:04.000000000 +0100
+++ /var/tmp/diff_new_pack.d28026/_new 2007-11-21 17:14:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeadmin4 (Version 3.95.1)
+# spec file for package kdeadmin4 (Version 3.96.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: kdeadmin base package
Url: http://www.kde.org
-Version: 3.95.1
+Version: 3.96.0
Release: 1
-%define rversion 3.95.1
+%define rversion 3.96.0
Source0: kdeadmin-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,7 +47,14 @@
%install
cd build
+ %create_subdir_filelist -d kcron -n kdeadmin-%rversion
+ %create_subdir_filelist -d kpackage -n kdeadmin-%rversion
+ %create_subdir_filelist -d kuser -n kdeadmin-%rversion
+ %create_subdir_filelist -d secpolicy -n kdeadmin-%rversion
+ %create_subdir_filelist -d knetworkconf -n kdeadmin-%rversion
%makeinstall
+ cd ..
+ cat filelists/* | while read line; do echo "%exclude $line";done
filelists/exclude%suse_update_desktop_file kpackage System PackageManager
%suse_update_desktop_file kcron System ServiceConfiguration
%suse_update_desktop_file kuser System SystemSetup
@@ -59,6 +66,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
+ rm -rf filelists
%package -n kde4-kcron
Group: System/GUI/KDE
@@ -80,14 +88,9 @@
%postun -n kde4-kcron
%run_ldconfig
-%files -n kde4-kcron
+%files -n kde4-kcron -f filelists/kcron
%defattr(-,root,root)
%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
@@ -109,15 +112,9 @@
%postun -n kde4-kpackage
%run_ldconfig
-%files -n kde4-kpackage
+%files -n kde4-kpackage -f filelists/kpackage
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-/usr/bin/kpackage
-/usr/share/applications/kde4/kpackage.desktop
-%_kde_share_dir/apps/kpackage
-%_kde_share_dir/config.kcfg/kpackageSettings.kcfg
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kpackage
-/usr/share/icons/hicolor/*/apps/kpackage.*
%package -n kde4-kuser
Group: System/GUI/KDE
@@ -140,15 +137,9 @@
%postun -n kde4-kuser
%run_ldconfig
-%files -n kde4-kuser
+%files -n kde4-kuser -f filelists/kuser
%defattr(-,root,root)
%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
@@ -170,10 +161,9 @@
%postun -n kde4-secpolicy
%run_ldconfig
-%files -n kde4-secpolicy
+%files -n kde4-secpolicy -f filelists/secpolicy
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-/usr/bin/secpolicy
%package -n kde4-knetworkconf
Group: System/GUI/KDE
@@ -196,24 +186,18 @@
%postun -n kde4-knetworkconf
%run_ldconfig
-%files -n kde4-knetworkconf
+%files -n kde4-knetworkconf -f filelists/knetworkconf
%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.*
-/usr/share/icons/hicolor/*/actions/network_connected_lan_knc.*
-/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
-%files
+%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
%changelog
+* Wed Nov 14 2007 - dmueller@xxxxxxx
+- update to 3.96.0
+* Tue Nov 06 2007 - dmueller@xxxxxxx
+- update to 3.95.2
* Thu Nov 01 2007 - dmueller@xxxxxxx
- update to 3.95.1
* Fri Oct 26 2007 - dmueller@xxxxxxx
++++++ kdeadmin-3.95.1.tar.bz2 -> kdeadmin-3.96.0.tar.bz2 ++++++
Files old/kdeadmin-3.95.1/doc/kcron/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/kcron/index.cache.bz2 differ
Files old/kdeadmin-3.95.1/doc/kdat/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/kdat/index.cache.bz2 differ
Files old/kdeadmin-3.95.1/doc/knetworkconf/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/knetworkconf/index.cache.bz2 differ
Files old/kdeadmin-3.95.1/doc/kpackage/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/kpackage/index.cache.bz2 differ
Files old/kdeadmin-3.95.1/doc/ksysv/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/ksysv/index.cache.bz2 differ
Files old/kdeadmin-3.95.1/doc/kuser/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/kuser/index.cache.bz2 differ
Files old/kdeadmin-3.95.1/doc/lilo-config/index.cache.bz2 and
new/kdeadmin-3.96.0/doc/lilo-config/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kcron/kticon.cpp
new/kdeadmin-3.96.0/kcron/kticon.cpp
--- old/kdeadmin-3.95.1/kcron/kticon.cpp 2007-08-29 11:56:12.000000000
+0200
+++ new/kdeadmin-3.96.0/kcron/kticon.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -44,9 +44,9 @@
QPixmap KTIcon::system(int size)
{
- if (size == 0) return getMiniIcon("openterm");
- if (size == 1) return getIcon("openterm");
- return getMaxIcon("openterm");
+ if (size == 0) return getMiniIcon("utilities-terminal");
+ if (size == 1) return getIcon("utilities-terminal");
+ return getMaxIcon("utilities-terminal");
}
QPixmap KTIcon::user(int size)
@@ -79,9 +79,9 @@
QPixmap KTIcon::shell(int size)
{
- if (size == 0) return getMiniIcon("openterm");
- if (size == 1) return getIcon("openterm");
- return getMaxIcon("openterm");
+ if (size == 0) return getMiniIcon("utilities-terminal");
+ if (size == 1) return getIcon("utilities-terminal");
+ return getMaxIcon("utilities-terminal");
}
QPixmap KTIcon::home(int size)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kcron/ktvariable.h
new/kdeadmin-3.96.0/kcron/ktvariable.h
--- old/kdeadmin-3.95.1/kcron/ktvariable.h 2007-08-29 11:56:12.000000000
+0200
+++ new/kdeadmin-3.96.0/kcron/ktvariable.h 2007-11-14 00:46:28.000000000
+0100
@@ -22,7 +22,6 @@
#include <kdialog.h>
#include <ktitlewidget.h>
-class KTextEdit;
class CTVariable;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kdat/BackupDlg.cpp
new/kdeadmin-3.96.0/kdat/BackupDlg.cpp
--- old/kdeadmin-3.95.1/kdat/BackupDlg.cpp 2007-08-29 11:56:07.000000000
+0200
+++ new/kdeadmin-3.96.0/kdat/BackupDlg.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -1,4 +1,4 @@
-// $Id: BackupDlg.cpp 700803 2007-08-16 13:48:41Z amth $
+// $Id: BackupDlg.cpp 736046 2007-11-13 11:18:38Z quique $
//
// KDat - a tar-based DAT archiver
// Copyright (C) 1998-2000 Sean Vyain, svyain@xxxxxxxxxxxx
@@ -110,22 +110,22 @@
_timeRemaining = new QLabel( i18n( "00:00:00" ), f2 );
_timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
- QLabel* lbl3 = new QLabel( i18n( "Total KB:" ), f1 );
+ QLabel* lbl3 = new QLabel( i18n( "Total KiB:" ), f1 );
lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
QLabel* totalKbytes = new QLabel( Util::kbytesToString( archiveSize ), f1
);
totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
- QLabel* lbl4 = new QLabel( i18n( "KB written:" ), f2 );
+ QLabel* lbl4 = new QLabel( i18n( "KiB written:" ), f2 );
lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
- _kbytesWritten = new QLabel( i18n( "0KB" ), f2 );
+ _kbytesWritten = new QLabel( i18n( "0KiB" ), f2 );
_kbytesWritten->setFixedHeight( _kbytesWritten->sizeHint().height() );
QLabel* lbl5 = new QLabel( i18n( "Transfer rate:" ), f1 );
lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
- _transferRate = new QLabel( i18n( "0KB/min" ), f1 );
+ _transferRate = new QLabel( i18n( "0KiB/min" ), f1 );
_transferRate->setFixedHeight( _transferRate->sizeHint().height() );
QLabel* lbl6 = new QLabel( i18n( "Files:" ), f2 );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kdat/IndexDlg.cpp
new/kdeadmin-3.96.0/kdat/IndexDlg.cpp
--- old/kdeadmin-3.95.1/kdat/IndexDlg.cpp 2007-08-29 11:56:07.000000000
+0200
+++ new/kdeadmin-3.96.0/kdat/IndexDlg.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -87,10 +87,10 @@
_archives = new QLabel( i18n( "0" ), f2 );
_archives->setFixedHeight( _archives->sizeHint().height() );
- QLabel* lbl3 = new QLabel( i18n( "KB read:" ), f1 );
+ QLabel* lbl3 = new QLabel( i18n( "KiB read:" ), f1 );
lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
- _kbytesRead = new QLabel( i18n( "0KB" ), f1 );
+ _kbytesRead = new QLabel( i18n( "0KiB" ), f1 );
_kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
QLabel* lbl4 = new QLabel( i18n( "Files:" ), f2 );
@@ -102,7 +102,7 @@
QLabel* lbl5 = new QLabel( i18n( "Transfer rate:" ), f1 );
lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
- _transferRate = new QLabel( i18n( "0KB/min" ), f1 );
+ _transferRate = new QLabel( i18n( "0KiB/min" ), f1 );
_transferRate->setFixedHeight( _transferRate->sizeHint().height() );
QLabel* lbl6 = new QLabel( i18n( "Total files:" ), f2 );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kdat/KDatMainWindow.cpp
new/kdeadmin-3.96.0/kdat/KDatMainWindow.cpp
--- old/kdeadmin-3.95.1/kdat/KDatMainWindow.cpp 2007-08-29 11:56:07.000000000
+0200
+++ new/kdeadmin-3.96.0/kdat/KDatMainWindow.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -482,8 +482,8 @@
if ( tapeSize + size >=
TapeManager::instance()->getMountedTape()->getSize() ) {
// Warn user that tape is probably too short.
QString msg;
- msg = i18n( "WARNING: The estimated archive size is %1 KB but "
- "the tape has only %2 KB of space!\n"
+ msg = i18n( "WARNING: The estimated archive size is %1 KiB but "
+ "the tape has only %2 KiB of space!\n"
"Back up anyway?",
KGlobal::locale()->formatNumber(size, 0),
KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize()
- tapeSize, 0 ));
@@ -1032,7 +1032,7 @@
hideInfo();
}
-// 2002-01-21 LEW: returns backup size in KB, or -1 if user chose
+// 2002-01-21 LEW: returns backup size in KiB, or -1 if user chose
// to abort the backup.
int KDatMainWindow::calcBackupSize( const QString& workingDir, bool local,
const QStringList& files,
bool incremental, const QString& snapshot, bool
removeSnapshot )
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_archive.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_archive.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_backup.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_backup.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_eject.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_eject.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_mounted.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_mounted.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_restore.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_restore.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_select_all.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_select_all.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_select_none.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_select_none.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_select_some.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_select_some.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_unmounted.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_unmounted.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo16-app-kdat_verify.png and
new/kdeadmin-3.96.0/kdat/pics/lo16-app-kdat_verify.png differ
Files old/kdeadmin-3.95.1/kdat/pics/lo32-app-kdat.png and
new/kdeadmin-3.96.0/kdat/pics/lo32-app-kdat.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kdat/VerifyDlg.cpp
new/kdeadmin-3.96.0/kdat/VerifyDlg.cpp
--- old/kdeadmin-3.95.1/kdat/VerifyDlg.cpp 2007-05-03 10:41:37.000000000
+0200
+++ new/kdeadmin-3.96.0/kdat/VerifyDlg.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -1,4 +1,4 @@
-// $Id: VerifyDlg.cpp 646732 2007-03-26 15:07:10Z ossi $
+// $Id: VerifyDlg.cpp 736046 2007-11-13 11:18:38Z quique $
//
// KDat - a tar-based DAT archiver
// Copyright (C) 1998-2000 Sean Vyain, svyain@xxxxxxxxxxxx
@@ -106,22 +106,22 @@
_timeRemaining = new QLabel( i18n( "00:00:00" ), f2 );
_timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
- QLabel* lbl3 = new QLabel( i18n( "Total KB:" ), f1 );
+ QLabel* lbl3 = new QLabel( i18n( "Total KiB:" ), f1 );
lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
QLabel* totalKbytes = new QLabel( Util::kbytesToString( _archiveSize ), f1
);
totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
- QLabel* lbl4 = new QLabel( i18n( "KB read:" ), f2 );
+ QLabel* lbl4 = new QLabel( i18n( "KiB read:" ), f2 );
lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
- _kbytesRead = new QLabel( i18n( "0KB" ), f2 );
+ _kbytesRead = new QLabel( i18n( "0KiB" ), f2 );
_kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
QLabel* lbl5 = new QLabel( i18n( "Transfer rate:" ), f1 );
lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
- _transferRate = new QLabel( i18n( "0KB/min" ), f1 );
+ _transferRate = new QLabel( i18n( "0KiB/min" ), f1 );
_transferRate->setFixedHeight( _transferRate->sizeHint().height() );
QLabel* lbl6;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/kpackage.h
new/kdeadmin-3.96.0/kpackage/kpackage.h
--- old/kdeadmin-3.95.1/kpackage/kpackage.h 2007-10-16 16:50:11.000000000
+0200
+++ new/kdeadmin-3.96.0/kpackage/kpackage.h 2007-11-14 00:46:28.000000000
+0100
@@ -51,12 +51,9 @@
class QLabel;
class Search;
class FindF;
-class Options;
class pkgInterface;
class managementWidget;
-class KRecentFilesAction;
class kpRun;
-class KConfigGroup;
//////////////////////////////////////////////////////////////////////////////
@@ -184,6 +181,8 @@
FindF *findialog;
// find file dialog
+
+ QString displayMsg;
private:
int mode;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/kpkg.h
new/kdeadmin-3.96.0/kpackage/kpkg.h
--- old/kdeadmin-3.95.1/kpackage/kpkg.h 2007-10-16 16:50:11.000000000 +0200
+++ new/kdeadmin-3.96.0/kpackage/kpkg.h 2007-11-14 00:46:28.000000000 +0100
@@ -44,16 +44,9 @@
#include <QtGui/QDropEvent>
#include <QtGui/QCloseEvent>
-class KFileDialog;
-class QProgressBar;
class QLabel;
-class Search;
-class FindF;
class Options;
-class pkgInterface;
-class managementWidget;
class KRecentFilesAction;
-class kpRun;
class KConfigGroup;
class kpSettings;
class kpConfig;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/kpPty.cpp
new/kdeadmin-3.96.0/kpackage/kpPty.cpp
--- old/kdeadmin-3.95.1/kpackage/kpPty.cpp 2007-10-31 21:36:43.000000000
+0100
+++ new/kdeadmin-3.96.0/kpackage/kpPty.cpp 2007-11-06 08:33:19.000000000
+0100
@@ -312,7 +312,6 @@
return QStringList();
}
}
-
retList.clear();
if (inLoop) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/managementWidget.cpp
new/kdeadmin-3.96.0/kpackage/managementWidget.cpp
--- old/kdeadmin-3.95.1/kpackage/managementWidget.cpp 2007-10-16
16:50:11.000000000 +0200
+++ new/kdeadmin-3.96.0/kpackage/managementWidget.cpp 2007-11-06
08:33:19.000000000 +0100
@@ -323,13 +323,14 @@
dirUninstPackages.clear();
// List installed packages
-// if (hostName.isEmpty() ) {
- kpinterface[0]->listPackages(allPackages);
-// }
+ kpinterface[0]->listPackages(allPackages);
// Rebuild the list tree
rebuildListTree();
-
+
+ kpackage->setStatus(kpackage->displayMsg);
+ kpackage->displayMsg.clear();
+
QApplication::restoreOverrideCursor();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/managementWidget.h
new/kdeadmin-3.96.0/kpackage/managementWidget.h
--- old/kdeadmin-3.95.1/kpackage/managementWidget.h 2007-10-16
16:50:11.000000000 +0200
+++ new/kdeadmin-3.96.0/kpackage/managementWidget.h 2007-11-14
00:46:28.000000000 +0100
@@ -68,7 +68,6 @@
class packageDisplayWidget;
class packageInfo;
class managementWidget;
-class pkgInterface;
class KpListViewSearchLine : public K3ListViewSearchLine
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/pkgInterface.cpp
new/kdeadmin-3.96.0/kpackage/pkgInterface.cpp
--- old/kdeadmin-3.95.1/kpackage/pkgInterface.cpp 2007-10-25
11:33:51.000000000 +0200
+++ new/kdeadmin-3.96.0/kpackage/pkgInterface.cpp 2007-11-06
08:33:19.000000000 +0100
@@ -38,6 +38,7 @@
#include <kstandardaction.h>
#include <kaction.h>
#include <kmessagebox.h>
+#include <kapplication.h>
#include "kpTerm.h"
#include "kpackage.h"
@@ -75,8 +76,9 @@
packageLoc = 0;
hasProgram = ifExe("smart");
- if (!hasProgram) {
+ if (!hasProgram && hostName.isEmpty()) {
KpMsg("Error",i18n("Kpackage requires the SMART Package Manager to be
installed in order to function"), true);
+ exit(1); // exit the application
}
DELMSG = i18n("'Delete this window to continue'");
@@ -330,7 +332,7 @@
} else {
a.insert(key, val);
}
- // kDebug() << "C=" << key << "," << val <<"\n";
+ // kDebug() << "C=" << key << "," << val <<"\n";
}
QString packName = a["name"] + getDelimiter(pType) + a["version"];
@@ -535,11 +537,10 @@
///////////////////////////////////////////////////////////////
void pkgInterface::listPackages(QList<packageInfo *> &pki)
-{
+{
listInstalledPackages(pki);
if (hostName.isEmpty()) {
-// listRemotePackages(pki);
- listPackagesFile(pki);
+ listPackagesFile(pki);
} else {
listRemotePackages(pki);
}
@@ -548,9 +549,8 @@
void pkgInterface::listInstalledPackages(QList<packageInfo *> &)
{
// Get list of installed packages
-
QStringList plist;
-
+
kpackage->setStatus(i18n("Querying installed package list"));
QString cmd = "smart query --installed";
@@ -559,7 +559,8 @@
// kDebug() << "s=" << cmd << "LS=" << list.count() << "\n";
// kDebug() << "Status=" << list << "\n";
- if (kpty->Result && !hostName.isEmpty()) {
+
+ if (kpty->Result == 127) { // smart command not found
QApplication::restoreOverrideCursor();
QString sm = i18n("'smart' package manager is required");
if (list.count() == 0) {
@@ -567,8 +568,12 @@
} else {
KMessageBox::detailedSorry(kpkg,sm,list[0]);
}
+ kpackage->fileQuit();
+ } else if (kpty->Result == 1) { // smart not initialised
+ list = kpty->run(cmd,true,true);
+ kpackage->displayMsg = i18n("Press 'Update' to display available packages
");
}
-
+
if (list.count() > 0) {
QString s;
@@ -589,7 +594,6 @@
break;
}
}
-
}
void pkgInterface::listPackagesFile(QList<packageInfo *> &pki)
@@ -603,7 +607,7 @@
QStringList list = kpty->run(cmd);
kpackage->setStatus(i18n("Processing package information"));
-
+
QStringList lines;
QFile file( tempFile );
if ( file.open( QIODevice::ReadOnly ) ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/pkgOptions.cpp
new/kdeadmin-3.96.0/kpackage/pkgOptions.cpp
--- old/kdeadmin-3.95.1/kpackage/pkgOptions.cpp 2007-10-16 16:50:11.000000000
+0200
+++ new/kdeadmin-3.96.0/kpackage/pkgOptions.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -161,10 +161,9 @@
return setup(pl);
}
-void pkgOptions::resetPackages()
+void pkgOptions::resetPackages(bool init)
{
- kDebug() << "resetPackages()\n";
- QApplication::setOverrideCursor( Qt::WaitCursor );
+ //kDebug() << "resetPackages()\n";
installButton->setEnabled(false);
int packCount = packList.count();
@@ -175,11 +174,18 @@
for (int i = 0; i < packCount; i++) {
QListWidgetItem *w = packages->item(i);
if (w->checkState() == Qt::Checked) {
- checked << w->text();
+ kDebug() << "CK=" << w->text() << "\n";
+ checked << w->text();
isChecked.insert(w->text());
}
}
+ if (checked == checkedPackages && !init)
+ return;
+
+ QApplication::setOverrideCursor( Qt::WaitCursor );
+ checkedPackages = checked;
+
packListChecked.clear();
foreach (packageInfo *p, packList) {
// kDebug() << "PC=" << p->fetchFilename() << "\n";
@@ -245,7 +251,7 @@
}
cancelButton->setGuiItem(KStandardGuiItem::cancel());
- resetPackages();
+ resetPackages(true);
return true;
}
@@ -292,7 +298,7 @@
{
if (item) {
QString s = item->text();
- kDebug() << "searchI=" << s << "\n";
+ // kDebug() << "searchI=" << s << "\n";
foreach (packageInfo *p, packList) {
if (s == p->getInfo("name")) {
@@ -300,7 +306,7 @@
break;
}
}
- resetPackages();
+ resetPackages(false);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kpackage/pkgOptions.h
new/kdeadmin-3.96.0/kpackage/pkgOptions.h
--- old/kdeadmin-3.95.1/kpackage/pkgOptions.h 2007-08-29 11:56:11.000000000
+0200
+++ new/kdeadmin-3.96.0/kpackage/pkgOptions.h 2007-11-14 00:46:28.000000000
+0100
@@ -61,7 +61,7 @@
bool setup(QList<packageInfo *> pl);
bool setup(packageInfo *p);
- void resetPackages();
+ void resetPackages(bool init);
void reset();
@@ -86,6 +86,8 @@
kpTerm *term;
pkgInterface *pkgInt;
+
+ QStringList checkedPackages;
bool modified;
bool test;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/ksysv/OldView.cpp
new/kdeadmin-3.96.0/ksysv/OldView.cpp
--- old/kdeadmin-3.95.1/ksysv/OldView.cpp 2007-08-29 11:56:07.000000000
+0200
+++ new/kdeadmin-3.96.0/ksysv/OldView.cpp 2007-11-14 00:46:28.000000000
+0100
@@ -214,7 +214,7 @@
scripts->setSorting (KSVItem::ServiceName);
scripts->header()->setResizeEnabled (false, 0);
- scripts->setDefaultIcon (SmallIcon("exec"));
+ scripts->setDefaultIcon (SmallIcon("system-run"));
mOrigin = scripts;
// setBuddy
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/ksysv/x-ksysv.desktop
new/kdeadmin-3.96.0/ksysv/x-ksysv.desktop
--- old/kdeadmin-3.95.1/ksysv/x-ksysv.desktop 2007-10-03 13:47:32.000000000
+0200
+++ new/kdeadmin-3.96.0/ksysv/x-ksysv.desktop 2007-11-06 08:33:18.000000000
+0100
@@ -63,5 +63,5 @@
Comment[zh_TW]=已儲存起始設定
Icon=ksysv
Type=MimeType
-MimeType=application/x-ksysv-package
+MimeType=application/x-ksysv-package;
Patterns=*.ksysv;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/ksysv/x-ksysv-log.desktop
new/kdeadmin-3.96.0/ksysv/x-ksysv-log.desktop
--- old/kdeadmin-3.95.1/ksysv/x-ksysv-log.desktop 2007-10-03
13:47:32.000000000 +0200
+++ new/kdeadmin-3.96.0/ksysv/x-ksysv-log.desktop 2007-11-06
08:33:18.000000000 +0100
@@ -58,5 +58,5 @@
Comment[zh_TW]=SysV Init 編輯器記錄檔案
Icon=ksysv
Type=MimeType
-MimeType=text/x-ksysv-log
+MimeType=text/x-ksysv-log;
Patterns=*.ksysv_log;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kuser/ku_groupldap.cpp
new/kdeadmin-3.96.0/kuser/ku_groupldap.cpp
--- old/kdeadmin-3.95.1/kuser/ku_groupldap.cpp 2007-10-03 13:47:32.000000000
+0200
+++ new/kdeadmin-3.96.0/kuser/ku_groupldap.cpp 2007-11-06 08:33:18.000000000
+0100
@@ -222,6 +222,7 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString =
KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
}
}
@@ -232,6 +233,7 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
} else {
mModSucc.insert( it.key(), it.value() );
@@ -247,6 +249,7 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
} else {
mAddSucc.append( (*it) );
@@ -260,12 +263,14 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
} else {
mDelSucc.append( (*it) );
}
}
+ delete mProg;
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeadmin-3.95.1/kuser/ku_userldap.cpp
new/kdeadmin-3.96.0/kuser/ku_userldap.cpp
--- old/kdeadmin-3.95.1/kuser/ku_userldap.cpp 2007-10-08 09:15:59.000000000
+0200
+++ new/kdeadmin-3.96.0/kuser/ku_userldap.cpp 2007-11-06 08:33:18.000000000
+0100
@@ -527,6 +527,7 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString =
KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
}
}
@@ -537,6 +538,7 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
} else {
mModSucc.insert( it.key(), it.value() );
@@ -552,6 +554,7 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
} else {
mAddSucc.append( (*it) );
@@ -565,12 +568,14 @@
if ( ret != KLDAP_SUCCESS ) {
mErrorString = KLDAP::LdapConnection::errorString(conn.ldapErrorCode());
mErrorDetails = conn.ldapErrorString();
+ delete mProg;
return false;
} else {
mDelSucc.append( (*it) );
}
}
+ delete mProg;
return true;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |