commit kdebase3-SuSE

31 May 2006

Hello community,

here is the log from the commit of package kdebase3-SuSE
checked in at Wed May 31 17:09:08 CEST 2006.

--------

--- KDE/kdebase3-SuSE/kdebase3-SuSE.changes	2006-05-18 13:08:49.000000000 +0200
+++ kdebase3-SuSE/kdebase3-SuSE.changes	2006-05-31 12:00:20.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 31 11:59:45 CEST 2006 - coolo@suse.de
+
+- update from SVN to fix:
+    - sysinfo:/ displays wrong filesystem sizes (#176828)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.hPw2kS/_old	2006-05-31 17:06:57.000000000 +0200
+++ /var/tmp/diff_new_pack.hPw2kS/_new	2006-05-31 17:06:57.000000000 +0200
@@ -31,7 +31,7 @@
 PreReq:         %fillup_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        10.2
-Release:        2
+Release:        3
 Source0:        kdebase-SuSE-%{version}.tar.bz2
 Source2:        kdebase3-SuSE-displaymanager.fillup
 Source3:        kdebase3-SuSE-windowmanager.fillup
@@ -185,6 +185,9 @@
 /var/lib/kde-profiles
 
 %changelog -n kdebase3-SuSE
+* Wed May 31 2006 - coolo@suse.de
+- update from SVN to fix:
+- sysinfo:/ displays wrong filesystem sizes (#176828)
 * Thu May 18 2006 - coolo@suse.de
 - enable Screensaver locking by default for non-autologin users
   (#58530)

++++++ kdebase-SuSE-10.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/admin/cvs.sh new/kdebase-SuSE/admin/cvs.sh
--- old/kdebase-SuSE/admin/cvs.sh	2006-03-17 22:30:20.000000000 +0100
+++ new/kdebase-SuSE/admin/cvs.sh	2006-05-23 12:01:43.000000000 +0200
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.2\""
+     VERSION="\"3.5.3\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kdmrc new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kdmrc
--- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kdmrc	2006-01-28 16:05:55.000000000 +0100
+++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kdmrc	2006-05-23 14:03:59.000000000 +0200
@@ -84,7 +84,7 @@
 # LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
 # otherwise, it should not be necessary very often.
 # Default is ""
-ExportList=LANG
+ExportList=LANG,XCURSOR_THEME
 # A character device KDM should read entropy from.
 # Empty means use the system's preferred entropy device.
 # Default is ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/hu/kio_sysinfo.po new/kdebase-SuSE/po/hu/kio_sysinfo.po
--- old/kdebase-SuSE/po/hu/kio_sysinfo.po	2006-05-18 10:27:47.000000000 +0200
+++ new/kdebase-SuSE/po/hu/kio_sysinfo.po	2006-05-23 10:36:41.000000000 +0200
@@ -3,25 +3,25 @@
 # Copyright (C) 2005 SUSE Linux Products GmbH.
 # Copyright (C) 2002 SuSE Linux AG.
 # Copyright (C) 2000, 2001 SuSE GmbH.
+# Kéménczy Kálmán, 2006.
 # Marcel Hilzinger <hili@suselinux.hu>, 2001.
 # Sári Gábor <saga@tux.hu>, 2000.
 # Steve Varadi <svaradi@usa.com>, 2000.
 # Zoltán Levárdy <pogacsa@programmer.net>, 1999.
 # Kalman Kemenczy <kkemenczy@novell.com>, 2006.
-# Kéménczy Kálmán, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kio_sysinfo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-18 10:26+0200\n"
-"PO-Revision-Date: 2006-03-20 17:48+0100\n"
-"Last-Translator: Kéménczy Kálmán\n"
+"POT-Creation-Date: 2006-03-13 15:12+0100\n"
+"PO-Revision-Date: 2006-05-23 10:03+0200\n"
+"Last-Translator: Kalman Kemenczy <kkemenczy@novell.com>\n"
 "Language-Team: Hungarian <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11\n"
 
 #: ksysinfopart.cpp:72
 msgid "KSysinfo"
@@ -135,106 +135,106 @@
 msgid "Looking for CPU information..."
 msgstr "CPU adatok keresése..."
 
-#: sysinfo.cpp:171
+#: sysinfo.cpp:169
 msgid "CPU Information"
 msgstr "CPU adatok "
 
-#: sysinfo.cpp:173
+#: sysinfo.cpp:171
 msgid "Processor (CPU):"
 msgstr "Processzor (CPU):"
 
-#: sysinfo.cpp:174
+#: sysinfo.cpp:172
 msgid "Speed:"
 msgstr "Sebesség:"
 
 # /usr/lib/YaST2/clients/inst_config_x11.ycp:145
-#: sysinfo.cpp:175
+#: sysinfo.cpp:173
 msgid "%1 MHz"
 msgstr "%1 MHz"
 
-#: sysinfo.cpp:180
+#: sysinfo.cpp:177
 msgid "Looking for memory information..."
 msgstr "Memóriainformációk keresése..."
 
-#: sysinfo.cpp:182
+#: sysinfo.cpp:179
 msgid "Memory Information"
 msgstr "Memóriainformációk "
 
-#: sysinfo.cpp:184
+#: sysinfo.cpp:181
 msgid "Total memory (RAM):"
 msgstr "Összmemória (RAM):"
 
-#: sysinfo.cpp:185
+#: sysinfo.cpp:182
 msgid "Free memory:"
 msgstr "Szabad memória:"
 
-#: sysinfo.cpp:186
+#: sysinfo.cpp:183
 msgid "Used Memory"
 msgstr "Felhasznált memória:"
 
-#: sysinfo.cpp:187
+#: sysinfo.cpp:184
 msgid "Total swap:"
 msgstr "Cserefájl összesen:"
 
-#: sysinfo.cpp:188
+#: sysinfo.cpp:185
 msgid "Free swap:"
 msgstr "Cserefájl szabad:"
 
-#: sysinfo.cpp:252
+#: sysinfo.cpp:250
 msgid "%1 (+ %2 Caches)"
 msgstr "%1 (+ %2 gyorsítótár)"
 
-#: sysinfo.cpp:284
+#: sysinfo.cpp:270
 msgid "Device"
 msgstr "Eszköz"
 
-#: sysinfo.cpp:284
+#: sysinfo.cpp:270
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: sysinfo.cpp:285
+#: sysinfo.cpp:271
 msgid "Total space"
 msgstr "Összes terület"
 
-#: sysinfo.cpp:285
+#: sysinfo.cpp:271
 msgid "Available space"
 msgstr "Rendelkezésre álló terület"
 
-#: sysinfo.cpp:291
+#: sysinfo.cpp:277
 msgid "Press the right mouse button for more options like Mount or Eject"
 msgstr ""
 "A jobb egérgomb megnyomására további opciók állnak rendelkezésre (például "
 "Felcsatolás vagy Kiadatás)"
 
-#: sysinfo.cpp:512
+#: sysinfo.cpp:495
 msgid "%1 (3D Support)"
 msgstr "%1 (3D támogatás)"
 
-#: sysinfo.cpp:516
+#: sysinfo.cpp:499
 msgid "%1 (No 3D Support)"
 msgstr "%1 (3D támogatás nélkül)"
 
-#: sysinfo.cpp:522
+#: sysinfo.cpp:504
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: sysinfo.cpp:530
+#: sysinfo.cpp:511
 msgid "Network is <strong>unreachable</strong>"
 msgstr "A hálózat <strong>elérhetetlen</strong>"
 
-#: sysinfo.cpp:532
+#: sysinfo.cpp:513
 msgid "You are <strong>offline</strong>"
 msgstr "Ön most <strong>offline</strong> állapotú"
 
-#: sysinfo.cpp:534
+#: sysinfo.cpp:515
 msgid "Network is <strong>shutting down</strong>"
 msgstr "A hálózat <strong>leáll</strong>"
 
-#: sysinfo.cpp:536
+#: sysinfo.cpp:517
 msgid "<strong>Establishing</strong> connection to the network"
 msgstr "Kapcsolat <strong>létesítése</strong> a hálózat felé"
 
-#: sysinfo.cpp:538
+#: sysinfo.cpp:519
 msgid "You are <strong>online</strong>"
 msgstr "Ön most <strong>online</strong> állapotú"
 
@@ -245,6 +245,7 @@
 # modules/sound/sound.ycp:719 modules/sound/sound.ycp:754
 # modules/sound/sound.ycp:801 modules/sound/sound.ycp:848
 # modules/sound/sound.ycp:874 modules/sound/sound.ycp:918
-#: sysinfo.cpp:540
+#: sysinfo.cpp:521
 msgid "Unknown network status"
 msgstr "Ismeretlen hálózati állapot"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/hu/suseplugger.po new/kdebase-SuSE/po/hu/suseplugger.po
--- old/kdebase-SuSE/po/hu/suseplugger.po	2006-05-18 10:27:47.000000000 +0200
+++ new/kdebase-SuSE/po/hu/suseplugger.po	2006-05-23 10:36:41.000000000 +0200
@@ -26,17 +26,17 @@
 msgstr ""
 "Project-Id-Version: suseplugger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-18 10:26+0200\n"
-"PO-Revision-Date: 2006-03-10 14:44+0100\n"
+"POT-Creation-Date: 2006-03-10 09:16+0100\n"
+"PO-Revision-Date: 2006-05-23 10:03+0200\n"
 "Last-Translator: Kalman Kemenczy <kkemenczy@novell.com>\n"
 "Language-Team: Hungarian <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11\n"
 
 #: main.cpp:41
 msgid "Check for new hardware on session startup."
@@ -176,10 +176,8 @@
 "telepítésre..."
 
 #: susehwitem.cpp:428
-msgid ""
-"An error occured while checking for the installed YaST2 module. Aborting."
-msgstr ""
-"Hiba történt a telepített YaST2-modulok ellenőrzésekor.A program leáll."
+msgid "An error occured while checking for the installed YaST2 module. Aborting."
+msgstr "Hiba történt a telepített YaST2-modulok ellenőrzésekor.A program leáll."
 
 #: susehwitemhandler.cpp:198
 msgid ""
@@ -190,3 +188,4 @@
 "A monitor nem jelentette le X- és Y-méretét. Ebből származhatnak "
 "megjelenítési problémák, például olvashatatlan betűkészletek.\n"
 "Kívánja kézzel beállítani a monitor geometriáját?"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/sysinfo/sysinfo.cpp new/kdebase-SuSE/sysinfo/sysinfo.cpp
--- old/kdebase-SuSE/sysinfo/sysinfo.cpp	2006-05-11 18:21:16.000000000 +0200
+++ new/kdebase-SuSE/sysinfo/sysinfo.cpp	2006-05-31 11:39:40.000000000 +0200
@@ -124,7 +124,7 @@
     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>";
-    sysInfo += "<tr><td>" + i18n( "KDE:" ) + "</td><td>" + KDE_VERSION_STRING + "</td></tr>";
+    sysInfo += "<tr><td>" + i18n( "KDE:" ) + "</td><td>" + KDE::versionString() + "</td></tr>";
     sysInfo += "</table>";
 
     // OpenGL info
@@ -473,10 +473,16 @@
     driver_info_t *di = hd->driver_info;
     QString renderer;
     bool dri = hasDirectRendering( renderer );
+    QString driver;
 
     for(di = di; di; di = di->next)
     {
-        QString loadline = QString("(II) LoadModule: \"%1\"").arg( di->x11.server );
+        QString loadline;
+	if (di->any.type == di_x11)
+		driver = di->x11.server;
+	else if (di->any.type == di_module && di->module.names)
+		driver = di->module.names->str;
+	loadline = QString("(II) LoadModule: \"%1\"").arg( driver );
 
         QFile file( "/var/log/Xorg.0.log" );
         if ( !file.exists() || !file.open( IO_ReadOnly ) )
@@ -502,20 +508,22 @@
         kdDebug() << "found_line " << found_line << endl;
         if (found_line)
             break;
+        else
+	    driver = QString::null;
     }
 
     m_info[GFX_VENDOR] = hd->vendor.name;
     m_info[GFX_MODEL] = hd->device.name;
-    if (di)
+    if (!driver.isNull())
     {
         if (dri)
-            m_info[GFX_DRIVER] = i18n("%1 (3D Support)").arg(di->x11.server);
+            m_info[GFX_DRIVER] = i18n("%1 (3D Support)").arg(driver);
         else
         {
             if ( renderer.contains( "Mesa GLX Indirect" ) )
-                m_info[GFX_DRIVER] = i18n("%1 (No 3D Support)").arg(di->x11.server);
+                m_info[GFX_DRIVER] = i18n("%1 (No 3D Support)").arg(driver);
             else
-                m_info[GFX_DRIVER] = di->x11.server;
+                m_info[GFX_DRIVER] = driver;
         }
     }
     else
@@ -704,11 +712,11 @@
 
         // calc the free/total space
         struct statfs sfs;
-        if ( statfs( QFile::encodeName( di.mountPoint ), &sfs ) == 0 )
+        if ( di.mounted && statfs( QFile::encodeName( di.mountPoint ), &sfs ) == 0 )
         {
             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)
+        } 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);




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)