Adding the remaining Mandriva patches and spec files

6 files changed, 1858 insertions, 0 deletions

diff --git a/mandriva/2010.2/applications/kio-sysinfo/cpu.png b/mandriva/2010.2/applications/kio-sysinfo/cpu.png
new file mode 100644
index 000000000..646db5253
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/cpu.png
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec b/mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec
new file mode 100644
index 000000000..44cd185ca
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec
@@ -0,0 +1,188 @@
+%define oname kio-sysinfo
+Name: kde3-%oname
+Version: 1.8.2
+Release: %mkrel 14
+Summary: KIO Slave sysinfo:/
+License: LGPL
+Group: System/Libraries
+URL: http://www.kde-apps.org/content/show.php?content=58704
+Source0: http://download.tuxfamily.org/kiosysinfo/Sources/%oname-%version.tar.gz
+# Source1:	48x48/apps/kcmprocessor.png
+Source1:	cpu.png
+# Source2:	48x48/devices/system.png
+Source2:	sysinfo.png
+Patch0: kio-sysinfo-1.8.2-suse-10.3.patch
+Patch1: kio-sysinfo-1.8.2-uz-translation.patch
+Patch2: kio-sysinfo-1.8.2-gcc4.patch
+Patch3: kde-3.5.10-acinclude.patch
+Patch4: fix_autotools.patch
+BuildRequires: kdelibs-devel
+BuildRequires: hal-devel
+BuildRequires: dbus-devel
+BuildRequires: libhd-devel
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%endif
+BuildRequires: autoconf >= 1:2.65
+BuildRequires: automake >= 1.6.1
+BuildRequires: kde3-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Obsoletes: sysinfo < 1.8.2-4
+
+%description
+KIO Slave sysinfo:/. It shows various information about your pc, 
+like cpu, ram. kernel version, exc. It also shows the removable 
+devices and partition (total space/available space) and you can open,
+mount and unmount it from this KIO slave.
+
+%files -f kio_sysinfo.lang
+%defattr(-,root,root)
+%{_kde3_libdir}/kde3/*
+%{_kde3_datadir}/applications/kde/kfmclient_sysinfo.desktop
+%{_kde3_appsdir}/sysinfo
+%{_kde3_datadir}/mimelnk/application/x-sysinfo.desktop
+%{_kde3_datadir}/services/ksysinfopart.desktop
+%{_kde3_datadir}/services/sysinfo.protocol
+
+#--------------------------------------------------------------------
+
+%prep
+%setup -q -n %{oname}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%if %mdkversion >= 201000
+%patch3 -p1
+%patch4 -p1
+%endif
+%__cp -f %SOURCE1 about/images/cpu.png
+%__cp -f %SOURCE2 about/images/sysinfo.png
+
+%build
+make -f admin/Makefile.common
+
+%configure_kde3 \
+	--with-qt-dir=%{qt3dir} \
+	--with-qt-includes=%{qt3include} \
+	--with-qt-libraries=%{qt3lib}
+
+%make
+
+%install
+rm -rf %buildroot
+
+%makeinstall_std
+
+%{find_lang} kio_sysinfo
+
+%clean
+rm -rf %{buildroot}
+
+
+%changelog
+
+* Thu Jul 14 2011 Tim Williams <tim@my-place.org.uk> 1.8.2-14mvt2010.2
++ rebuild for trinity KDE
+
+* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1.8.2-13mvt2010
++ Rebuild for MDV 2010.1
+
+* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.8.2-12mvt2010
++ Fix built with autoconf 2.65 and asutmoake 1.11
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 1.8.2-11mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Tue Jun 24 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1.8.2-10mdv2009.0
++ Revision: 228752
+- Fix specfile name
+- Fix with new name
+
+* Sun Jun 08 2008 Funda Wang <fundawang@mandriva.org> 1.8.2-10mdv2009.0
++ Revision: 216987
+- rebuild for new major of hwinfo
+
+* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-9mdv2009.0
++ Revision: 204707
+- Move to /opt
+
+* Tue Apr 01 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1.8.2-8mdv2008.1
++ Revision: 191468
+- Use neutral icon again
+
+* Wed Mar 26 2008 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-7mdv2008.1
++ Revision: 190353
+- Fix for bug https://qa.mandriva.com/show_bug.cgi?id=39173 - Proper dbus/hal device handling
+
+* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 1.8.2-6mdv2008.1
++ Revision: 141781
+- rebuilt against openldap-2.4.7 libs
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Sun Oct 21 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-5mdv2008.1
++ Revision: 100829
+- Updated patch0 from bug#32822
+
+* Fri Oct 12 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-4mdv2008.1
++ Revision: 97268
+- Rename to kio-sysinfo as sysinfo is too confusing
+
+* Thu Sep 27 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-3mdv2008.0
++ Revision: 93343
+- really fix bug#32031
+
+* Tue Aug 28 2007 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-2mdv2008.0
++ Revision: 72846
+- Fix mimelnk placement
+
+* Tue Aug 21 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-1mdv2008.0
++ Revision: 68729
+- New version 1.8.2
+
+  + Eskild Hustvedt <eskild@mandriva.org>
+    - Fixed description
+
+* Sat Aug 04 2007 Funda Wang <fundawang@mandriva.org> 1.8.1-1mdv2008.0
++ Revision: 58918
+- Rediff uz patch
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - new version
+    - bzip2 sources
+
+* Wed Jul 25 2007 Funda Wang <fundawang@mandriva.org> 1.8-2mdv2008.0
++ Revision: 55432
+- Add uz translation to fix mdvbug#32031
+
+* Tue Jul 24 2007 Funda Wang <fundawang@mandriva.org> 1.8-1mdv2008.0
++ Revision: 55039
+- New version
+- uz translation has been merged upstream
+- do not use autotools for kde packages
+- use aclocal
+- BR libhd
+- Replace images with icons here: http://www.kde-look.org/content/show.php?content=61727
+- New verison
+- rediff patch
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - New patch for Uzbek translations (thanks  to Mashrab Kuvatov)
+    - [FEATURE] Add Uzbek translations ( thanks to Mashrab Kuvatov) (bug report #32031)
+
+* Thu Jun 07 2007 Anssi Hannula <anssi@mandriva.org> 1.3-4mdv2008.0
++ Revision: 36204
+- rebuild with correct optflags
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    -Patch0: Make Sysinfo:/ display Mandriva Linux on System: instead of nothing
+
+* Mon Jun 04 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.3-2mdv2008.0
++ Revision: 35108
+- Fix File List
+- Import sysinfo
+
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch
new file mode 100644
index 000000000..7854d751b
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch
@@ -0,0 +1,11 @@
+--- kio-sysinfo-1.8.2/src/sysinfo.cpp.orig      2009-11-13 15:20:27.000000000 +0000
++++ kio-sysinfo-1.8.2/src/sysinfo.cpp   2009-11-13 15:24:53.000000000 +0000
+@@ -245,7 +245,7 @@
+
+ static unsigned long int scan_one( const char* buff, const char *key )
+ {
+-    char *b = strstr( buff, key );
++    const char *b = strstr( buff, key );
+     if ( !b )
+         return 0;
+     unsigned long int val = 0;
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch
new file mode 100644
index 000000000..14aaa9fde
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch
@@ -0,0 +1,769 @@
+diff -u -r kio-sysinfo-1.8.2/src/ksysinfopart.cpp kio-sysinfo-10.3/src/ksysinfopart.cpp
+--- kio-sysinfo-1.8.2/src/ksysinfopart.cpp	2006-05-20 14:21:16.000000000 -0300
++++ kio-sysinfo-10.3/src/ksysinfopart.cpp	2007-08-14 13:09:50.000000000 -0300
+@@ -84,6 +84,10 @@
+    rescanTimer=new QTimer(this);
+    connect(rescanTimer, SIGNAL(timeout()), SLOT(rescan()));
+    rescanTimer->start(20000, true);
++   setJScriptEnabled(false);
++   setJavaEnabled(false);
++   setPluginsEnabled(false);
++   setMetaRefreshEnabled(false);
+ 
+    connectDCOPSignal("kded", "networkstatus", "statusChange(QString,int)", "rescan()", false);
+    installEventFilter( this );
+Somente em kio-sysinfo-1.8.2/src: Makefile
+diff -u -r kio-sysinfo-1.8.2/src/Makefile.am kio-sysinfo-10.3/src/Makefile.am
+--- kio-sysinfo-1.8.2/src/Makefile.am	2006-05-20 14:21:16.000000000 -0300
++++ kio-sysinfo-10.3/src/Makefile.am	2007-08-14 13:07:17.000000000 -0300
+@@ -1,10 +1,11 @@
++SUBDIRS = .
+ 
+ INCLUDES = $(all_includes) `pkg-config --cflags hal`
+ 
+ kde_module_LTLIBRARIES = kio_sysinfo.la libksysinfopart.la
+ 
+ kio_sysinfo_la_SOURCES = sysinfo.cpp
+-kio_sysinfo_la_LIBADD = $(LIB_KIO) -lGL
++kio_sysinfo_la_LIBADD = $(LIB_KIO) -lhd -lGL
+ kio_sysinfo_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $$(pkg-config --libs hal)
+ 
+ kde_services_DATA = sysinfo.protocol ksysinfopart.desktop
+@@ -15,13 +16,11 @@
+ 
+ xdg_apps_DATA = kfmclient_sysinfo.desktop
+ 
+-podir=../po
+-COMMAND=$(XGETTEXT) --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale
+ messages:
+-	$(COMMAND) *.cpp -o $(podir)/kio_sysinfo.pot
++	$(XGETTEXT) *.cpp -o $(podir)/kio_sysinfo.pot
+ 
+ METASOURCES = AUTO
+ 
+ apps_DATA = x-sysinfo.desktop
+-appsdir = $(kde_mimedir)/applications
++appsdir = $(kde_mimedir)/application
+ 
+Somente em kio-sysinfo-1.8.2/src: Makefile.in
+diff -u -r kio-sysinfo-1.8.2/src/sysinfo.cpp kio-sysinfo-10.3/src/sysinfo.cpp
+--- kio-sysinfo-1.8.2/src/sysinfo.cpp	2007-08-21 08:12:15.000000000 -0300
++++ kio-sysinfo-10.3/src/sysinfo.cpp	2007-09-21 13:41:53.000000000 -0300
+@@ -25,7 +25,6 @@
+ 
+ #include <qfile.h>
+ #include <qdir.h>
+-#include <qregexp.h>
+ 
+ #include <stdlib.h>
+ #include <math.h>
+@@ -56,22 +55,22 @@
+ #include <kglobalsettings.h>
+ #include <ktempfile.h>
+ 
+-
+ #include "sysinfo.h"
+ 
+ 
+ using namespace KIO;
+ #define BR "<br>"
+ 
+-static QString formattedUnit( unsigned long long value, int post=1 )
++static QString formattedUnit( Q_UINT64 value, int post=1 )
+ {
+-     if (value > (1024 * 1024))
+-        if (value > (1024 * 1024 * 1024))
+-            return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * (post == 0 ? 1024 : 1024.0)), post));
++    if (value >= (1024 * 1024))
++        if (value >= (1024 * 1024 * 1024))
++            return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0),
++                        post));
+         else
+-            return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * (post == 0 ? 1024 : 1024.0)), post));
++            return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), post));
+     else
+-        return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / (post == 0 ? 1024 : 1024.0), post));
++        return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, post));
+ }
+ 
+ static QString htmlQuote(const QString& _s)
+@@ -124,46 +123,39 @@
+ 
+ void kio_sysinfoProtocol::get( const KURL & /*url*/ )
+ {
+-    FILE *fp;  //this pointer is used to open file
+-
+     mimeType( "application/x-sysinfo" );
+ 
++    // CPU info
++    infoMessage( i18n( "Looking for CPU information..." ) );
++    cpuInfo();
++
+     // header
+     QString location = locate( "data", "sysinfo/about/my-computer.html" );
+     QFile f( location );
+     f.open( IO_ReadOnly );
+     QTextStream t( &f );
+-
+-    infoMessage(i18n("Looking for hardware information..."));
+-
+     QString content = t.read();
+-    content = content.arg( i18n( "My Computer" ) ); // <title>
+-
+-    content = content.arg( "file:" + locate( "data", "sysinfo/about/style.css" ) );
+-
+-    content = content.arg( i18n( "My Computer" ) ); // <h1>
+-    content = content.arg( i18n( "Folders, Harddisks, Removable Devices, System Information and more..." ) ); // catchphrase
++    content = content.arg( i18n( "My Computer" ),
++                           htmlQuote("file:" + locate( "data", "sysinfo/about/style.css" )),
++                           i18n( "My Computer"),
++                           i18n( "Folders, Harddisks, Removable Devices, System Information and more..." ));
+ 
+     QString sysInfo = "<div id=\"column2\">"; // table with 2 cols
+     QString dummy;
+ 
+     // disk info
+-    sysInfo += "<h2 id=\"hdds\">" + i18n( "Disks Information" ) + "</h2>";
++    infoMessage( i18n( "Looking for disk information..." ) );
++    sysInfo += "<h2 id=\"hdds\">" + i18n( "Disk Information" ) + "</h2>";
+     sysInfo += diskInfo();
+ 
+     osInfo();
+     sysInfo += "<h2 id=\"sysinfo\">" +i18n( "OS Information" ) + "</h2>";
+     sysInfo += "<table>";
+-    sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + m_info[OS_SYSNAME] + " " + m_info[OS_RELEASE] + " " + m_info[OS_MACHINE] + "</td></tr>";
+-    sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + m_info[OS_USER] + "@" + m_info[OS_HOSTNAME] + "</td></tr>";
+-    sysInfo += "<tr><td>" + i18n( "System:" ) +  "</td><td>" + m_info[OS_SYSTEM] + "</td></tr>";
+-
+-    if((fp =fopen ("/etc/lsb-release", "r"))!=NULL) {
+-	fclose(fp);
+-    	sysInfo += "<tr><td>" + i18n( "Version:" ) +  "</td><td>" + m_info[OS_VERSION] + "</td></tr>";
+-
+-    }
+-
++    sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSNAME]) + " " +
++        htmlQuote(m_info[OS_RELEASE]) + " " + htmlQuote(m_info[OS_MACHINE]) + "</td></tr>";
++    sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + htmlQuote(m_info[OS_USER]) + "@"
++        + htmlQuote(m_info[OS_HOSTNAME]) + "</td></tr>";
++    sysInfo += "<tr><td>" + i18n( "System:" ) +  "</td><td>" + htmlQuote(m_info[OS_SYSTEM]) + "</td></tr>";
+     sysInfo += "<tr><td>" + i18n( "KDE:" ) + "</td><td>" + KDE::versionString() + "</td></tr>";
+     sysInfo += "</table>";
+ 
+@@ -172,34 +164,30 @@
+     {
+         sysInfo += "<h2 id=\"display\">" + i18n( "Display Info" ) + "</h2>";
+         sysInfo += "<table>";
+-        sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + m_info[GFX_VENDOR] +  "</td></tr>";
+-        sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + m_info[GFX_MODEL] + "</td></tr>";
++        sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + htmlQuote(m_info[GFX_VENDOR]) +  "</td></tr>";
++        sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + htmlQuote(m_info[GFX_MODEL]) + "</td></tr>";
+ 	if (!m_info[GFX_DRIVER].isNull())
+-	  sysInfo += "<tr><td>" + i18n( "Driver:" ) + "</td><td>" + m_info[GFX_DRIVER] + "</td></tr>";
++	  sysInfo += "<tr><td>" + i18n( "Driver:" ) + "</td><td>" + htmlQuote(m_info[GFX_DRIVER]) + "</td></tr>";
+         sysInfo += "</table>";
+     }
+ 
+     sysInfo += "</div><div id=\"column1\">"; // second column
+ 
+     // OS info
++    infoMessage( i18n( "Getting OS information...." ) );
+ 
+     // common folders
+-    sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>";
+-    sysInfo += "<ul>";
+-
+-    sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( QDir::homeDirPath() ) + i18n( "My Home Folder" ) + "</a></li>";
+-    sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( QDir::rootDirPath() ) + i18n( "Root Folder" ) + "</a></li>";
+-
+-    if((fp =fopen ("/usr/lib/kde3/kio_apt.so", "r"))!=NULL) {
+-    	sysInfo += "<li><a href=\"apt:/\">" + i18n( "Repository" ) + "</a></li>";
+-	fclose(fp);
+-    }
+-	//sysInfo += "<li><a href=\"programs:/\">" + i18n( "Application" ) + "</a></li>";
+-
++    sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>"; sysInfo += "<ul>";
++    if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
++        sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(KGlobalSettings::documentPath()) ) 
++            + i18n( "My Documents" ) + "</a></li>";
++    sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::homeDirPath()) ) + i18n( "My Home Folder" ) + "</a></li>";
++    sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::rootDirPath()) ) + i18n( "Root Folder" ) + "</a></li>";
+     sysInfo += "<li><a href=\"remote:/\">" + i18n( "Network Folders" ) + "</a></li>";
+     sysInfo += "</ul>";
+ 
+     // net info
++    infoMessage( i18n( "Looking up network status..." ) );
+     int state = netInfo();
+     if (state > 1) { // assume no network manager / networkstatus
+       sysInfo += "<h2 id=\"net\">" + i18n( "Network Status" ) + "</h2>";
+@@ -208,8 +196,6 @@
+       sysInfo += "</ul>";
+     }
+ 
+-    // CPU info
+-    cpuInfo();
+     if ( !m_info[CPU_MODEL].isNull() )
+     {
+         sysInfo += "<h2 id=\"cpu\">" + i18n( "CPU Information" ) + "</h2>";
+@@ -231,30 +217,17 @@
+     }
+ 
+     // memory info
++    infoMessage( i18n( "Looking for memory information..." ) );
+     memoryInfo();
+     sysInfo += "<h2 id=\"memory\">" + i18n( "Memory Information" ) + "</h2>";
+     sysInfo += "<table>";
+     sysInfo += "<tr><td>" + i18n( "Total memory (RAM):" ) + "</td><td>" + m_info[MEM_TOTALRAM] + "</td></tr>";
+     sysInfo += "<tr><td>" + i18n( "Free memory:" ) + "</td><td>" + m_info[MEM_FREERAM] + "</td></tr>";
+     dummy = i18n( "Used Memory" );
+-    sysInfo += "<tr><td>" + i18n( "Total Swap:" ) + "</td><td>" + m_info[MEM_TOTALSWAP] + "</td></tr>";
+-    sysInfo += "<tr><td>" + i18n( " Free Swap:" ) + "</td><td>" + m_info[MEM_FREESWAP] + "</td></tr>";
++    dummy += "<tr><td>" + i18n( "Total swap:" ) + "</td><td>" + m_info[MEM_TOTALSWAP] + "</td></tr>";
++    sysInfo += "<tr><td>" + i18n( "Free swap:" ) + "</td><td>" + m_info[MEM_FREESWAP] + "</td></tr>";
+     sysInfo += "</table>";
+ 
+-  //   hw info
+-    if (!m_info[TYPE].isNull() || !m_info[MANUFACTURER].isNull() || !m_info[PRODUCT].isNull() 
+-        || !m_info[BIOSVENDOR].isNull() || !m_info[ BIOSVERSION ].isNull())
+-    {
+-        sysInfo += "<h2 id=\"hwinfo\">" +i18n( "Hardware Information" ) + "</h2>";
+-        sysInfo += "<table>";
+-        sysInfo += "<tr><td>" + i18n( "Type:" ) + "</td><td>" + m_info[ TYPE ] + "</td></tr>";
+-        sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + m_info[ MANUFACTURER ] + "</td></tr>";
+-        sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + m_info[ PRODUCT ] + "</td></tr>";
+-        sysInfo += "<tr><td>" + i18n( "Bios Vendor:" ) + "</td><td>" + m_info[ BIOSVENDOR ] + "</td></tr>";
+-        sysInfo += "<tr><td>" + i18n( "Bios Version:" ) + "</td><td>" + m_info[ BIOSVERSION ] + "</td></tr>";
+-        sysInfo += "</table>";
+-    }
+-
+     sysInfo += "</div>";
+ 
+     // Send the data
+@@ -278,11 +251,11 @@
+     unsigned long int val = 0;
+     if ( sscanf( b + strlen( key ), ": %lu", &val ) != 1 )
+         return 0;
+-    kdDebug() << "scan_one " << key << " " << val << endl;
++    kdDebug(1242) << "scan_one " << key << " " << val << endl;
+     return val;
+ }
+ 
+-static unsigned long int calculateFreeRam()
++static Q_UINT64 calculateFreeRam()
+ {
+     FILE *fd = fopen( "/proc/meminfo", "rt" );
+     if ( !fd )
+@@ -291,10 +264,10 @@
+     QTextIStream is( fd );
+     QString MemInfoBuf = is.read();
+ 
+-    unsigned long int MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
+-    unsigned long int Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
+-    unsigned long int Cached  = scan_one( MemInfoBuf.latin1(), "Cached" );
+-    unsigned long int Slab    = scan_one( MemInfoBuf.latin1(), "Slab" );
++    Q_UINT64 MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
++    Q_UINT64 Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
++    Q_UINT64 Cached  = scan_one( MemInfoBuf.latin1(), "Cached" );
++    Q_UINT64 Slab    = scan_one( MemInfoBuf.latin1(), "Slab" );
+     fclose( fd );
+ 
+     MemFree += Cached + Buffers + Slab;
+@@ -310,19 +283,19 @@
+ 
+     if ( retval !=-1 )
+     {
+-        const int mem_unit = info.mem_unit;
++        Q_UINT64 mem_unit = info.mem_unit;
+ 
+-        m_info[MEM_TOTALRAM] = formattedUnit( info.totalram * mem_unit );
+-        unsigned long int totalFree = calculateFreeRam() * 1024;
+-        kdDebug() << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
++        m_info[MEM_TOTALRAM] = formattedUnit( Q_UINT64(info.totalram) * mem_unit );
++        Q_UINT64 totalFree = calculateFreeRam() * 1024;
++        kdDebug(1242) << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
+         if ( totalFree > info.freeram * info.mem_unit || true )
+-            m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( info.freeram * mem_unit ))
++            m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( Q_UINT64(info.freeram) * mem_unit ))
+                                   .arg( formattedUnit( totalFree - info.freeram * mem_unit ));
+         else
+-            m_info[MEM_FREERAM] = formattedUnit( info.freeram * mem_unit );
++            m_info[MEM_FREERAM] = formattedUnit( Q_UINT64(info.freeram) * mem_unit );
+ 
+-        m_info[MEM_TOTALSWAP] = formattedUnit( info.totalswap * mem_unit );
+-        m_info[MEM_FREESWAP] = formattedUnit( info.freeswap * mem_unit );
++        m_info[MEM_TOTALSWAP] = formattedUnit( Q_UINT64(info.totalswap) * mem_unit );
++        m_info[MEM_FREESWAP] = formattedUnit( Q_UINT64(info.freeswap) * mem_unit );
+ 
+         m_info[SYSTEM_UPTIME] = convertSeconds( info.uptime );
+     }
+@@ -346,6 +319,7 @@
+         m_info[CPU_TEMP] =
+             readFromFile(QString("/proc/acpi/thermal_zone/%1/temperature").arg(names[i]), "temperature", ":");
+         m_info[CPU_TEMP] = m_info[CPU_TEMP].stripWhiteSpace();
++        m_info[CPU_TEMP].replace(" C",QString::fromUtf8("°C"));
+         if (!m_info[CPU_TEMP].isEmpty())
+             break;
+     }
+@@ -355,9 +329,12 @@
+          m_info[CPU_MODEL] = readFromFile( "/proc/cpuinfo", "cpu", ":" );
+ }
+ 
++
+ QString kio_sysinfoProtocol::diskInfo()
+ {
+-    QString result = "<table>";
++    QString result = "<table><tr><th>" + i18n( "Device" ) + "</th><th>" + i18n( "Filesystem" ) + "</th><th>" +
++                     i18n( "Total space" ) + "</th><th>" + i18n( "Available space" ) + "</th></tr>";
++
+     if ( fillMediaDevices() )
+     {
+         for ( QValueList<DiskInfo>::ConstIterator it = m_devices.constBegin(); it != m_devices.constEnd(); ++it )
+@@ -365,74 +342,72 @@
+             QString tooltip = i18n("Press the right mouse button for more options like Mount or Eject");
+ 
+             DiskInfo di = ( *it );
+-            QString label = di.userLabel.isEmpty() ? di.label : di.userLabel;
++            unsigned int percent = 0;
++            Q_UINT64 usage = di.total - di.avail;
++            if (di.total)
++                percent = usage / ( di.total / 100);
++
++            KURL media;
++            media.setProtocol("media");
++            media.setPath("/" + di.name);
++
++            result += QString( "<tr><td>%1 <a href=\"%2\" title=\"%7\">%3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>\n" ).
++                      arg( icon( di.iconName ) ).arg( media.htmlURL() ).arg( htmlQuote(di.label) ).arg( di.fsType ).
++                      arg( di.total ? formattedUnit( di.total) : QString::null).arg(di.mounted ?
++                              formattedUnit (di.avail ) : QString::null).arg( htmlQuote(tooltip) );
++            if (di.mounted) {
++                QColor c;
++                c.setHsv(100-percent, 180, 230);
++                result += QString("<tr><td colspan=\"4\" class=\"bar\" width=\"100%\">"
++                                  "<div class=\"filled\" style=\"width: %1%; height: 1em; background-color: %3\">"
++                                  "%2</div></td></tr>\n")
++                    .arg(percent).arg(formattedUnit(usage).replace(" ", "&nbsp;")).arg(c.name());
++            }
++        }
++    }
++    else // fall back to fstab parsing
++    {
++        FILE * fp;
++        if ( !( fp = setmntent( "/etc/fstab", "r" ) ) )
++        {
++            kdDebug(1242) << k_funcinfo << "Failed to open /etc/fstab" << endl;
++            return QString::null;
++        }
++
++#define FS_NAME        mnt_ent->mnt_fsname     // device-name
++#define FS_FILE        mnt_ent->mnt_dir        // mount-point
++#define FS_TYPE        mnt_ent->mnt_type       // fs-type
++
++        struct statfs sfs;
++        struct mntent *mnt_ent;
++        unsigned long long total, avail;
+ 
+-            unsigned long long usage,percent,peer;
+-            usage = di.total - di.avail;
+-            peer = di.total / 100;
+-
+-            peer == 0 ? percent = 0 : percent = usage / peer;
+-
+-	    if (percent < 20) {
+-	    result += QString( "<tr>"
+-                               "    <td>%1</td>"
+-                               "    <td width=\"90%\">"
+-                              "        <table width=\"100%\">"
+-                               "            <tr>"
+-                               "                    <a href=\"media:/%2\" title=\"%3\">%4</a> <b class=\"disk_text_color\"> [%5]"
+-                               "                    " + i18n("Total") + ": <b>%6</b> " + i18n("Available") + ": <b>%7</b> </b>"
+-                               "                </td>"
+-                               "                <td width=\"40%\" class=\"bar\">"
+-                               "                    <div style=\"width: %8%; height:10px;\"></div><span style=\"float:left;  padding-top:2px\">&nbsp%9&nbsp</span>"
+-                               "            </tr>"
+-                               "        </table>"
+-                               "    </td>"
+-                               "</tr>"
+-                               "<tr></tr>" ).
+-
+-				arg( icon( di.iconName, 32 ) ).
+-                                arg( di.name ).
+-                                arg( tooltip).
+-                                arg( label ).
+-                                arg( di.fsType ).
+-                                arg( formattedUnit( di.total,0 ) ).
+-                                arg( formattedUnit( di.avail,0 ) ).
+-                                arg( di.mounted ? percent : 0).
+-                                arg( di.mounted ? formattedUnit( usage ) : QString::null );
+-
+-		    }
+-
+-	    else {
+-
+-            result += QString( "<tr>"
+-                               "    <td>%1</td>"
+-                               "    <td width=\"90%\">"
+-                              "        <table width=\"100%\">"
+-                               "            <tr>"
+-                               "                    <a href=\"media:/%2\" title=\"%3\">%4</a> <b class=\"disk_text_color\"> [%5]"
+-                               "                    " + i18n("Total") + ": <b>%6</b> " + i18n("Available") + ": <b>%7</b> </b>"
+-                               "                </td>"
+-                               "                <td width=\"40%\" class=\"bar\">"
+-                               "                    <div style=\"width: %8%; height:10px;\">%9&nbsp</div>"
+-                               "            </tr>"
+-                               "        </table>"
+-                               "    </td>"
+-                               "</tr>"
+-                               "<tr></tr>" ).
+-
+-				arg( icon( di.iconName, 32 ) ).
+-                                arg( di.name ).
+-                                arg( tooltip).
+-                                arg( label ).
+-                                arg( di.fsType ).
+-                                arg( formattedUnit( di.total,0 ) ).
+-                                arg( formattedUnit( di.avail,0 ) ).
+-                                arg( di.mounted ? percent : 0).
+-                                arg( di.mounted ? formattedUnit( usage ) : QString::null );
+-		    }
++        while ( ( mnt_ent = getmntent( fp ) ) != NULL )
++        {
++            total = avail = 0;
++            if ( statfs( FS_FILE, &sfs ) == 0 )
++            {
++                total = ( unsigned long long )sfs.f_blocks * sfs.f_bsize;
++                if ( total > 0 && strcmp( FS_TYPE, "subdomainfs" ) != 0 ) // discard empty or otherwise strange devices
++                {
++                    avail = ( unsigned long long )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
++                    int lastSlash = QString( FS_NAME ).findRev( '/' );
++                    QString deviceName = lastSlash != -1 ? QString( FS_NAME ).mid( lastSlash + 1 ) : QString( FS_NAME );
++                    //kdDebug(1242) << k_funcinfo << "Device name: " << deviceName << endl;
++                    QString model = deviceName.left( deviceName.length() - 1 );
++                    model = readFromFile( "/proc/ide/" + model + "/model" );
++                    QString devIcon = icon( iconForDevice( deviceName ), KIcon::SizeSmall );
++                    result += QString( "<tr><td>%1 <a href=\"file:%2\" title=\"%7\">%3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>" )
++                              .arg( devIcon ).arg( FS_FILE ).arg( FS_FILE ).arg( FS_TYPE ).arg( formattedUnit( total ) )
++                              .arg( formattedUnit( avail ) ).arg( model );
++                }
++            }
+         }
++        endmntent( fp );
+     }
++
+     result += "</table>";
++
+     return result;
+ }
+ 
+@@ -442,12 +417,12 @@
+     // query kded.networkstatus.status(QString host)
+     DCOPRef nsd( "kded", "networkstatus" );
+     nsd.setDCOPClient( m_dcopClient );
+-    DCOPReply reply = nsd.call( "status", QString( "www.google.com" ) );
++    DCOPReply reply = nsd.call( "status", QString( "www.mandriva.com" ) );
+ 
+     if ( reply.isValid() )
+         return reply;
+ 
+-    kdDebug() << k_funcinfo << "Reply is invalid" << endl;
++    kdDebug(1242) << k_funcinfo << "Reply is invalid" << endl;
+ 
+     return 0;
+ }
+@@ -539,7 +514,6 @@
+ #endif
+ }
+ 
+-#define INFO_DRI "/proc/dri/0/name"
+ 
+ bool kio_sysinfoProtocol::glInfo()
+ {
+@@ -621,7 +595,6 @@
+     return true;
+ }
+ 
+-
+ QString kio_sysinfoProtocol::netStatus( int code ) const
+ {
+     if ( code == 1 || code == 2 )
+@@ -641,7 +614,8 @@
+ QString kio_sysinfoProtocol::icon( const QString & name, int size ) const
+ {
+     QString path = KGlobal::iconLoader()->iconPath( name, -size );
+-    return QString( "<img src=\"file:%1\" width=\"%2\" height=\"%3\" valign=\"center\"/>" ).arg( path ).arg( size ).arg( size );
++    return QString( "<img src=\"file:%1\" width=\"%2\" height=\"%3\" valign=\"bottom\"/>" ).arg(
++            htmlQuote(path) ).arg( size ).arg( size );
+ }
+ 
+ QString kio_sysinfoProtocol::iconForDevice( const QString & name ) const
+@@ -659,7 +633,6 @@
+ 
+ void kio_sysinfoProtocol::osInfo()
+ {
+-    FILE *fp;
+     struct utsname uts;
+     uname( &uts );
+     m_info[ OS_SYSNAME ] = uts.sysname;
+@@ -670,14 +643,8 @@
+ 
+     m_info[ OS_USER ] = KUser().loginName();
+ 
+-    if((fp =fopen ("/etc/lsb-release", "r"))==NULL)
+-        m_info[ OS_SYSTEM ] = readFromFile( "/etc/issue" );
+-   else
+-  {      fclose(fp);
+-           m_info[ OS_SYSTEM ] = readFromFile( "/etc/lsb-release", "DISTRIB_DESCRIPTION", "=" );
+-	    m_info[ OS_VERSION ] = readFromFile( "/etc/lsb-release", "DISTRIB_CODENAME", "=" );
+-  }
+-
++    m_info[ OS_SYSTEM ] = readFromFile( "/etc/mandriva-release" );
++    m_info[ OS_SYSTEM ].replace("X86-64","x86_64");
+ }
+ 
+ static const KCmdLineOptions options[] =
+@@ -698,10 +665,10 @@
+       KCmdLineArgs::addCmdLineOptions( options );
+       KApplication app( false, true );
+ 
+-        kdDebug(7101) << "*** Starting kio_sysinfo " << endl;
++        kdDebug(1242) << "*** Starting kio_sysinfo " << endl;
+ 
+         if (argc != 4) {
+-            kdDebug(7101) << "Usage: kio_sysinfo  protocol domain-socket1 domain-socket2" << endl;
++            kdDebug(1242) << "Usage: kio_sysinfo  protocol domain-socket1 domain-socket2" << endl;
+             exit(-1);
+         }
+ 
+@@ -710,7 +677,7 @@
+         kio_sysinfoProtocol slave( args->arg(1), args->arg(2));
+         slave.dispatchLoop();
+ 
+-        kdDebug(7101) << "*** kio_sysinfo Done" << endl;
++        kdDebug(1242) << "*** kio_sysinfo Done" << endl;
+         return 0;
+     }
+ }
+@@ -723,15 +690,15 @@
+     if ( devices.isEmpty() )
+         return false;
+ 
+-    kdDebug() << devices << endl;
++    kdDebug(1242) << devices << endl;
+ 
+     m_devices.clear();
+ 
+     LibHalContext  *m_halContext = libhal_ctx_new();
+     if (!m_halContext)
+       {
+-	kdDebug(1219) << "Failed to initialize HAL!" << endl;
+-	return false;
++	kdDebug(1242) << "Failed to initialize HAL!" << endl;
++        return false;
+       }
+ 
+     DBusError error;
+@@ -786,30 +753,26 @@
+         struct statfs sfs;
+         if ( di.mounted && statfs( QFile::encodeName( di.mountPoint ), &sfs ) == 0 )
+         {
+-            di.total = ( unsigned long long ) sfs.f_blocks * sfs.f_bsize;
++            di.total = ( unsigned long long )sfs.f_blocks * sfs.f_bsize;
+             di.avail = ( unsigned long long )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
+         } else if (m_halContext && di.id.startsWith("/org/freedesktop/Hal/" ) )
+-        {
+-            dbus_error_init(&error);
+-            di.total = libhal_device_get_property_uint64(m_halContext, di.id.latin1(), "volume.size", &error);
+-            if (dbus_error_is_set(&error))
+-                di.total = 0;
+-            }
++	{
++	  dbus_error_init(&error);
++	  di.total = libhal_device_get_property_uint64(m_halContext, di.id.latin1(), "volume.size", &error);
++	  if (dbus_error_is_set(&error))
++	    di.total = 0;
++	}
+ 
+-            di.model = libhal_device_get_property_string(  m_halContext, di.id.latin1(  ), "block.storage_device", &error );
+-            di.model = libhal_device_get_property_string( m_halContext, di.model.latin1( ), "storage.model", &error );
++        // guess the model
++        QString ideName = di.name;
++        ideName.truncate( 3 );
++        di.model = readFromFile( "/proc/ide/" + ideName + "/model" );
+ 
+-            ++it; // skip separator
++        ++it; // skip separator
+ 
+-            m_devices.append( di );
++        m_devices.append( di );
+     }
+ 
+-    m_info[PRODUCT ] = libhal_device_get_property_string(  m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.system.product", &error );
+-    m_info[MANUFACTURER ] = libhal_device_get_property_string(  m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.system.manufacturer", &error );
+-    m_info[TYPE] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.chassis.type", &error );
+-    m_info[BIOSVENDOR] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.bios.vendor", &error );
+-    m_info[BIOSVERSION] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.bios.version", &error );
+-
+     libhal_ctx_free(m_halContext);
+ 
+     return true;
+diff -u -r kio-sysinfo-1.8.2/src/sysinfo.h kio-sysinfo-10.3/src/sysinfo.h
+--- kio-sysinfo-1.8.2/src/sysinfo.h	2007-08-21 08:13:36.000000000 -0300
++++ kio-sysinfo-10.3/src/sysinfo.h	2007-08-14 13:10:29.000000000 -0300
+@@ -51,7 +51,7 @@
+     QString iconName;
+ 
+     // own stuff
+-    unsigned long long total, avail; // space on device
++    Q_UINT64 total, avail; // space on device
+     QString model;              // physical device model (name)
+ };
+ 
+@@ -78,12 +78,11 @@
+         MEM_FREERAM,
+         MEM_TOTALSWAP,
+         MEM_FREESWAP,
+-        STEPPING,               //speedstep
+         SYSTEM_UPTIME,          // in seconds
+         CPU_MODEL,
+         CPU_SPEED,              // in MHz
+-	CPU_CORES,
+-	CPU_TEMP,
++        CPU_CORES,
++        CPU_TEMP,
+         OS_SYSNAME,             // man 2 uname
+         OS_RELEASE,
+         OS_VERSION,
+@@ -94,31 +93,16 @@
+         GFX_VENDOR,              // Display stuff
+         GFX_MODEL,
+         GFX_DRIVER,
+-        SYSINFO_LAST,
+-        PRODUCT,
+-        MANUFACTURER,
+-        TYPE,
+-        BIOSVENDOR,
+-        BIOSVERSION
++        SYSINFO_LAST
+     };
+ 
+ private:
+     /**
+-     * Read sysinfo from (proc) filesystem. The data is assumed to be separated by newlines, with key:value pairs
+-     *
+-     * @param filename file to read from
+-     * @param info requested field (if empty, return the first line from the file)
+-     * @param sep separator
+-     * NOT USED YET
+-     */
+- //   QString readFromFile( const QString & filename, const QString & info = QString::null, const char * sep = 0 ) const;
+-
+-    /**
+      * Gather basic memory info
+      */
+     void memoryInfo();
+ 
+-     /**
++    /**
+      * Gather CPU info
+      */
+     void cpuInfo();
+diff -u -r kio-sysinfo-1.8.2/admin/acinclude.m4.in kio-sysinfo-10.3/admin/acinclude.m4.in
+--- kio-sysinfo-1.8.2/admin/acinclude.m4.in	2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/acinclude.m4.in	2007-03-19 13:45:09.000000000 -0300
+@@ -983,7 +983,7 @@
+   X_INCLUDES="-I$x_includes"
+ fi
+ 
+-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
++if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
+   X_LDFLAGS=""
+   x_libraries="/usr/lib"; dnl better than nothing :-
+  else
+@@ -3198,7 +3198,7 @@
+         case $host in
+           *-*-linux-gnu)	
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
+             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+           ;;
+@@ -4624,12 +4624,14 @@
+ 
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.4",
+-   [KDE_CHECK_PYTHON_INTERN("2.3", 
+-     [KDE_CHECK_PYTHON_INTERN("2.2", 
+-       [KDE_CHECK_PYTHON_INTERN("2.1", 
+-         [KDE_CHECK_PYTHON_INTERN("2.0", 
+-           [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++  KDE_CHECK_PYTHON_INTERN("2.5",
++    [KDE_CHECK_PYTHON_INTERN("2.4",
++     [KDE_CHECK_PYTHON_INTERN("2.3", 
++       [KDE_CHECK_PYTHON_INTERN("2.2", 
++         [KDE_CHECK_PYTHON_INTERN("2.1", 
++           [KDE_CHECK_PYTHON_INTERN("2.0", 
++             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++           ])
+          ])
+        ])
+      ])
+@@ -5213,9 +5215,10 @@
+       for dir in $javadirs; do
+           dnl Check for the java executable
+ 	  if test -x "$dir/java"; then
++	      sane_path=$(cd $dir; /bin/pwd)
+ 	      dnl And also check for a libjvm.so somewhere under there
+ 	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
+-              if test "$dir" != "/usr/bin"; then
++              if test "$sane_path" != "/usr/bin"; then
+                   libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
+ 		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
+ 		  jredirs="$jredirs $dir"
+Somente em kio-sysinfo-1.8.2/admin: cvs-clean.pl
+diff -u -r kio-sysinfo-1.8.2/admin/cvs.sh kio-sysinfo-10.3/admin/cvs.sh
+--- kio-sysinfo-1.8.2/admin/cvs.sh	2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/cvs.sh	2007-05-14 04:16:15.000000000 -0300
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
+@@ -316,7 +316,7 @@
+    fi
+ fi
+ if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
+-     VERSION="\"3.5.4\""
++     VERSION="\"3.5.7\""
+ fi
+ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
+    modulename=`pwd`; 
+diff -u -r kio-sysinfo-1.8.2/admin/detect-autoconf.pl kio-sysinfo-10.3/admin/detect-autoconf.pl
+--- kio-sysinfo-1.8.2/admin/detect-autoconf.pl	2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/detect-autoconf.pl	2007-08-14 10:26:09.000000000 -0300
+@@ -46,6 +46,8 @@
+ 
+ 	    ($version) = $file =~ /$prefix\/$program-?(.*)$/;
+ 	    $version =~ s/-|\.//g;
++	    # Don't check the -wrapper ones
++	    next if $version eq "wrapper";
+ 
+ 	    # Special case some programs to make sure it has a minimum version.
+ 	    if (not $version and exists $minimumVersions{$program})
+Somente em kio-sysinfo-1.8.2/admin: detect-autoconf.sh
+diff -u -r kio-sysinfo-1.8.2/admin/libtool.m4.in kio-sysinfo-10.3/admin/libtool.m4.in
+--- kio-sysinfo-1.8.2/admin/libtool.m4.in	2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/libtool.m4.in	2007-04-23 16:19:55.000000000 -0300
+@@ -1424,7 +1424,7 @@
+   libsuff=
+   if test "x$LINUX_64_MODE" = x64; then
+     # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
++    if test -d /lib64 -a ! -h /lib64; then
+       libsuff=64
+     fi
+   fi
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch
new file mode 100644
index 000000000..c4fe2ef3f
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch
@@ -0,0 +1,890 @@
+diff -u -r -N kio-sysinfo-1.8.2/configure kio-sysinfo-1.8.2.uz/configure
+--- kio-sysinfo-1.8.2/configure	2007-08-20 12:18:47.000000000 +0200
++++ kio-sysinfo-1.8.2.uz/configure	2007-08-23 17:11:06.000000000 +0200
+@@ -32988,6 +32988,8 @@
+ 
+ ac_config_files="$ac_config_files po/tr/Makefile"
+ 
++ac_config_files="$ac_config_files po/uz/Makefile"
++
+ ac_config_files="$ac_config_files src/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+@@ -33612,6 +33614,7 @@
+     "po/pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;;
+     "po/ru/Makefile") CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;;
+     "po/tr/Makefile") CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;;
++    "po/uz/Makefile") CONFIG_FILES="$CONFIG_FILES po/uz/Makefile" ;;
+     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ 
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+diff -u -r -N kio-sysinfo-1.8.2/po/Makefile.in kio-sysinfo-1.8.2.uz/po/Makefile.in
+--- kio-sysinfo-1.8.2/po/Makefile.in	2007-08-20 12:14:51.000000000 +0200
++++ kio-sysinfo-1.8.2.uz/po/Makefile.in	2007-08-23 17:17:39.000000000 +0200
+@@ -314,7 +314,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. tr nl it pt_BR es de fr pl cs el hu ru
++SUBDIRS =. tr nl it pt_BR es de fr pl cs el hu ru uz
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+diff -u -r -N kio-sysinfo-1.8.2/po/uz/kio_sysinfo.po kio-sysinfo-1.8.2.uz/po/uz/kio_sysinfo.po
+--- kio-sysinfo-1.8.2/po/uz/kio_sysinfo.po	1970-01-01 01:00:00.000000000 +0100
++++ kio-sysinfo-1.8.2.uz/po/uz/kio_sysinfo.po	2007-08-22 23:23:20.000000000 +0200
+@@ -0,0 +1,244 @@
++# translation of kio_sysinfo-uz.po to Uzbek
++# This file is put in the public domain.
++#
++# Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2007.
++msgid ""
++msgstr ""
++"Project-Id-Version: kio_sysinfo-uz\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2006-11-01 16:28+0300\n"
++"PO-Revision-Date: 2007-07-22 00:07+0200\n"
++"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
++"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
++
++#: ksysinfopart.cpp:72
++msgid "KSysinfo"
++msgstr "KSysinfo"
++
++#: sysinfo.cpp:67
++msgid "%1 GB"
++msgstr "%1 Гб"
++
++#: sysinfo.cpp:69
++msgid "%1 MB"
++msgstr "%1 Мб"
++
++#: sysinfo.cpp:71
++msgid "%1 KB"
++msgstr "%1 Кб"
++
++#: sysinfo.cpp:107 sysinfo.cpp:101
++msgid "My Computer"
++msgstr "Компьютер"
++
++#: sysinfo.cpp:102
++msgid "Folders, Harddisks, Removable Devices, System Information and more..."
++msgstr "Жилдлар, қаттиқ дисклар, олиб бўладиган ускуналар, тизим ҳақида маълумот ва ҳоказо..."
++
++#: sysinfo.cpp:108
++msgid "Looking for disk information..."
++msgstr "Диск ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:109
++msgid "Disks Information"
++msgstr "Диск ҳақида маълумот"
++
++#: sysinfo.cpp:113
++msgid "OS Information"
++msgstr "ОТ ҳақида маълумот"
++
++#: sysinfo.cpp:115
++msgid "OS:"
++msgstr "ОТ:"
++
++#: sysinfo.cpp:116
++msgid "Current user:"
++msgstr "Жорий фойдаланувчи:"
++
++#: sysinfo.cpp:117
++msgid "System:"
++msgstr "Тизим:"
++
++#: sysinfo.cpp:118
++msgid "KDE:"
++msgstr "KDE:"
++
++#: sysinfo.cpp:124
++msgid "Display Info"
++msgstr "Дисплей ҳақида маълумот"
++
++#: sysinfo.cpp:126
++msgid "Vendor:"
++msgstr "Ишлаб чиқарувчи:"
++
++#: sysinfo.cpp:127
++msgid "Model:"
++msgstr "Русуми:"
++
++#: sysinfo.cpp:129
++msgid "Driver:"
++msgstr "Драйвер:"
++
++#: sysinfo.cpp:136
++msgid "Getting OS information...."
++msgstr "ОТ ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:139
++msgid "Common Folders"
++msgstr "Умумий жилдлар"
++
++#: sysinfo.cpp:143
++msgid "My Home Folder"
++msgstr "Уй жилди"
++
++#: sysinfo.cpp:144
++msgid "Root Folder"
++msgstr "Туб жилди"
++
++#: sysinfo.cpp:145
++msgid "Network Folders"
++msgstr "Тармоқ жилдлари"
++
++#: sysinfo.cpp:149
++msgid "Looking up network status..."
++msgstr "Тармоқнинг ҳолати аниқланяпти..."
++
++#: sysinfo.cpp:152
++msgid "Network Status"
++msgstr "Тармоқнинг ҳолати"
++
++#: sysinfo.cpp:159
++msgid "Looking for CPU information..."
++msgstr "Процессор ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:163
++msgid "CPU Information"
++msgstr "Процессор ҳақида маълумот"
++
++#: sysinfo.cpp:165
++msgid "Processor (CPU):"
++msgstr "Процессор:"
++
++#: sysinfo.cpp:166
++msgid "Speed:"
++msgstr "Тезлик:"
++
++#: sysinfo.cpp:167
++msgid "%1 MHz"
++msgstr "%1 МГц"
++
++#: sysinfo.cpp:172
++msgid "Looking for memory information..."
++msgstr "Хотира ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:174
++msgid "Memory Information"
++msgstr "Хотира ҳақида маълумот"
++
++#: sysinfo.cpp:176
++msgid "Total memory (RAM):"
++msgstr "Жами хотира:"
++
++#: sysinfo.cpp:177
++msgid "Free memory:"
++msgstr "Бўш хотира:"
++
++#: sysinfo.cpp:178
++msgid "Used Memory"
++msgstr "Ишлатилган хотира"
++
++#: sysinfo.cpp:179
++msgid "Total swap:"
++msgstr "Жами своп:"
++
++#: sysinfo.cpp:180
++msgid "Free swap:"
++msgstr "Бўш своп:"
++
++#: sysinfo.cpp:184
++msgid "Looking for hardware information..."
++msgstr "Асбоб-ускуналар ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:186
++msgid "Hardware Information"
++msgstr "Асбоб-ускуналар ҳақида маълумот"
++
++#: sysinfo.cpp:191
++msgid "Bios Vendor:"
++msgstr "Bios ишлаб чиқарувчиси:"
++
++#: sysinfo.cpp:192
++msgid "Bios Version:"
++msgstr "Bios версияси:"
++
++#: sysinfo.cpp:256
++msgid "%1 (+ %2 Caches)"
++msgstr "%1 (+ %2 кэш)"
++
++#: sysinfo.cpp:288
++msgid "Device"
++msgstr "Ускуна"
++
++#: sysinfo.cpp:288
++msgid "Filesystem"
++msgstr "Файл тизими"
++
++#: sysinfo.cpp:289
++msgid "Total space"
++msgstr "Жами жой"
++
++#: sysinfo.cpp:289
++msgid "Available space"
++msgstr "Бўш жой"
++
++#: sysinfo.cpp:295
++msgid "Press the right mouse button for more options like Mount or Eject"
++msgstr "Улаш ёки узиш буйруқлар учун сичқончанинг ўнг тугмасини босинг"
++
++#: sysinfo.cpp:478
++msgid "%1 (3D Support)"
++msgstr "%1 (3D имкониятлар)"
++
++#: sysinfo.cpp:480
++msgid "%1 (No 3D Support)"
++msgstr "%1 (3D имкониятларсиз)"
++
++#: sysinfo.cpp:491
++msgid "Network is <strong>unreachable</strong>"
++msgstr "Тармоққа <strong>уланмаган</strong>"
++
++#: sysinfo.cpp:493
++msgid "You are <strong>offline</strong>"
++msgstr "<strong>Офлайн</strong>"
++
++#: sysinfo.cpp:495
++msgid "Network is <strong>shutting down</strong>"
++msgstr "Тармоқдан <strong>узилмоқда</strong>"
++
++#: sysinfo.cpp:497
++msgid "<strong>Establishing</strong> connection to the network"
++msgstr "Тармоққа <strong>уланмоқда</strong>"
++
++#: sysinfo.cpp:499
++msgid "You are <strong>online</strong>"
++msgstr "<strong>Онлайн</strong>"
++
++#: sysinfo.cpp:501
++msgid "Unknown network status"
++msgstr "Тармоқнинг ҳолати номаълум"
++
++msgid "Total"
++msgstr "Жами"
++
++msgid "Available"
++msgstr "Бўш"
++
++msgid "Total Swap:"
++msgstr "Жами своп:"
++
++msgid " Free Swap:"
++msgstr "Бўш своп:"
+diff -u -r -N kio-sysinfo-1.8.2/po/uz/Makefile.am kio-sysinfo-1.8.2.uz/po/uz/Makefile.am
+--- kio-sysinfo-1.8.2/po/uz/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ kio-sysinfo-1.8.2.uz/po/uz/Makefile.am	2007-08-22 23:23:20.000000000 +0200
+@@ -0,0 +1,3 @@
++KDE_LANG=uz
++
++POFILES=AUTO
+diff -u -r -N kio-sysinfo-1.8.2/po/uz/Makefile.in kio-sysinfo-1.8.2.uz/po/uz/Makefile.in
+--- kio-sysinfo-1.8.2/po/uz/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ kio-sysinfo-1.8.2.uz/po/uz/Makefile.in	2007-08-22 23:24:22.000000000 +0200
+@@ -0,0 +1,599 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++subdir = po/uz
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++GREP = @GREP@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
++KDE_INCLUDES = @KDE_INCLUDES@
++KDE_LDFLAGS = @KDE_LDFLAGS@
++KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
++KDE_MT_LIBS = @KDE_MT_LIBS@
++KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
++KDE_PLUGIN = @KDE_PLUGIN@
++KDE_RPATH = @KDE_RPATH@
++KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
++KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
++KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
++KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
++KDE_USE_FPIE = @KDE_USE_FPIE@
++KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
++KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
++KDE_USE_PIE = @KDE_USE_PIE@
++KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
++LDFLAGS = @LDFLAGS@
++LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
++LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
++LIBCOMPAT = @LIBCOMPAT@
++LIBCRYPT = @LIBCRYPT@
++LIBDL = @LIBDL@
++LIBJPEG = @LIBJPEG@
++LIBOBJS = @LIBOBJS@
++LIBPNG = @LIBPNG@
++LIBPTHREAD = @LIBPTHREAD@
++LIBRESOLV = @LIBRESOLV@
++LIBS = @LIBS@
++LIBSM = @LIBSM@
++LIBSOCKET = @LIBSOCKET@
++LIBTOOL = @LIBTOOL@
++LIBUCB = @LIBUCB@
++LIBUTIL = @LIBUTIL@
++LIBZ = @LIBZ@
++LIB_KAB = @LIB_KAB@
++LIB_KABC = @LIB_KABC@
++LIB_KDECORE = @LIB_KDECORE@
++LIB_KDED = @LIB_KDED@
++LIB_KDEPIM = @LIB_KDEPIM@
++LIB_KDEPRINT = @LIB_KDEPRINT@
++LIB_KDEUI = @LIB_KDEUI@
++LIB_KDNSSD = @LIB_KDNSSD@
++LIB_KFILE = @LIB_KFILE@
++LIB_KFM = @LIB_KFM@
++LIB_KHTML = @LIB_KHTML@
++LIB_KIMPROXY = @LIB_KIMPROXY@
++LIB_KIO = @LIB_KIO@
++LIB_KJS = @LIB_KJS@
++LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
++LIB_KPARTS = @LIB_KPARTS@
++LIB_KSPELL = @LIB_KSPELL@
++LIB_KSYCOCA = @LIB_KSYCOCA@
++LIB_KUNITTEST = @LIB_KUNITTEST@
++LIB_KUTILS = @LIB_KUTILS@
++LIB_POLL = @LIB_POLL@
++LIB_QPE = @LIB_QPE@
++LIB_QT = @LIB_QT@
++LIB_SMB = @LIB_SMB@
++LIB_X11 = @LIB_X11@
++LIB_XEXT = @LIB_XEXT@
++LIB_XRENDER = @LIB_XRENDER@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
++MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
++MCOPIDL = @MCOPIDL@
++MEINPROC = @MEINPROC@
++MOC = @MOC@
++MSGFMT = @MSGFMT@
++NOOPT_CFLAGS = @NOOPT_CFLAGS@
++NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PERL = @PERL@
++QTE_NORTTI = @QTE_NORTTI@
++QT_INCLUDES = @QT_INCLUDES@
++QT_LDFLAGS = @QT_LDFLAGS@
++RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++TOPSUBDIRS = @TOPSUBDIRS@
++UIC = @UIC@
++UIC_TR = @UIC_TR@
++USER_INCLUDES = @USER_INCLUDES@
++USER_LDFLAGS = @USER_LDFLAGS@
++USE_EXCEPTIONS = @USE_EXCEPTIONS@
++USE_RTTI = @USE_RTTI@
++USE_THREADS = @USE_THREADS@
++VERSION = @VERSION@
++WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++XMLLINT = @XMLLINT@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_INCLUDES = @X_INCLUDES@
++X_LDFLAGS = @X_LDFLAGS@
++X_PRE_LIBS = @X_PRE_LIBS@
++X_RPATH = @X_RPATH@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++all_includes = @all_includes@
++all_libraries = @all_libraries@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++include_ARTS_FALSE = @include_ARTS_FALSE@
++include_ARTS_TRUE = @include_ARTS_TRUE@
++include_x11_FALSE = @include_x11_FALSE@
++include_x11_TRUE = @include_x11_TRUE@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++kde_appsdir = @kde_appsdir@
++kde_bindir = @kde_bindir@
++kde_confdir = @kde_confdir@
++kde_datadir = @kde_datadir@
++kde_htmldir = @kde_htmldir@
++kde_icondir = @kde_icondir@
++kde_includes = @kde_includes@
++kde_kcfgdir = @kde_kcfgdir@
++kde_libraries = @kde_libraries@
++kde_libs_htmldir = @kde_libs_htmldir@
++kde_libs_prefix = @kde_libs_prefix@
++kde_locale = @kde_locale@
++kde_mimedir = @kde_mimedir@
++kde_moduledir = @kde_moduledir@
++kde_qtver = @kde_qtver@
++kde_servicesdir = @kde_servicesdir@
++kde_servicetypesdir = @kde_servicetypesdir@
++kde_sounddir = @kde_sounddir@
++kde_styledir = @kde_styledir@
++kde_templatesdir = @kde_templatesdir@
++kde_wallpaperdir = @kde_wallpaperdir@
++kde_widgetdir = @kde_widgetdir@
++kdeinitdir = @kdeinitdir@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++qt_includes = @qt_includes@
++qt_libraries = @qt_libraries@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target = @target@
++target_alias = @target_alias@
++target_cpu = @target_cpu@
++target_os = @target_os@
++target_vendor = @target_vendor@
++unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
++unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++x_includes = @x_includes@
++x_libraries = @x_libraries@
++xdg_appsdir = @xdg_appsdir@
++xdg_directorydir = @xdg_directorydir@
++xdg_menudir = @xdg_menudir@
++KDE_LANG = uz
++#>- POFILES = AUTO
++#>+ 2
++POFILES = kio_sysinfo.po
++GMOFILES = kio_sysinfo.gmo
++#>- all: all-am
++#>+ 1
++all: all-nls docs-am  all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/uz/Makefile'; \
++#>- 	cd $(top_srcdir) && \
++#>- 	  $(AUTOMAKE) --gnu  po/uz/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/uz/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  po/uz/Makefile
++	cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure:  $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++#>- distdir: $(DISTFILES)
++#>+ 1
++distdir: distdir-nls  $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
++	  if test -d $$d/$$file; then \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile
++installdirs:
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++#>- uninstall: uninstall-am
++#>+ 1
++uninstall: uninstall-nls  uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++#>- clean: clean-am
++#>+ 1
++clean: kde-rpo-clean  clean-am
++
++#>- clean-am: clean-generic clean-libtool mostlyclean-am
++#>+ 1
++clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++#>- install-data-am:
++#>+ 1
++install-data-am: install-nls 
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++#>- maintainer-clean: maintainer-clean-am
++#>+ 1
++maintainer-clean: clean-nls  maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++	uninstall-info-am
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++
++#>+ 2
++KDE_DIST=kio_sysinfo.po Makefile.in Makefile.am 
++
++#>+ 4
++kio_sysinfo.gmo: kio_sysinfo.po
++	rm -f kio_sysinfo.gmo; $(GMSGFMT) -o kio_sysinfo.gmo $(srcdir)/kio_sysinfo.po
++	test ! -f kio_sysinfo.gmo || touch kio_sysinfo.gmo
++
++#>+ 3
++clean-nls:
++	-rm -f  kio_sysinfo.gmo
++
++#>+ 10
++install-nls:
++	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
++	@for base in kio_sysinfo ; do \
++	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
++	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
++	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
++	  fi ;\
++	done
++
++
++#>+ 3
++uninstall-nls:
++	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_sysinfo.mo
++
++#>+ 2
++all-nls: $(GMOFILES)
++
++#>+ 8
++distdir-nls:$(GMOFILES)
++	for file in $(POFILES); do \
++	  cp $(srcdir)/$$file $(distdir); \
++	done
++	for file in $(GMOFILES); do \
++	  cp $(srcdir)/$$file $(distdir); \
++	done
++
++#>+ 2
++docs-am:
++
++#>+ 15
++force-reedit:
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/uz/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  po/uz/Makefile
++	cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in
++
++
++#>+ 21
++clean-bcheck: 
++	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-am
++
++bcheck-am:
++	@for i in ; do \
++	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++	        echo "$$i"; \
++	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++	            rm -f $$i.bchecktest.cc; exit 1; \
++	        fi ; \
++	        echo "" >> $$i.bchecktest.cc.class; \
++	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++	        rm -f a.out; \
++	    fi ; \
++	done
++
++
++#>+ 3
++final:
++	$(MAKE) all-am
++
++#>+ 3
++final-install:
++	$(MAKE) install-am
++
++#>+ 3
++no-final:
++	$(MAKE) all-am
++
++#>+ 3
++no-final-install:
++	$(MAKE) install-am
++
++#>+ 3
++kde-rpo-clean:
++	-rm -f *.rpo
++
++#>+ 3
++nmcheck: 
++nmcheck-am: nmcheck
diff --git a/mandriva/2010.2/applications/kio-sysinfo/sysinfo.png b/mandriva/2010.2/applications/kio-sysinfo/sysinfo.png
new file mode 100644
index 000000000..2e88eacb3
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/sysinfo.png