Hello community, here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory checked in at 2012-03-07 13:46:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-qt-pkg", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-qt-pkg/yast2-qt-pkg.changes 2011-11-18 15:48:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new/yast2-qt-pkg.changes 2012-03-07 13:46:29.000000000 +0100 @@ -1,0 +2,31 @@ +Tue Mar 6 14:36:45 CET 2012 - [email protected] + +- Fixed bnc#691572: Formatting Package Descriptions +- Version: 2.21.19 + +------------------------------------------------------------------- +Thu Jan 19 16:19:19 CET 2012 - [email protected] + +- Fixed bnc #734763: yast2 sw_single software management with QT ui + resets columns in software view when horizontal scrollbar is removed + (Patch from Frank Schäfer) + +- Version: 2.21.18 + + +------------------------------------------------------------------- +Thu Jan 19 16:10:52 CET 2012 - [email protected] + +- Fixed bnc#723151: Install all matching debuginfo packages" never + finds anything-debuginfo-32bit +- Fixed bnc#730007: When updating packages, + keyshortcut doesn't + always work + +- Version: 2.21.17 + +------------------------------------------------------------------- +Wed Dec 7 10:05:26 UTC 2011 - [email protected] + +- fix license to be in spdx.org format + +------------------------------------------------------------------- Old: ---- yast2-qt-pkg-2.21.16.tar.bz2 New: ---- yast2-qt-pkg-2.21.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.InzZ62/_old 2012-03-07 13:46:30.000000000 +0100 +++ /var/tmp/diff_new_pack.InzZ62/_new 2012-03-07 13:46:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-qt-pkg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ Name: yast2-qt-pkg -Version: 2.21.16 +Version: 2.21.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.21.16.tar.bz2 +Source0: yast2-qt-pkg-2.21.19.tar.bz2 Group: System/YaST -License: GPL-2.0 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel BuildRequires: libqt4-devel libxslt perl-XML-Writer sgml-skel update-desktop-files ++++++ yast2-qt-pkg-2.21.16.tar.bz2 -> yast2-qt-pkg-2.21.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/VERSION.cmake new/yast2-qt-pkg-2.21.19/VERSION.cmake --- old/yast2-qt-pkg-2.21.16/VERSION.cmake 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/VERSION.cmake 2012-03-06 14:38:07.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "16") +SET(VERSION_PATCH "19") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.21.19/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.21.16/package/yast2-qt-pkg.changes 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/package/yast2-qt-pkg.changes 2012-03-06 14:38:07.000000000 +0100 @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Mar 6 14:36:45 CET 2012 - [email protected] + +- Fixed bnc#691572: Formatting Package Descriptions +- Version: 2.21.19 + +------------------------------------------------------------------- +Thu Jan 19 16:19:19 CET 2012 - [email protected] + +- Fixed bnc #734763: yast2 sw_single software management with QT ui + resets columns in software view when horizontal scrollbar is removed + (Patch from Frank Schäfer) + +- Version: 2.21.18 + + +------------------------------------------------------------------- +Thu Jan 19 16:10:52 CET 2012 - [email protected] + +- Fixed bnc#723151: Install all matching debuginfo packages" never + finds anything-debuginfo-32bit +- Fixed bnc#730007: When updating packages, + keyshortcut doesn't + always work + +- Version: 2.21.17 + +------------------------------------------------------------------- +Wed Dec 7 10:05:26 UTC 2011 - [email protected] + +- fix license to be in spdx.org format + +------------------------------------------------------------------- Thu Nov 17 16:48:34 CET 2011 - [email protected] - Fixed bnc#722617: Yast2 package manager does not show icons of some packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/src/YQPackageSelector.cc new/yast2-qt-pkg-2.21.19/src/YQPackageSelector.cc --- old/yast2-qt-pkg-2.21.16/src/YQPackageSelector.cc 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/src/YQPackageSelector.cc 2012-03-06 14:38:07.000000000 +0100 @@ -696,6 +696,7 @@ _pkgMenu->addAction(_pkgList->actionSetCurrentKeepInstalled); _pkgMenu->addAction(_pkgList->actionSetCurrentDelete); _pkgMenu->addAction(_pkgList->actionSetCurrentUpdate); + _pkgMenu->addAction(_pkgList->actionSetCurrentUpdateForce); _pkgMenu->addAction(_pkgList->actionSetCurrentTaboo); _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); @@ -757,6 +758,7 @@ _patchMenu->addAction(_patchList->actionSetCurrentDelete); #endif _patchMenu->addAction(_patchList->actionSetCurrentUpdate); + _patchMenu->addAction(_patchList->actionSetCurrentUpdateForce); _patchMenu->addAction(_patchList->actionSetCurrentTaboo); _patchMenu->addSeparator(); @@ -809,7 +811,7 @@ this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); _showDevelAction->setCheckable(true); - _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); + _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*(\\d+bit)?-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDevelPkgs ); _excludeDevelPkgs->enable( false ); @@ -817,7 +819,7 @@ _showDebugAction = _optionsMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); _showDebugAction->setCheckable(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() ); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*(-\\d+bit)?-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); @@ -1610,7 +1612,7 @@ { QString name = (*it)->name().c_str(); - if ( name.endsWith( suffix ) ) + if ( name.endsWith( suffix ) || name.endsWith( suffix + "-32bit" ) ) { subPkgs[ name ] = *it; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/src/YQPkgDescriptionView.cc new/yast2-qt-pkg-2.21.19/src/YQPkgDescriptionView.cc --- old/yast2-qt-pkg-2.21.16/src/YQPkgDescriptionView.cc 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/src/YQPkgDescriptionView.cc 2012-03-06 14:38:07.000000000 +0100 @@ -164,6 +164,11 @@ { QString line = htmlEscape( *it ).trimmed(); + if ( line.startsWith("* ") || line.startsWith("- ") || line.startsWith("# ") ) + { + line = "<li>" + line + "</li>"; + } + if ( line.startsWith( "Authors:" ) ) { line = "<p><b>" + line + "</b><ul>"; @@ -183,6 +188,9 @@ html_text += " " + line; } + + + ++it; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/src/YQPkgList.cc new/yast2-qt-pkg-2.21.19/src/YQPkgList.cc --- old/yast2-qt-pkg-2.21.16/src/YQPkgList.cc 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/src/YQPkgList.cc 2012-03-06 14:38:07.000000000 +0100 @@ -449,7 +449,10 @@ void YQPkgList::resizeEvent(QResizeEvent *event) { - optimizeColumnWidths(); + if (event->size().width() != event->oldSize().width()) + optimizeColumnWidths(); + /* NOTE: avoids column width optimization when the size changes + because the horizontal scroll bar appeares/disappeares */ event->accept(); } @@ -482,6 +485,7 @@ _installedContextMenu->addAction(actionSetCurrentKeepInstalled); _installedContextMenu->addAction(actionSetCurrentDelete); _installedContextMenu->addAction(actionSetCurrentUpdate); + _installedContextMenu->addAction(actionSetCurrentUpdateForce); _installedContextMenu->addAction(actionSetCurrentProtected); _installedContextMenu->addAction(actionShowCurrentSolverInfo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/src/YQPkgObjList.cc new/yast2-qt-pkg-2.21.19/src/YQPkgObjList.cc --- old/yast2-qt-pkg-2.21.16/src/YQPkgObjList.cc 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/src/YQPkgObjList.cc 2012-03-06 14:38:07.000000000 +0100 @@ -77,6 +77,7 @@ , actionSetCurrentKeepInstalled(0) , actionSetCurrentDelete(0) , actionSetCurrentUpdate(0) + , actionSetCurrentUpdateForce(0) , actionSetCurrentTaboo(0) , actionSetCurrentProtected(0) , actionShowCurrentSolverInfo(0) @@ -286,7 +287,7 @@ void -YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem ) +YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem, bool ifNewerOnly ) { QTreeWidgetItem * listViewItem = currentItem(); @@ -295,7 +296,7 @@ YQPkgObjListItem * item = dynamic_cast<YQPkgObjListItem *> (listViewItem); - if ( item && item->editable() && _editable ) + if ( item && item->editable() && _editable && ( item->candidateIsNewer() || !ifNewerOnly ) ) { if ( newStatus != item->status() ) { @@ -401,6 +402,10 @@ actionSetCurrentKeepInstalled = createAction( S_KeepInstalled, "[<], [-]" ); actionSetCurrentDelete = createAction( S_Del, "[-]" ); actionSetCurrentUpdate = createAction( S_Update, "[>], [+]" ); + actionSetCurrentUpdateForce = createAction( _( "Update unconditionally" ), statusIcon( S_Update, true ) ,statusIcon( S_Update, false ) , "", true ) ; + + + actionSetCurrentTaboo = createAction( S_Taboo, "[!]" ); actionSetCurrentProtected = createAction( S_Protected, "[*]" ); @@ -431,6 +436,7 @@ connect( actionSetCurrentKeepInstalled, SIGNAL( activated() ), this, SLOT( setCurrentKeepInstalled() ) ); connect( actionSetCurrentDelete, SIGNAL( activated() ), this, SLOT( setCurrentDelete() ) ); connect( actionSetCurrentUpdate, SIGNAL( activated() ), this, SLOT( setCurrentUpdate() ) ); + connect( actionSetCurrentUpdateForce, SIGNAL( activated() ), this, SLOT( setCurrentUpdateForce() ) ); connect( actionSetCurrentTaboo, SIGNAL( activated() ), this, SLOT( setCurrentTaboo() ) ); connect( actionSetCurrentProtected, SIGNAL( activated() ), this, SLOT( setCurrentProtected() ) ); connect( actionShowCurrentSolverInfo, SIGNAL( activated() ), this, SLOT( showCurrentSolverInfo() ) ); @@ -538,6 +544,7 @@ _installedContextMenu->addAction( actionSetCurrentKeepInstalled ); _installedContextMenu->addAction( actionSetCurrentDelete ); _installedContextMenu->addAction( actionSetCurrentUpdate ); + _installedContextMenu->addAction( actionSetCurrentUpdateForce ); _installedContextMenu->addAction( actionShowCurrentSolverInfo ); addAllInListSubMenu( _installedContextMenu ); @@ -605,6 +612,7 @@ actionSetCurrentKeepInstalled->setEnabled( true ); actionSetCurrentDelete->setEnabled( true ); actionSetCurrentUpdate->setEnabled( selectable->hasCandidateObj() ); + actionSetCurrentUpdateForce->setEnabled( selectable->hasCandidateObj() ); } else { @@ -616,6 +624,7 @@ actionSetCurrentKeepInstalled->setEnabled( false ); actionSetCurrentDelete->setEnabled( false ); actionSetCurrentUpdate->setEnabled( false ); + actionSetCurrentUpdateForce->setEnabled( false ); } actionShowCurrentSolverInfo->setEnabled( true ); } @@ -628,6 +637,7 @@ actionSetCurrentKeepInstalled->setEnabled( false ); actionSetCurrentDelete->setEnabled( false ); actionSetCurrentUpdate->setEnabled( false ); + actionSetCurrentUpdateForce->setEnabled( false ); actionSetCurrentProtected->setEnabled( false ); actionShowCurrentSolverInfo->setEnabled( false ); @@ -1104,6 +1114,7 @@ } + void YQPkgObjListItem::setStatus( ZyppStatus newStatus, bool sendSignals ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/src/YQPkgObjList.h new/yast2-qt-pkg-2.21.19/src/YQPkgObjList.h --- old/yast2-qt-pkg-2.21.16/src/YQPkgObjList.h 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/src/YQPkgObjList.h 2012-03-06 14:38:07.000000000 +0100 @@ -119,7 +119,9 @@ * Automatically selects the next item if 'selectNextItem' is 'true'. **/ void setCurrentStatus( ZyppStatus newStatus, - bool selectNextItem = false ); + bool selectNextItem = false, + bool ifNewerOnly = false ); + /** * Show solver information about the current selected item @@ -262,7 +264,8 @@ void setCurrentDontInstall() { setCurrentStatus( S_NoInst ); } void setCurrentKeepInstalled() { setCurrentStatus( S_KeepInstalled ); } void setCurrentDelete() { setCurrentStatus( S_Del ); } - void setCurrentUpdate() { setCurrentStatus( S_Update ); } + void setCurrentUpdate() { setCurrentStatus( S_Update, false, true ); } + void setCurrentUpdateForce() { setCurrentStatus( S_Update ); } void setCurrentTaboo() { setCurrentStatus( S_Taboo ); } void setCurrentProtected() { setCurrentStatus( S_Protected ); } @@ -401,6 +404,7 @@ QAction * actionSetCurrentKeepInstalled; QAction * actionSetCurrentDelete; QAction * actionSetCurrentUpdate; + QAction * actionSetCurrentUpdateForce; QAction * actionSetCurrentTaboo; QAction * actionSetCurrentProtected; QAction * actionShowCurrentSolverInfo; @@ -498,6 +502,7 @@ **/ virtual void setStatus( ZyppStatus newStatus, bool sendSignals = true ); + /** * Set a status icon according to the package's status. **/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/src/YQPkgPatchList.cc new/yast2-qt-pkg-2.21.19/src/YQPkgPatchList.cc --- old/yast2-qt-pkg-2.21.16/src/YQPkgPatchList.cc 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/src/YQPkgPatchList.cc 2012-03-06 14:38:07.000000000 +0100 @@ -407,6 +407,7 @@ #endif _installedContextMenu->addAction(actionSetCurrentUpdate); + _installedContextMenu->addAction(actionSetCurrentUpdateForce); _installedContextMenu->addAction(actionSetCurrentProtected); addAllInListSubMenu( _installedContextMenu ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.16/yast2-qt-pkg.spec.in new/yast2-qt-pkg-2.21.19/yast2-qt-pkg.spec.in --- old/yast2-qt-pkg-2.21.16/yast2-qt-pkg.spec.in 2011-11-17 16:49:47.000000000 +0100 +++ new/yast2-qt-pkg-2.21.19/yast2-qt-pkg.spec.in 2012-03-06 14:38:07.000000000 +0100 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL-2.0 or later +License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel BuildRequires: libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
