Hello community, here is the log from the commit of package kdeutils4 for openSUSE:Factory checked in at 2011-12-08 12:10:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeutils4 (Old) and /work/SRC/openSUSE:Factory/.kdeutils4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeutils4", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeutils4/kdeutils4.changes 2011-11-28 12:54:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdeutils4.new/kdeutils4.changes 2011-12-08 12:10:32.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 7 10:59:46 UTC 2011 - co...@suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- +Sat Dec 3 10:41:05 CET 2011 - dmuel...@suse.de + +- update to 4.7.4 + * see http://kde.org/announcements/changelogs/changelog4_7_3to4_7_4.php for details + +------------------------------------------------------------------- Old: ---- kdeutils-4.7.3.tar.bz2 New: ---- kdeutils-4.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.fL7Ujq/_old 2011-12-08 12:10:35.000000000 +0100 +++ /var/tmp/diff_new_pack.fL7Ujq/_new 2011-12-08 12:10:35.000000000 +0100 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: kdeutils4 BuildRequires: fdupes BuildRequires: gmp-devel @@ -36,12 +34,12 @@ BuildRequires: python-cups BuildRequires: python-kde4-devel %endif -Version: 4.7.3 -Release: 1 -License: GPLv2+ +Version: 4.7.4 +Release: 0 Summary: Base Package of KDE Utility Programs -Url: http://www.kde.org +License: GPL-2.0+ Group: Productivity/Other +Url: http://www.kde.org Source0: kdeutils-%{version}.tar.bz2 Patch1: desktop-files.diff Patch2: kgpg-autostart.diff @@ -100,7 +98,6 @@ %kde_post_install %package -n ark -License: GPLv2+ Summary: KDE Archiver Tool Group: Productivity/Archiving/Compression Provides: kde4-ark = 4.3.0 @@ -115,7 +112,6 @@ %postun -n ark -p /sbin/ldconfig %package -n filelight -License: GPLv2+ Summary: Graphical disk usage viewer Group: System/GUI/KDE %kde4_runtime_requires @@ -139,7 +135,6 @@ %{_kde4_iconsdir}/hicolor/*/apps/utilities-file-archiver.* %package -n kcalc -License: GPLv2+ Summary: Scientific Calculator Group: Productivity/Scientific/Math Provides: kde4-kcalc = 4.3.0 @@ -159,7 +154,6 @@ %doc AUTHORS COPYING COPYING.DOC README %package -n kcharselect -License: GPLv2+ Summary: KDE Character Selector Group: Productivity/Other Provides: kde4-kcharselect = 4.3.0 @@ -181,7 +175,6 @@ %exclude %{_kde4_htmldir}/en/kcharselect/ %package -n kcharselect-doc -License: GPLv2+ Summary: Documentation for kcharselect Group: System/GUI/KDE Requires: kcharselect = %{version} @@ -196,7 +189,6 @@ %doc %lang(en) %{_kde4_htmldir}/en/kcharselect/ %package -n kde4-printer-applet -License: GPLv2+ Summary: System tray utility to show current print jobs Group: Productivity/Other Requires: python-cups @@ -219,7 +211,6 @@ %endif %package -n kdf -License: GPLv2+ Summary: Disk Usage Viewer Group: System/Monitoring Provides: kde4-kdf = 4.3.0 @@ -242,7 +233,6 @@ %exclude %{_kde4_htmldir}/en/kcontrol/blockdevices %package -n kfloppy -License: GPLv2+ Summary: Floppy Formatter Group: System/GUI/KDE Provides: kde4-kfloppy = 4.3.0 @@ -261,7 +251,6 @@ %doc AUTHORS COPYING COPYING.DOC README %package -n kgpg -License: GPLv2+ Summary: Encryption Tool Group: Productivity/Security Requires: kdepim4-runtime @@ -282,7 +271,6 @@ %doc AUTHORS COPYING COPYING.DOC README %package -n kremotecontrol -License: GPLv2+ Summary: KDE Frontend for LIRC Group: Productivity/Other Obsoletes: kdelirc < 4.7.1 @@ -309,7 +297,6 @@ %exclude %{_kde4_htmldir}/en/kcontrol/kremotecontrol/ %package -n kremotecontrol-doc -License: GPLv2+ Summary: Documentation for kremotecontrol Group: Productivity/Other Obsoletes: kdelirc < 4.7.1 @@ -324,7 +311,6 @@ %doc %lang(en) %{_kde4_htmldir}/en/kcontrol/kremotecontrol %package -n ktimer -License: GPLv2+ Summary: Countdown Launcher Group: Productivity/Other Provides: kde4-ktimer = 4.3.0 @@ -345,7 +331,6 @@ %exclude %{_kde4_htmldir}/en/ktimer/ %package -n ktimer-doc -License: GPLv2+ Summary: Documentation for ktimer Group: System/GUI/KDE Requires: ktimer = %{version} @@ -360,7 +345,6 @@ %doc %lang(en) %{_kde4_htmldir}/en/ktimer/ %package -n kwalletmanager -License: GPLv2+ Summary: Wallet Management Tool Group: System/GUI/KDE Provides: kde4-kwalletmanager = 4.3.0 @@ -382,7 +366,6 @@ %{_kde4_appsdir}/kwalletmanager %package -n kwikdisk -License: GPLv2+ Summary: Removable Media Utility Group: System/GUI/KDE Provides: kde4-kwikdisk = 4.3.0 @@ -405,7 +388,6 @@ %doc %lang(en) %{_kde4_htmldir}/en/kcontrol/blockdevices %package -n superkaramba -License: GPLv2+ Summary: Desktop Widgets Group: System/GUI/KDE Provides: kde4-superkaramba = 4.3.0 @@ -425,7 +407,6 @@ %config %{_kde_config_dir}/superkaramba.knsrc %package -n sweeper -License: GPLv2+ Summary: KDE Privacy Utility Group: System/GUI/KDE Provides: kde4-sweeper = 4.3.0 @@ -446,7 +427,6 @@ %exclude %{_kde4_htmldir}/en/sweeper/ %package -n sweeper-doc -License: GPLv2+ Summary: Documentation for sweeper Group: System/GUI/KDE Requires: sweeper = %{version} ++++++ kdeutils-4.7.3.tar.bz2 -> kdeutils-4.7.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/cmake/modules/FindLibArchive.cmake new/kdeutils-4.7.4/ark/cmake/modules/FindLibArchive.cmake --- old/kdeutils-4.7.3/ark/cmake/modules/FindLibArchive.cmake 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/cmake/modules/FindLibArchive.cmake 2011-12-03 10:38:43.000000000 +0100 @@ -7,6 +7,7 @@ # HAVE_LIBARCHIVE_GZIP_SUPPORT - whether libarchive has been compiled with gzip support # HAVE_LIBARCHIVE_LZMA_SUPPORT - whether libarchive has been compiled with lzma support # HAVE_LIBARCHIVE_XZ_SUPPORT - whether libarchive has been compiled with xz support +# HAVE_LIBARCHIVE_RPM_SUPPORT - whether libarchive has been compiled with rpm support # # Copyright (c) 2006, Pino Toscano, <toscano.p...@tiscali.it> # @@ -29,14 +30,15 @@ ) if (LIBARCHIVE_LIBRARY) - check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_gzip "" HAVE_LIBARCHIVE_GZIP_SUPPORT) - check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_lzma "" HAVE_LIBARCHIVE_LZMA_SUPPORT) - check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_xz "" HAVE_LIBARCHIVE_XZ_SUPPORT) - check_library_exists(${LIBARCHIVE_LIBRARY} archive_read_disk_entry_from_file "" HAVE_LIBARCHIVE_READ_DISK_API) + check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_gzip "" HAVE_LIBARCHIVE_GZIP_SUPPORT) + check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_lzma "" HAVE_LIBARCHIVE_LZMA_SUPPORT) + check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_xz "" HAVE_LIBARCHIVE_XZ_SUPPORT) + check_library_exists(${LIBARCHIVE_LIBRARY} archive_read_support_compression_rpm "" HAVE_LIBARCHIVE_RPM_SUPPORT) + check_library_exists(${LIBARCHIVE_LIBRARY} archive_read_disk_entry_from_file "" HAVE_LIBARCHIVE_READ_DISK_API) endif (LIBARCHIVE_LIBRARY) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibArchive DEFAULT_MSG LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT) - mark_as_advanced(LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT HAVE_LIBARCHIVE_LZMA_SUPPORT) + mark_as_advanced(LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT HAVE_LIBARCHIVE_LZMA_SUPPORT HAVE_LIBARCHIVE_RPM_SUPPORT) endif (LIBARCHIVE_LIBRARY AND LIBARCHIVE_INCLUDE_DIR) Files old/kdeutils-4.7.3/ark/doc/index.cache.bz2 and new/kdeutils-4.7.4/ark/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/plugins/CMakeLists.txt new/kdeutils-4.7.4/ark/plugins/CMakeLists.txt --- old/kdeutils-4.7.3/ark/plugins/CMakeLists.txt 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/plugins/CMakeLists.txt 2011-12-03 10:38:43.000000000 +0100 @@ -3,6 +3,9 @@ if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT ) message(STATUS "Your libarchive does not have support for lzma and/or xz archives. libarchive >= 2.7.0 is recommended.") endif( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT ) + if( NOT HAVE_LIBARCHIVE_RPM_SUPPORT ) + message(STATUS "Your libarchive does not have support for rpm archives. libarchive >= 2.8.0 is required for this.") + endif( NOT HAVE_LIBARCHIVE_RPM_SUPPORT ) add_subdirectory( libarchive ) else( HAVE_LIBARCHIVE_READ_DISK_API ) # Remove the cached variables from FindLibArchive.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop new/kdeutils-4.7.4/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop --- old/kdeutils-4.7.3/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop 2011-12-03 10:38:43.000000000 +0100 @@ -18,7 +18,7 @@ Name[ca]=Connector per arxius 7zip Name[ca@valencia]=Connector per arxius 7zip Name[cs]=Modul pro archiv 7zip -Name[da]=7zip arkiv-plugin +Name[da]=Plugin til 7zip-arkiver Name[de]=7zip-Archiv-Modul Name[el]=Πρόσθετο αρχειοθήκης 7zip Name[en_GB]=7zip archive plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/plugins/cliplugin/kerfuffle_cli.desktop new/kdeutils-4.7.4/ark/plugins/cliplugin/kerfuffle_cli.desktop --- old/kdeutils-4.7.3/ark/plugins/cliplugin/kerfuffle_cli.desktop 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/plugins/cliplugin/kerfuffle_cli.desktop 2011-12-03 10:38:43.000000000 +0100 @@ -18,7 +18,7 @@ Name[ca]=Connector per arxius TODO Name[ca@valencia]=Connector per arxius TODO Name[cs]=Modul pro archiv TODO -Name[da]=Arkiv-plugin for gøremål +Name[da]=Plugin til TODO-arkiver Name[de]=TODO-Archiv-Modul Name[el]=πρόσθετο αρχειοθήκης προς υλοποίηση Name[en_GB]=TODO archive plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/plugins/clirarplugin/kerfuffle_clirar.desktop new/kdeutils-4.7.4/ark/plugins/clirarplugin/kerfuffle_clirar.desktop --- old/kdeutils-4.7.3/ark/plugins/clirarplugin/kerfuffle_clirar.desktop 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/plugins/clirarplugin/kerfuffle_clirar.desktop 2011-12-03 10:38:43.000000000 +0100 @@ -18,7 +18,7 @@ Name[ca]=Connector per arxius RAR Name[ca@valencia]=Connector per arxius RAR Name[cs]=Modul pro archiv RAR -Name[da]=RAR arkiv-plugin +Name[da]=Plugin til RAR-arkiver Name[de]=RAR-Archiv-Modul Name[el]=πρόσθετο αρχειοθήκης RAR Name[en_GB]=RAR archive plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/plugins/clizipplugin/kerfuffle_clizip.desktop new/kdeutils-4.7.4/ark/plugins/clizipplugin/kerfuffle_clizip.desktop --- old/kdeutils-4.7.3/ark/plugins/clizipplugin/kerfuffle_clizip.desktop 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/plugins/clizipplugin/kerfuffle_clizip.desktop 2011-12-03 10:38:43.000000000 +0100 @@ -18,7 +18,7 @@ Name[ca]=Connector per arxius ZIP Name[ca@valencia]=Connector per arxius ZIP Name[cs]=Modul pro archiv ZIP -Name[da]=ZIP arkiv-plugin +Name[da]=Plugin til ZIP-arkiver Name[de]=ZIP-Archiv-Modul Name[el]=Πρόσθετο αρχειοθήκης ZIP Name[en_GB]=ZIP archive plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ark/plugins/libarchive/CMakeLists.txt new/kdeutils-4.7.4/ark/plugins/libarchive/CMakeLists.txt --- old/kdeutils-4.7.3/ark/plugins/libarchive/CMakeLists.txt 2011-10-28 09:53:21.000000000 +0200 +++ new/kdeutils-4.7.4/ark/plugins/libarchive/CMakeLists.txt 2011-12-03 10:38:43.000000000 +0100 @@ -6,12 +6,9 @@ ########### next target ############### -set(LIBARCHIVE_RPM_SUPPORT_MIN_VERSION "2.8.0") -if(LIBARCHIVE_VERSION VERSION_LESS ${LIBARCHIVE_RPM_SUPPORT_MIN_VERSION}) - set(LIBARCHIVE_RPM_SUPPORT "") -else(LIBARCHIVE_VERSION VERSION_LESS ${LIBARCHIVE_RPM_SUPPORT_MIN_VERSION}) +if(HAVE_LIBARCHIVE_RPM_SUPPORT) set(LIBARCHIVE_RPM_SUPPORT "application/x-rpm;") -endif(LIBARCHIVE_VERSION VERSION_LESS ${LIBARCHIVE_RPM_SUPPORT_MIN_VERSION}) +endif(HAVE_LIBARCHIVE_RPM_SUPPORT) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_libarchive_readonly.desktop.cmake Files old/kdeutils-4.7.3/filelight/doc/index.cache.bz2 and new/kdeutils-4.7.4/filelight/doc/index.cache.bz2 differ Files old/kdeutils-4.7.3/kcalc/doc/index.cache.bz2 and new/kdeutils-4.7.4/kcalc/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kcharselect/KCharSelect.desktop new/kdeutils-4.7.4/kcharselect/KCharSelect.desktop --- old/kdeutils-4.7.3/kcharselect/KCharSelect.desktop 2011-10-28 09:53:25.000000000 +0200 +++ new/kdeutils-4.7.4/kcharselect/KCharSelect.desktop 2011-12-03 10:38:56.000000000 +0100 @@ -49,6 +49,7 @@ GenericName[pt_BR]=Seletor de caracteres GenericName[ro]=Selector de caractere GenericName[ru]=Выбор символа +GenericName[si]=අක්ෂර තෝරාගැනීම GenericName[sk]=Výber znakov GenericName[sl]=Izbiranje znakov GenericName[sq]=Zgjedhës i Gërmave @@ -125,6 +126,7 @@ Name[pt_BR]=KCharSelect Name[ro]=KCharSelect Name[ru]=KCharSelect +Name[si]=KCharSelect Name[sk]=KCharSelect Name[sl]=KCharSelect Name[sq]=KCharSelect Files old/kdeutils-4.7.3/kcharselect/doc/index.cache.bz2 and new/kdeutils-4.7.4/kcharselect/doc/index.cache.bz2 differ Files old/kdeutils-4.7.3/kdf/doc/app/index.cache.bz2 and new/kdeutils-4.7.4/kdf/doc/app/index.cache.bz2 differ Files old/kdeutils-4.7.3/kdf/doc/kcontrol/index.cache.bz2 and new/kdeutils-4.7.4/kdf/doc/kcontrol/index.cache.bz2 differ Files old/kdeutils-4.7.3/kfloppy/doc/index.cache.bz2 and new/kdeutils-4.7.4/kfloppy/doc/index.cache.bz2 differ Files old/kdeutils-4.7.3/kgpg/doc/index.cache.bz2 and new/kdeutils-4.7.4/kgpg/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/editor/kgpgeditor.cpp new/kdeutils-4.7.4/kgpg/editor/kgpgeditor.cpp --- old/kdeutils-4.7.3/kgpg/editor/kgpgeditor.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/editor/kgpgeditor.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -529,7 +529,7 @@ KgpgLibrary *lib = new KgpgLibrary(this); connect(lib, SIGNAL(decryptionOver(KUrl)), SLOT(slotLibraryDone())); - lib->slotFileDec(url, KUrl(newname), m_customdecrypt); + lib->slotFileDec(url, KUrl(newname)); } else openEncryptedDocumentFile(url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/editor/kgpgeditor.h new/kdeutils-4.7.4/kgpg/editor/kgpgeditor.h --- old/kdeutils-4.7.3/kgpg/editor/kgpgeditor.h 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/editor/kgpgeditor.h 2011-12-03 10:39:10.000000000 +0100 @@ -119,7 +119,6 @@ void slotDownloadKeysFinished(QStringList ids); private: - QStringList m_customdecrypt; QString m_textencoding; KToggleAction *m_encodingaction; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/editor/kgpgtextedit.cpp new/kdeutils-4.7.4/kgpg/editor/kgpgtextedit.cpp --- old/kdeutils-4.7.3/kgpg/editor/kgpgtextedit.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/editor/kgpgtextedit.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -253,10 +253,11 @@ { KGpgDecrypt *decr = qobject_cast<KGpgDecrypt *>(sender()); Q_ASSERT(decr != NULL); - Q_ASSERT(!m_tempfile.isEmpty()); - KIO::NetAccess::removeTempFile(m_tempfile); - m_tempfile.clear(); + if (!m_tempfile.isEmpty()) { + KIO::NetAccess::removeTempFile(m_tempfile); + m_tempfile.clear(); + } if (result == KGpgTransaction::TS_OK) { #ifdef __GNUC__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/keysmanager.cpp new/kdeutils-4.7.4/kgpg/keysmanager.cpp --- old/kdeutils-4.7.3/kgpg/keysmanager.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/keysmanager.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -634,7 +634,7 @@ break; } default: - KMessageBox::error(this, i18n("gpg process did not finish. Cannot generate a new key pair."), infomessage); + KMessageBox::detailedError(this, i18n("gpg process did not finish. Cannot generate a new key pair."), genkey->gpgErrorMessage(), infomessage); } m_genkey = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/kgpgexternalactions.cpp new/kdeutils-4.7.4/kgpg/kgpgexternalactions.cpp --- old/kdeutils-4.7.3/kgpg/kgpgexternalactions.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/kgpgexternalactions.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -53,8 +53,6 @@ { QStringList opts; KgpgLibrary *lib = new KgpgLibrary(0); - if (KGpgSettings::pgpExtension()) - lib->setFileExtension(QLatin1String( ".pgp" )); connect(lib, SIGNAL(systemMessage(QString)), SLOT(busyMessage(QString))); if (KGpgSettings::encryptFilesTo()) { @@ -346,12 +344,9 @@ delete over; } - QStringList custdecr; - if (!KGpgSettings::customDecrypt().isEmpty()) - custdecr.append(KGpgSettings::customDecrypt()); connect(lib, SIGNAL(systemMessage(QString)), SLOT(busyMessage(QString))); connect(lib, SIGNAL(decryptionOver(KUrl)), SLOT(decryptNextFile(KUrl))); - lib->slotFileDec(droppedUrls.first(), swapname, custdecr); + lib->slotFileDec(droppedUrls.first(), swapname); } void KGpgExternalActions::decryptNextFile(const KUrl &failed, KgpgLibrary *lib) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/kgpglibrary.cpp new/kdeutils-4.7.4/kgpg/kgpglibrary.cpp --- old/kdeutils-4.7.3/kgpg/kgpglibrary.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/kgpglibrary.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -39,18 +39,13 @@ KgpgLibrary::KgpgLibrary(QWidget *parent) : QObject(parent), m_panel(parent), - m_extension(QLatin1String( ".gpg" )), + m_extension(KGpgSettings::pgpExtension() ? QLatin1String(".pgp") : QLatin1String(".gpg")), m_pop(NULL), m_popisactive(false), m_symetric(false) { } -void KgpgLibrary::setFileExtension(const QString &ext) -{ - m_extension = ext; -} - void KgpgLibrary::slotFileEnc(const KUrl::List &urls, const QStringList &opts, KGpgItemModel *model, const KShortcut &goDefaultKey, const QString &defaultKey) { if (urls.empty()) @@ -155,14 +150,14 @@ KMessageBox::detailedSorry(m_panel, i18n("<p><b>Process halted</b>.<br />Not all files were encrypted.</p>"), mssge); } -void KgpgLibrary::slotFileDec(const KUrl &src, const KUrl &dest, const QStringList &customDecryptOption) +void KgpgLibrary::slotFileDec(const KUrl &src, const KUrl &dest) { // decode file from konqueror or menu m_pop = new KPassivePopup(); m_urlselected = src; KGpgTextInterface *decryptFileProcess = new KGpgTextInterface(); - decryptFileProcess->decryptFile(src, dest, customDecryptOption); + decryptFileProcess->decryptFile(src, dest); connect(decryptFileProcess, SIGNAL(decryptFileStarted(KUrl)), SLOT(processEncPopup(KUrl))); connect(decryptFileProcess, SIGNAL(decryptFileFinished(int)), SLOT(processDecOver(int))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/kgpglibrary.h new/kdeutils-4.7.4/kgpg/kgpglibrary.h --- old/kdeutils-4.7.3/kgpg/kgpglibrary.h 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/kgpglibrary.h 2011-12-03 10:39:10.000000000 +0100 @@ -40,21 +40,14 @@ */ explicit KgpgLibrary(QWidget *parent = 0); - /** - * set the extension used for the encrypted file (including the '.') - */ - void setFileExtension(const QString &extension); - signals: void encryptionOver(); void decryptionOver(KUrl); - void importOver(KgpgLibrary *, QStringList); void systemMessage(QString message); - void photoAdded(); public slots: void slotFileEnc(const KUrl::List &urls, const QStringList &opts, KGpgItemModel *model, const KShortcut &goDefaultKey, const QString &defaultKey = QString()); - void slotFileDec(const KUrl &srcUrl, const KUrl &destUrl, const QStringList &customDecryptOption = QStringList()); + void slotFileDec(const KUrl &srcUrl, const KUrl &destUrl); private slots: void processEnc(const KUrl &); @@ -66,7 +59,7 @@ void startEncode(const QStringList &encryptkeys, const QStringList &encryptoptions, const bool symetric); void fastEncode(const KUrl &filetocrypt, const QStringList &encryptkeys, const QStringList &encryptoptions, const bool symetric); QWidget *m_panel; - QString m_extension; + const QString m_extension; QStringList m_encryptkeys; QStringList m_encryptoptions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/kgpgtextinterface.cpp new/kdeutils-4.7.4/kgpg/kgpgtextinterface.cpp --- old/kdeutils-4.7.3/kgpg/kgpgtextinterface.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/kgpgtextinterface.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -24,6 +24,7 @@ #include "kgpginterface.h" #include "gpgproc.h" #include "detailedconsole.h" +#include "kgpgsettings.h" class KGpgTextInterfacePrivate { @@ -409,13 +410,15 @@ } void -KGpgTextInterface::decryptFile(const KUrl &src, const KUrl &dest, const QStringList &options) +KGpgTextInterface::decryptFile(const KUrl &src, const KUrl &dest) { d->m_file = src; *d->m_process << QLatin1String( "--no-verbose" ) << QLatin1String( "--no-greeting" ); - *d->m_process << options; + const QString decryptOptions = KGpgSettings::customDecrypt(); + if (!decryptOptions.isEmpty()) + *d->m_process << decryptOptions; d->m_dest = dest; if (!dest.fileName().isEmpty()) @@ -451,6 +454,9 @@ emit decryptFileFinished(1); return; } + } else if (line.contains("GET_LINE detached_signature.filename")) { + // oops, we try to decrypt a signature. This can't work. + d->m_process->closeWriteChannel(); } else { d->m_process->write("quit\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/kgpgtextinterface.h new/kdeutils-4.7.4/kgpg/kgpgtextinterface.h --- old/kdeutils-4.7.3/kgpg/kgpgtextinterface.h 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/kgpgtextinterface.h 2011-12-03 10:39:10.000000000 +0100 @@ -122,9 +122,8 @@ * Decrypt file function * @param src file to decrypt. * @param dest decrypted file will be stored here - * @param options additional gpg options */ - void decryptFile(const KUrl &src, const KUrl &dest, const QStringList &options = QStringList()); + void decryptFile(const KUrl &src, const KUrl &dest); /** * Sign file function diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.cpp new/kdeutils-4.7.4/kgpg/transactions/kgpggeneratekey.cpp --- old/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.cpp 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/transactions/kgpggeneratekey.cpp 2011-12-03 10:39:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008,2009 Rolf Eike Beer <k...@opensource.sf-tec.de> + * Copyright (C) 2008,2009,2010,2011 Rolf Eike Beer <k...@opensource.sf-tec.de> */ /*************************************************************************** @@ -18,6 +18,7 @@ #include <QApplication> #include <kpimutils/email.h> +#include <gpgproc.h> KGpgGenerateKey::KGpgGenerateKey(QObject *parent, const QString &name, const QString &email, const QString &comment, const KgpgCore::KgpgKeyAlgo &algorithm, const uint size, const unsigned int expire, @@ -37,6 +38,8 @@ setAlgorithm(algorithm); setSize(size); setExpire(expire, expireunit); + + getProcess()->setOutputChannelMode(KProcess::SeparateChannels); } KGpgGenerateKey::~KGpgGenerateKey() @@ -182,7 +185,18 @@ emit statusMessage(i18n("Key %1 generated", getFingerprint())); break; default: - emit statusMessage(i18n("gpg process did not finish. Cannot generate a new key pair.")); + { + QStringList errorLines; + + while (getProcess()->hasLineStandardError()) { + QByteArray b; + getProcess()->readLineStandardError(&b); + errorLines << QString::fromUtf8(b); + } + + m_errorOutput = errorLines.join(QLatin1String("\n")); + emit statusMessage(i18n("gpg process did not finish. Cannot generate a new key pair.")); + } } } @@ -249,3 +263,9 @@ { return m_fingerprint; } + +QString +KGpgGenerateKey::gpgErrorMessage() const +{ + return m_errorOutput; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.h new/kdeutils-4.7.4/kgpg/transactions/kgpggeneratekey.h --- old/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.h 2011-10-28 09:53:29.000000000 +0200 +++ new/kdeutils-4.7.4/kgpg/transactions/kgpggeneratekey.h 2011-12-03 10:39:10.000000000 +0100 @@ -67,6 +67,14 @@ QString getFingerprint() const; + /** + * @brief get error output of GnuPG + * @return the messages GnuPG printed to standard error + * + * This will only return data after the done() signal has been emitted. + */ + QString gpgErrorMessage() const; + protected: virtual bool preStart(); virtual void postStart(); @@ -84,6 +92,7 @@ unsigned int m_expireunit; QString m_fingerprint; bool m_namesent; + QString m_errorOutput; }; #endif // KGPGGENERATEKEY_H Files old/kdeutils-4.7.3/kremotecontrol/doc/index.cache.bz2 and new/kdeutils-4.7.4/kremotecontrol/doc/index.cache.bz2 differ Files old/kdeutils-4.7.3/ktimer/doc/index.cache.bz2 and new/kdeutils-4.7.4/ktimer/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/ktimer/doc/index.docbook new/kdeutils-4.7.4/ktimer/doc/index.docbook --- old/kdeutils-4.7.3/ktimer/doc/index.docbook 2011-10-28 09:53:33.000000000 +0200 +++ new/kdeutils-4.7.4/ktimer/doc/index.docbook 2011-12-03 10:39:13.000000000 +0100 @@ -106,7 +106,7 @@ <screeninfo>Let's add a second task.</screeninfo> <mediaobject> <imageobject> - <imagedata fileref="two.at.once.png" format="PNG"/> + <imagedata fileref="two_at_once.png" format="PNG"/> </imageobject> <textobject> <phrase>start another &konqueror;, you can never have too many!</phrase> Files old/kdeutils-4.7.3/ktimer/doc/two.at.once.png and new/kdeutils-4.7.4/ktimer/doc/two.at.once.png differ Files old/kdeutils-4.7.3/ktimer/doc/two_at_once.png and new/kdeutils-4.7.4/ktimer/doc/two_at_once.png differ Files old/kdeutils-4.7.3/kwallet/doc/index.cache.bz2 and new/kdeutils-4.7.4/kwallet/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kwallet/konfigurator/kwalletconfig.desktop new/kdeutils-4.7.4/kwallet/konfigurator/kwalletconfig.desktop --- old/kdeutils-4.7.3/kwallet/konfigurator/kwalletconfig.desktop 2011-10-28 09:53:34.000000000 +0200 +++ new/kdeutils-4.7.4/kwallet/konfigurator/kwalletconfig.desktop 2011-12-03 10:39:14.000000000 +0100 @@ -57,6 +57,7 @@ Name[pt_BR]=Carteira do KDE Name[ro]=Portofel KDE Name[ru]=Бумажник +Name[si]=KDE පසුම්බිය Name[sk]=KDE Wallet Name[sl]=Listnica KDE Name[sq]=KDE Portofoli @@ -126,6 +127,7 @@ Comment[pt_BR]=Configuração da carteira do KDE Comment[ro]=Configurează portofelul KDE Comment[ru]=Параметры бумажника +Comment[si]=KDE පසුම්බි සැකසුම Comment[sk]=Konfigurácia KDE Wallet Comment[sl]=Nastavitve Listnice KDE Comment[sq]=Konfigurim i Portofolit KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kwallet/konfigurator/kwalletmanager_show.desktop new/kdeutils-4.7.4/kwallet/konfigurator/kwalletmanager_show.desktop --- old/kdeutils-4.7.3/kwallet/konfigurator/kwalletmanager_show.desktop 2011-10-28 09:53:34.000000000 +0200 +++ new/kdeutils-4.7.4/kwallet/konfigurator/kwalletmanager_show.desktop 2011-12-03 10:39:14.000000000 +0100 @@ -47,6 +47,7 @@ Name[pt_BR]=Ferramenta de gerenciamento de carteiras Name[ro]=Administrare portofel Name[ru]=Управление бумажниками +Name[si]=පසුම්බි පරිපාලන මෙවලම Name[sk]=Nástroj pre správu KDE Wallet Name[sl]=Orodje za upravljanje z listnicami Name[sq]=Mjet i Menaxhimit të Portofolit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kwallet/kwalletmanager-kwalletd.desktop new/kdeutils-4.7.4/kwallet/kwalletmanager-kwalletd.desktop --- old/kdeutils-4.7.3/kwallet/kwalletmanager-kwalletd.desktop 2011-10-28 09:53:34.000000000 +0200 +++ new/kdeutils-4.7.4/kwallet/kwalletmanager-kwalletd.desktop 2011-12-03 10:39:14.000000000 +0100 @@ -47,6 +47,7 @@ Name[pt_BR]=Ferramenta de gerenciamento de carteiras Name[ro]=Administrare portofel Name[ru]=Управление бумажниками +Name[si]=පසුම්බි පරිපාලන මෙවලම Name[sk]=Nástroj pre správu KDE Wallet Name[sl]=Orodje za upravljanje z listnicami Name[sq]=Mjet i Menaxhimit të Portofolit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/kwallet/kwalletmanager.desktop new/kdeutils-4.7.4/kwallet/kwalletmanager.desktop --- old/kdeutils-4.7.3/kwallet/kwalletmanager.desktop 2011-10-28 09:53:35.000000000 +0200 +++ new/kdeutils-4.7.4/kwallet/kwalletmanager.desktop 2011-12-03 10:39:14.000000000 +0100 @@ -8,7 +8,7 @@ Name[ca@valencia]=KWalletManager Name[cs]=KWalletManager Name[da]=KWalletManager -Name[de]=Verwaltung für digitale Brieftasche +Name[de]=KWalletManager Name[el]=KWalletManager Name[en_GB]=KWalletManager Name[es]=KWalletManager @@ -40,6 +40,7 @@ Name[pt_BR]=KWalletManager Name[ro]=KWalletManager Name[ru]=KWalletManager +Name[si]=KWalletManager Name[sk]=KWalletManager Name[sl]=KWalletManager Name[sq]=KWalletManager @@ -64,7 +65,7 @@ GenericName[ca@valencia]=Eina de gestió de carteres GenericName[cs]=Nástroj pro správu úschovny GenericName[da]=Værktøj til håndtering af tegnebog -GenericName[de]=Verwaltung für digitale Brieftasche +GenericName[de]=Verwaltungswerkzeug für digitale Brieftasche GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού GenericName[en_GB]=Wallet Management Tool GenericName[es]=Herramienta de gestión de carteras @@ -96,6 +97,7 @@ GenericName[pt_BR]=Ferramenta de gerenciamento de carteiras GenericName[ro]=Administrare portofel GenericName[ru]=Управление бумажниками +GenericName[si]=පසුම්බි පරිපාලන මෙවලම GenericName[sk]=Nástroj pre správu KDE Wallet GenericName[sl]=Orodje za upravljanje z listnicami GenericName[sq]=Mjet i Menaxhimit të Portofolit Files old/kdeutils-4.7.3/printer-applet/doc/index.cache.bz2 and new/kdeutils-4.7.4/printer-applet/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/printer-applet/printer-applet.desktop new/kdeutils-4.7.4/printer-applet/printer-applet.desktop --- old/kdeutils-4.7.3/printer-applet/printer-applet.desktop 2011-10-28 09:53:36.000000000 +0200 +++ new/kdeutils-4.7.4/printer-applet/printer-applet.desktop 2011-12-03 10:39:15.000000000 +0100 @@ -40,6 +40,7 @@ Name[pt_BR]=Miniaplicativo de impressora Name[ro]=Miniaplicație Imprimantă Name[ru]=Задания печати +Name[si]=මුද්රක ඇප්ලට් Name[sk]=Tlačový aplet Name[sl]=Nadzorovalnik tiskanja Name[sq]=Printer Applet @@ -95,6 +96,7 @@ Comment[pt_BR]=Ícone da área de notificação para gerenciar trabalhos de impressão Comment[ro]=Pictogramă în tava de sistem pentru gestionarea sarcinilor de tipărire Comment[ru]=Значок в системном лотке для управления заданиями печати +Comment[si]=මුද්රණ කාර්යයන් පරිපාලනය සඳහා පද්ධති තැටි අයිකනය Comment[sk]=Ikona v systémovej lište pre správu tlačových úloh Comment[sl]=Programček za upravljanje s tiskalnimi posli Comment[sq]=Ikonë në shiritin e sistemit për të menaxhuar punët e printimit @@ -105,6 +107,7 @@ Comment[sv]=Ikon i systembrickan för att hantera utskriftsjobb Comment[th]=ไอคอนบนถาดระบบสำหรับจัดการงานพิมพ์ Comment[tr]=Yazdırma görevlerini yönetmek için sistem çekmecesi simgesi +Comment[ug]=بېسىش ۋەزىپىسىنى باشقۇرىدىغان سىستېما قوندىقى سىنبەلگىسى Comment[uk]=Піктограма системного лотка для керування завданнями з друку Comment[x-test]=xxSystem tray icon for managing print jobsxx Comment[zh_CN]=用于管理打印任务的系统托盘图标 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.3/printer-applet/printer-applet.notifyrc new/kdeutils-4.7.4/printer-applet/printer-applet.notifyrc --- old/kdeutils-4.7.3/printer-applet/printer-applet.notifyrc 2011-10-28 09:53:36.000000000 +0200 +++ new/kdeutils-4.7.4/printer-applet/printer-applet.notifyrc 2011-12-03 10:39:15.000000000 +0100 @@ -41,6 +41,7 @@ Name[pt_BR]=Miniaplicativo de impressora Name[ro]=Miniaplicație Imprimantă Name[ru]=Задания печати +Name[si]=මුද්රක ඇප්ලට් Name[sk]=Tlačový aplet Name[sl]=Nadzorovalnik tiskanja Name[sq]=Printer Applet @@ -95,6 +96,7 @@ Comment[pt_BR]=Miniaplicativo de impressora Comment[ro]=Miniaplicație Imprimantă Comment[ru]=Аплет «Задания печати» +Comment[si]=මුද්රක ඇප්ලට් Comment[sk]=Tlačový aplet Comment[sl]=Nadzorovalnik tiskanja Comment[sq]=Printer Applet @@ -151,6 +153,7 @@ Name[pt_BR]=Nova impressora Name[ro]=Imprimantă nouă Name[ru]=Новый принтер +Name[si]=නව මුද්රකයක් Name[sk]=Nová tlačiareň Name[sl]=Nov tiskalnik Name[sq]=Printer i Ri @@ -205,6 +208,7 @@ Comment[pt_BR]=Configurando nova impressora Comment[ro]=Configurare imprimantă nouă Comment[ru]=Настроить новый принтер +Comment[si]=නව මුද්රකය සකසමින් Comment[sk]=Nastavuje sa nová tlačiareň Comment[sl]=Nastavljanje novega tiskalnika Comment[sq]=Konfigurimi i Printerit të Ri @@ -262,6 +266,7 @@ Name[pt_BR]=Impressora adicionada Name[ro]=Imprimantă adăugată Name[ru]=Принтер добавлен +Name[si]=මුද්රකය එක් විය Name[sk]=Tlačiareň bola pridaná Name[sl]=Tiskalnik je dodan Name[sq]=Printeri u Shtua @@ -317,6 +322,7 @@ Comment[pt_BR]=Impressora adicionada Comment[ro]=Imprimantă adăugată Comment[ru]=Принтер добавлен +Comment[si]=මුද්රකය එක් විය Comment[sk]=Tlačiareň bola pridaná Comment[sl]=Tiskalnik je dodan Comment[sq]=Printeri u Shtua @@ -375,6 +381,7 @@ Name[pt_BR]=Falta o driver da impressora Name[ro]=Lipsește driverul imprimantei Name[ru]=Отсутствует драйвер принтера +Name[si]=මුද්රක ධාවකය නොමැත Name[sk]=Chýba ovládač tlačiarne Name[sl]=Manjkajoč tiskalniški gonilnik Name[sq]=Driveri i Printerit Mungon @@ -430,6 +437,7 @@ Comment[pt_BR]=Falta o driver da impressora Comment[ro]=Lipsește driverul imprimantei Comment[ru]=Отсутствует драйвер принтера +Comment[si]=මුද්රක ධාවකය නොමැත Comment[sk]=Chýba ovládač tlačiarne Comment[sl]=Manjkajoč tiskalniški gonilnik Comment[sq]=Driveri i Printerit Mungon @@ -488,6 +496,7 @@ Name[pt_BR]=Outros Name[ro]=Altul Name[ru]=Другое +Name[si]=වෙනත් Name[sk]=Ostatné Name[sl]=Drugo Name[sq]=Të Tjera @@ -543,6 +552,7 @@ Comment[pt_BR]=Outros Comment[ro]=Altul Comment[ru]=Другое +Comment[si]=වෙනත් Comment[sk]=Ostatné Comment[sl]=Drugo Comment[sq]=Të Tjera Files old/kdeutils-4.7.3/sweeper/doc/index.cache.bz2 and new/kdeutils-4.7.4/sweeper/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
