Hello community, here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory checked in at Thu Jun 4 00:22:19 CEST 2009. -------- --- yast2-qt-pkg/yast2-qt-pkg.changes 2009-04-24 10:55:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt-pkg/yast2-qt-pkg.changes 2009-05-28 10:55:05.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 28 10:51:50 CEST 2009 - tgoettlicher@suse.de + +- V 2.18.9 + +------------------------------------------------------------------- +Wed May 27 15:30:54 CEST 2009 - ma@suse.de + +- Remove use of deprecated Package::filenames. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-qt-pkg-2.18.8.tar.bz2 New: ---- yast2-qt-pkg-2.18.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.b21458/_old 2009-06-04 00:22:09.000000000 +0200 +++ /var/tmp/diff_new_pack.b21458/_new 2009-06-04 00:22:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt-pkg (Version 2.18.8) +# spec file for package yast2-qt-pkg (Version 2.18.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ Name: yast2-qt-pkg -Version: 2.18.8 +Version: 2.18.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.18.8.tar.bz2 +Source0: yast2-qt-pkg-2.18.9.tar.bz2 BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel BuildRequires: libqt4-devel libxslt perl-XML-Writer sgml-skel update-desktop-files Summary: YaST2 - Graphical User Interface @@ -82,6 +82,10 @@ %_prefix/share/YaST2/images/* %changelog +* Thu May 28 2009 tgoettlicher@suse.de +- V 2.18.9 +* Wed May 27 2009 ma@suse.de +- Remove use of deprecated Package::filenames. * Fri Apr 24 2009 tgoettlicher@suse.de - removed useless matchFiles() - V 2.18.8 ++++++ yast2-qt-pkg-2.18.8.tar.bz2 -> yast2-qt-pkg-2.18.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.18.8/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.18.9/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.18.8/package/yast2-qt-pkg.changes 2009-04-24 11:06:19.000000000 +0200 +++ new/yast2-qt-pkg-2.18.9/package/yast2-qt-pkg.changes 2009-05-28 10:54:45.000000000 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu May 28 10:51:50 CEST 2009 - tgoettlicher@suse.de + +- V 2.18.9 + +------------------------------------------------------------------- +Wed May 27 15:30:54 CEST 2009 - ma@suse.de + +- Remove use of deprecated Package::filenames. + +------------------------------------------------------------------- Fri Apr 24 10:54:07 CEST 2009 - tgoettlicher@suse.de - removed useless matchFiles() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.18.8/src/YQPkgDescriptionView.cc new/yast2-qt-pkg-2.18.9/src/YQPkgDescriptionView.cc --- old/yast2-qt-pkg-2.18.8/src/YQPkgDescriptionView.cc 2009-04-24 11:06:18.000000000 +0200 +++ new/yast2-qt-pkg-2.18.9/src/YQPkgDescriptionView.cc 2009-05-28 10:54:45.000000000 +0200 @@ -73,7 +73,7 @@ } QString html_text = htmlStart(); - + html_text += htmlHeading( selectable ); QString description = fromUTF8( selectable->theObj()->description() ); @@ -91,16 +91,16 @@ html_text += _("References:"); html_text += "</p>"; html_text += "<ul>"; - + for ( Patch::ReferenceIterator rit = patch->referencesBegin(); rit != patch->referencesEnd(); ++rit ) { - html_text += QString().sprintf("<li>%s (%s) : %s</li>", rit.id().c_str(), rit.type().c_str(), rit.title().c_str() ); + html_text += QString().sprintf("<li>%s (%s) : %s</li>", rit.id().c_str(), rit.type().c_str(), rit.title().c_str() ); } html_text += "</ul>"; } - + // if it is a package, show the support information Package::constPtr package = asKind<Package>(selectable->theObj()); if ( package ) @@ -110,12 +110,17 @@ html_text += _("Supportability: %1").arg( fromUTF8(asUserString(package->vendorSupport()).c_str() )); html_text += "</p>"; } - + // show application names and icons from desktop files if available ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); if ( installed ) { - html_text += applicationIconList( installed->filenames() ); + // ma@: It might be worth passing Package::FileList directly + // instead of copying _all_ filenames into a list first. + // Package::FileList is a query, so it does not eat much memory. + zypp::Package::FileList f( installed->filelist() ); + std::liststd::string tmp( f.begin(), f.end() ); + html_text += applicationIconList( tmp ); } html_text += htmlEnd(); @@ -161,7 +166,7 @@ if ( foundAuthorsList ) html_text += "</ul>"; - + html_text += "</p>"; return html_text; @@ -253,7 +258,7 @@ desktopEntries["Icon"] = file.value( "Icon" ).toString(); desktopEntries["Exec"] = file.value( "Exec" ).toString(); - // translate Name + // translate Name name = file.value( QString( "Name[%1]" ).arg( langWithCountry ) ).toString(); if ( name.isEmpty() ) @@ -289,7 +294,7 @@ it != fileList.end(); ++it ) { QString line = fromUTF8( *it ); - + if ( line.contains( QRegExp( DESKTOPFILEDIR ) ) ) desktopFiles << line; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.18.8/src/YQPkgFileListView.cc new/yast2-qt-pkg-2.18.9/src/YQPkgFileListView.cc --- old/yast2-qt-pkg-2.18.8/src/YQPkgFileListView.cc 2009-04-24 11:06:18.000000000 +0200 +++ new/yast2-qt-pkg-2.18.9/src/YQPkgFileListView.cc 2009-05-28 10:54:45.000000000 +0200 @@ -56,12 +56,17 @@ QString html = htmlHeading( selectable, true ); // showVersion - + ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); if ( installed ) { - html += formatFileList( installed->filenames() ); + // ma@: It might be worth passing Package::FileList directly + // instead of copying _all_ filenames into a list first. + // Package::FileList is a query, so it does not eat much memory. + zypp::Package::FileList f( installed->filelist() ); + std::liststd::string tmp( f.begin(), f.end() ); + html += formatFileList( tmp ); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.18.8/VERSION.cmake new/yast2-qt-pkg-2.18.9/VERSION.cmake --- old/yast2-qt-pkg-2.18.8/VERSION.cmake 2009-04-24 11:06:19.000000000 +0200 +++ new/yast2-qt-pkg-2.18.9/VERSION.cmake 2009-05-28 10:54:45.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "8") +SET(VERSION_PATCH "9") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org