Hello community,
here is the log from the commit of package kdeutils4
checked in at Mon Nov 3 18:14:21 CET 2008.
--------
--- KDE/kdeutils4/kdeutils4.changes 2008-10-20 15:33:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2008-10-31 11:27:28.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Oct 31 11:27:29 CET 2008 - dmueller@suse.de
+
+- update to 4.1.3
+ * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdeutils-4.1.2.tar.bz2
New:
----
kdeutils-4.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.W22008/_old 2008-11-03 18:14:10.000000000 +0100
+++ /var/tmp/diff_new_pack.W22008/_new 2008-11-03 18:14:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 4.1.2)
+# spec file for package kdeutils4 (Version 4.1.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,8 +28,8 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 4.1.2
-Release: 2
+Version: 4.1.3
+Release: 1
Source0: kdeutils-%version.tar.bz2
Source1: _upstream
Patch: 4_1_BRANCH.diff
@@ -463,6 +463,9 @@
%doc %lang(en) /usr/share/doc/kde/HTML/en/kcontrol/blockdevices
%changelog
+* Fri Oct 31 2008 dmueller@suse.de
+- update to 4.1.3
+ * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
* Mon Oct 20 2008 stbinner@suse.de
- fix build on s390/s390x
* Thu Sep 25 2008 dmueller@suse.de
@@ -473,7 +476,7 @@
* see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php
* Tue Aug 19 2008 stbinner@suse.de
- branch diff update (many ark bug fixes)
-* Fri Aug 01 2008 dmueller@suse.de
+* Thu Jul 31 2008 dmueller@suse.de
- branch diff update
* Wed Jul 23 2008 dmueller@suse.de
- update to 4.1.0
++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.W22008/_old 2008-11-03 18:14:10.000000000 +0100
+++ /var/tmp/diff_new_pack.W22008/_new 2008-11-03 18:14:10.000000000 +0100
@@ -1,15 +1,15 @@
-package: kdeutils-4.1.2.tar.bz2
+package: kdeutils-4.1.3.tar.bz2
kdemod: kdeutils
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD:
-+svn di between //tags/KDE/4.1.2/kdeutils and //branches/KDE/4.1/kdeutils
++current HEAD: 878038
++svn di between //tags/KDE/4.1.3/kdeutils and //branches/KDE/4.1/kdeutils
-Eigenschaftsänderungen: .
+Property changes on: .
___________________________________________________________________
-Gelöscht: svn:mergeinfo
-Hinzugefügt: svn:externals
+Deleted: svn:mergeinfo
+Added: svn:externals
+
++++++ kdeutils-4.1.2.tar.bz2 -> kdeutils-4.1.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/ark/plugins/libarchive/libarchivehandler.cpp new/kdeutils-4.1.3/ark/plugins/libarchive/libarchivehandler.cpp
--- old/kdeutils-4.1.2/ark/plugins/libarchive/libarchivehandler.cpp 2008-08-28 10:06:51.000000000 +0200
+++ new/kdeutils-4.1.3/ark/plugins/libarchive/libarchivehandler.cpp 2008-10-30 14:22:51.000000000 +0100
@@ -79,7 +79,11 @@
while ( ( result = archive_read_next_header( arch, &aentry ) ) == ARCHIVE_OK )
{
ArchiveEntry e;
+#ifdef _MSC_VER
+ e[ FileName ] = QString::fromUtf16((ushort*)archive_entry_pathname_w( aentry ));
+#else
e[ FileName ] = QString::fromWCharArray(archive_entry_pathname_w( aentry ));
+#endif
e[ InternalID ] = e[ FileName ];
e[ Owner ] = QString( archive_entry_uname( aentry ) );
e[ Group ] = QString( archive_entry_gname( aentry ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/ark/plugins/libzipplugin/CMakeLists.txt new/kdeutils-4.1.3/ark/plugins/libzipplugin/CMakeLists.txt
--- old/kdeutils-4.1.2/ark/plugins/libzipplugin/CMakeLists.txt 2008-01-05 00:53:32.000000000 +0100
+++ new/kdeutils-4.1.3/ark/plugins/libzipplugin/CMakeLists.txt 2008-10-30 14:22:51.000000000 +0100
@@ -4,6 +4,21 @@
${CMAKE_CURRENT_BINARY_DIR}/../..
)
+if(WIN32)
+set (LIBZIP_COMPILED_WITH_32BIT_OFF_T OFF CACHE BOOL "Whether the system libzip library is compiled with 32bits off_t" )
+else(WIN32)
+set (LIBZIP_COMPILED_WITH_32BIT_OFF_T ON CACHE BOOL "Whether the system libzip library is compiled with 32bits off_t" )
+endif(WIN32)
+
+if (LIBZIP_COMPILED_WITH_32BIT_OFF_T)
+
+ # this doesn't work correctly yet
+ #remove_definitions(-D_FILE_OFFSET_BITS=64)
+
+ add_definitions(-DLIBZIP_COMPILED_WITH_32BIT_OFF_T)
+endif (LIBZIP_COMPILED_WITH_32BIT_OFF_T)
+
+
########### next target ###############
set(kerfuffle_libzip_SRCS zipplugin.cpp)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/ark/plugins/libzipplugin/zipplugin.cpp new/kdeutils-4.1.3/ark/plugins/libzipplugin/zipplugin.cpp
--- old/kdeutils-4.1.2/ark/plugins/libzipplugin/zipplugin.cpp 2008-08-28 10:06:51.000000000 +0200
+++ new/kdeutils-4.1.3/ark/plugins/libzipplugin/zipplugin.cpp 2008-10-30 14:22:51.000000000 +0100
@@ -25,6 +25,7 @@
#include <QString>
+#ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
//TODO:
//a ninjatrick to redefine off_t to 32bit inside this file because libzip is
//usually compiled with off_t to 32bit. in the long run libzip should be
@@ -33,6 +34,8 @@
#define __off_t_defined
typedef quint32 off_t;
+#endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
+
#include "kerfuffle/archiveinterface.h"
#include "kerfuffle/archivefactory.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/cmake/modules/FindLibArchive.cmake new/kdeutils-4.1.3/cmake/modules/FindLibArchive.cmake
--- old/kdeutils-4.1.2/cmake/modules/FindLibArchive.cmake 2008-02-07 14:18:51.000000000 +0100
+++ new/kdeutils-4.1.3/cmake/modules/FindLibArchive.cmake 2008-10-30 14:22:50.000000000 +0100
@@ -21,7 +21,7 @@
${GNUWIN32_DIR}/include
)
- find_library(LIBARCHIVE_LIBRARY NAMES archive
+ find_library(LIBARCHIVE_LIBRARY NAMES archive libarchive
PATHS
${GNUWIN32_DIR}/lib
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/cmake/modules/FindLibZip.cmake new/kdeutils-4.1.3/cmake/modules/FindLibZip.cmake
--- old/kdeutils-4.1.2/cmake/modules/FindLibZip.cmake 2008-01-05 00:53:23.000000000 +0100
+++ new/kdeutils-4.1.3/cmake/modules/FindLibZip.cmake 2008-10-30 14:22:50.000000000 +0100
@@ -19,7 +19,7 @@
${GNUWIN32_DIR}/include
)
- find_library(LIBZIP_LIBRARY NAMES zip
+ find_library(LIBZIP_LIBRARY NAMES zip libzip
PATHS
${GNUWIN32_DIR}/lib
)
Files old/kdeutils-4.1.2/doc/ark/index.cache.bz2 and new/kdeutils-4.1.3/doc/ark/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/kcalc/index.cache.bz2 and new/kdeutils-4.1.3/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/kcharselect/index.cache.bz2 and new/kdeutils-4.1.3/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/kcontrol/blockdevices/index.cache.bz2 and new/kdeutils-4.1.3/doc/kcontrol/blockdevices/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/doc/kcontrol/blockdevices/index.docbook new/kdeutils-4.1.3/doc/kcontrol/blockdevices/index.docbook
--- old/kdeutils-4.1.2/doc/kcontrol/blockdevices/index.docbook 2008-09-25 14:03:49.000000000 +0200
+++ new/kdeutils-4.1.3/doc/kcontrol/blockdevices/index.docbook 2008-10-30 14:22:51.000000000 +0100
@@ -16,8 +16,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2002-02-12</date>
-<releaseinfo>3.00.00</releaseinfo>
+<date>2008-09-04</date>
+<releaseinfo>&kde; 4.1.2</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -42,7 +42,8 @@
<itemizedlist>
<listitem><para>an icon depicting the type of storage</para></listitem>
-<listitem><para>file format</para></listitem>
+<listitem><para>device name</para></listitem>
+<listitem><para>file system type</para></listitem>
<listitem><para>total size</para></listitem>
<listitem><para>mount point</para></listitem>
<listitem><para>free disk space</para></listitem>
@@ -59,10 +60,10 @@
<para>
<mousebutton>Right</mousebutton> clicking on a row pops up a menu. If
that device is not currently mounted, the <guimenuitem>Mount
-device</guimenuitem> option is available. If the device is mounted, it
+Device</guimenuitem> option is available. If the device is mounted, it
can be unmounted by choosing <guimenuitem>Unmount
-device</guimenuitem>. Selecting <guimenuitem>Open
-filemanager</guimenuitem> opens a new window with a graphical view of
+Device</guimenuitem>. Selecting <guimenuitem>Open in
+File Manager</guimenuitem> opens a new window with a graphical view of
the files on that device.
</para>
@@ -79,7 +80,7 @@
documentation which was authored by &Jonathan.Singer;
&Jonathan.Singer.mail;</para>
-<para>Modified for KDE 2.0 by &Mike.McBride;
+<para>Modified for &kde; 2.0 by &Mike.McBride;
&Mike.McBride.mail;</para>
<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
Files old/kdeutils-4.1.2/doc/kdf/index.cache.bz2 and new/kdeutils-4.1.3/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/kfloppy/index.cache.bz2 and new/kdeutils-4.1.3/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/kgpg/index.cache.bz2 and new/kdeutils-4.1.3/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/ktimer/index.cache.bz2 and new/kdeutils-4.1.3/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/kwallet/index.cache.bz2 and new/kdeutils-4.1.3/doc/kwallet/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/doc/okteta/basics.docbook new/kdeutils-4.1.3/doc/okteta/basics.docbook
--- old/kdeutils-4.1.2/doc/okteta/basics.docbook 2008-09-25 14:03:49.000000000 +0200
+++ new/kdeutils-4.1.3/doc/okteta/basics.docbook 2008-10-30 14:22:51.000000000 +0100
@@ -43,7 +43,7 @@
Depending on the active column, indicated by a blinking cursor, you can enter
only characters in the character column and byte values in the byte column.</para></note>
- <para>The search dialog allows the user to search for a specific string of,
+ <para>The search dialog allows the user to search for a specific string of
bytes, definable as hexadecimal, decimal, octal, binary, or text.</para>
<para>Multiple byte arrays can be open at the same time but only one can be
Files old/kdeutils-4.1.2/doc/okteta/index.cache.bz2 and new/kdeutils-4.1.3/doc/okteta/index.cache.bz2 differ
Files old/kdeutils-4.1.2/doc/superkaramba/index.cache.bz2 and new/kdeutils-4.1.3/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/kdf/disks.cpp new/kdeutils-4.1.3/kdf/disks.cpp
--- old/kdeutils-4.1.2/kdf/disks.cpp 2008-01-05 00:53:26.000000000 +0100
+++ new/kdeutils-4.1.3/kdf/disks.cpp 2008-10-30 14:22:51.000000000 +0100
@@ -195,22 +195,22 @@
{
QString iconName;
// try to be intelligent
- if (mountPoint().contains("cdrom",Qt::CaseInsensitive)) iconName+="cdrom";
- else if (deviceName().contains("cdrom",Qt::CaseInsensitive)) iconName+="cdrom";
- else if (mountPoint().contains("writer",Qt::CaseInsensitive)) iconName+="cdwriter";
- else if (deviceName().contains("writer",Qt::CaseInsensitive)) iconName+="cdwriter";
- else if (mountPoint().contains("mo",Qt::CaseInsensitive)) iconName+="mo";
- else if (deviceName().contains("mo",Qt::CaseInsensitive)) iconName+="mo";
+ if (mountPoint().contains("cdrom",Qt::CaseInsensitive)) iconName+="media-optical";
+ else if (deviceName().contains("cdrom",Qt::CaseInsensitive)) iconName+="media-optical";
+ else if (mountPoint().contains("writer",Qt::CaseInsensitive)) iconName+="media-optical-recordable";
+ else if (deviceName().contains("writer",Qt::CaseInsensitive)) iconName+="media-optical-recordable";
+ else if (mountPoint().contains("mo",Qt::CaseInsensitive)) iconName+="mo"; //TODO
+ else if (deviceName().contains("mo",Qt::CaseInsensitive)) iconName+="mo"; //TODO
else if (deviceName().contains("fd",Qt::CaseInsensitive)) {
- if (deviceName().contains("360",Qt::CaseInsensitive)) iconName+="5floppy";
- if (deviceName().contains("1200",Qt::CaseInsensitive)) iconName+="5floppy";
- else iconName+="3floppy";
+ if (deviceName().contains("360",Qt::CaseInsensitive)) iconName+="5floppy"; //TODO
+ if (deviceName().contains("1200",Qt::CaseInsensitive)) iconName+="5floppy"; //TODO
+ else iconName+="media-floppy";
}
- else if (mountPoint().contains("floppy",Qt::CaseInsensitive)) iconName+="3floppy";
- else if (mountPoint().contains("zip",Qt::CaseInsensitive)) iconName+="zip";
- else if (fsType().contains("nfs",Qt::CaseInsensitive)) iconName+="nfs";
- else iconName+="hdd";
- mounted() ? iconName+="_mount" : iconName+="_unmount";
+ else if (mountPoint().contains("floppy",Qt::CaseInsensitive)) iconName+="media-floppy";
+ else if (mountPoint().contains("zip",Qt::CaseInsensitive)) iconName+="zip"; //TODO
+ else if (fsType().contains("nfs",Qt::CaseInsensitive)) iconName+="nfs"; //TODO
+ else iconName+="drive-harddisk";
+ //mounted() ? iconName+="_mount" : iconName+="_unmount";
// if ( !mountOptions().contains("user",Qt::CaseInsensitive) )
// iconName.prepend("root_"); // special root icon, normal user can't mount
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/kdf/kdfwidget.cpp new/kdeutils-4.1.3/kdf/kdfwidget.cpp
--- old/kdeutils-4.1.2/kdf/kdfwidget.cpp 2008-06-25 09:59:12.000000000 +0200
+++ new/kdeutils-4.1.3/kdf/kdfwidget.cpp 2008-10-30 14:22:51.000000000 +0100
@@ -596,17 +596,17 @@
pix->fill(Qt::white);
QPainter p(pix);
p.setPen(Qt::black);
- p.drawRect(0,0,w,h);
+ p.drawRect(0,0,w - 1,h - 1);
QColor c;
- if ( (disk->iconName().contains("cdrom"))
- || (disk->iconName().contains("writer")) )
+ if ( (disk->iconName().contains("media-optical"))
+ || (disk->iconName().contains("media-optical-recordable")) )
c = Qt::gray;
else
c = disk->percentFull() > FULL_PERCENT ? Qt::red : Qt::darkGreen;
p.setBrush(c );
p.setPen(Qt::white);
- p.drawRect(1,1,(int)(((float)pix->width()-2)*(disk->percentFull()/100)),
- pix->height()-2);
+ p.drawRect(1,1,(int)(((float)pix->width()-3)*(disk->percentFull()/100)),
+ pix->height()-3);
it->setPixmap ( usageCol, *pix );
p.end();
delete pix;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/kgpg/core/emailvalidator.cpp new/kdeutils-4.1.3/kgpg/core/emailvalidator.cpp
--- old/kdeutils-4.1.2/kgpg/core/emailvalidator.cpp 2008-07-23 10:25:20.000000000 +0200
+++ new/kdeutils-4.1.3/kgpg/core/emailvalidator.cpp 2008-10-30 14:22:50.000000000 +0100
@@ -27,8 +27,8 @@
QValidator::State EmailValidator::validate(QString &input, int &) const
{
- static QString pattern = "^[a-z][a-z|0-9|\\-|_|\\.|%|\\+]*@[a-z][a-z|0-9|-]*\\.([a-z]"
- "[a-z|0-9|-]*(\\.[a-z][a-z|0-9|-]*)?)$";
+ static QString pattern = "^[a-z][a-z|0-9|\\-|_|\\.|%|\\+]*@"
+ "([a-z0-9][a-z|0-9|\\-]*\\.)+[a-z][a-z]+$";
static QRegExp regexp(pattern, Qt::CaseInsensitive);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/kgpg/encryptfolder.desktop new/kdeutils-4.1.3/kgpg/encryptfolder.desktop
--- old/kdeutils-4.1.2/kgpg/encryptfolder.desktop 2008-08-28 10:06:50.000000000 +0200
+++ new/kdeutils-4.1.3/kgpg/encryptfolder.desktop 2008-10-30 14:22:50.000000000 +0100
@@ -24,7 +24,7 @@
Name[hu]=Könyvtár titkosítása és archiválása
Name[is]=Pakka og dulrita möppu
Name[it]=Archivia e cifra cartella
-Name[ja]=フォルダをアーカイブ化 & 暗号化
+Name[ja]=フォルダをアーカイブ & 暗号化
Name[kk]=Қапшықты архивтеп шифрлау
Name[km]=ប័ណ្ណសារ និងអ៊ីនគ្រិបថត
Name[ko]=파일 및 폴더 암호화
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/kgpg/keylistproxymodel.cpp new/kdeutils-4.1.3/kgpg/keylistproxymodel.cpp
--- old/kdeutils-4.1.2/kgpg/keylistproxymodel.cpp 2008-08-28 10:06:50.000000000 +0200
+++ new/kdeutils-4.1.3/kgpg/keylistproxymodel.cpp 2008-10-30 14:22:50.000000000 +0100
@@ -76,9 +76,10 @@
bool test2 = (right->getType() & ITYPE_PUBLIC) && !(right->getType() & ITYPE_SECRET); // only a public key
// key-pair goes before simple public key
- if (left->getType() == ITYPE_PAIR && test2) return true;
- if (right->getType() == ITYPE_PAIR && test1) return false;
-
+ // extra check needed to get sorting by trust right
+ if (left->getType() == ITYPE_PAIR && test2) return (column != KEYCOLUMN_TRUST);
+ if (right->getType() == ITYPE_PAIR && test1) return (column == KEYCOLUMN_TRUST);
+
return nodeLessThan(left, right, column);
} else {
lessThan(left, right->getParentKeyNode(), column);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.1.2/kgpg/keysmanager.cpp new/kdeutils-4.1.3/kgpg/keysmanager.cpp
--- old/kdeutils-4.1.2/kgpg/keysmanager.cpp 2008-09-25 14:03:49.000000000 +0200
+++ new/kdeutils-4.1.3/kgpg/keysmanager.cpp 2008-10-30 14:22:50.000000000 +0100
@@ -1651,10 +1651,18 @@
slotregenerate();
break;
case ITYPE_PAIR:
- case ITYPE_PUBLIC:
+ case ITYPE_PUBLIC: {
+ KGpgKeyNode *kn = static_cast