Hello community,
here is the log from the commit of package libyui-ncurses-pkg for
openSUSE:Factory checked in at 2013-07-16 15:41:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses-pkg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses-pkg/libyui-ncurses-pkg.changes
2013-07-06 19:14:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes
2013-07-16 15:41:25.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 11 14:06:27 CEST 2013 - [email protected]
+
+- Online Update: show irrelevant patches only in list 'All Patches',
+ improve handling of the patch status, enhance help text
+- Version 2.44.2
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-pkg-2.44.1.tar.bz2
New:
----
libyui-ncurses-pkg-2.44.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.nV9tVq/_old 2013-07-16 15:41:26.000000000 +0200
+++ /var/tmp/diff_new_pack.nV9tVq/_new 2013-07-16 15:41:26.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libyui-ncurses-pkg (Version 2.44.1)
+# spec file for package libyui-ncurses-pkg-doc
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -15,26 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: libyui-ncurses-pkg-doc
-Version: 2.44.1
+Version: 2.44.2
Release: 0
-License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
-Group: Documentation/HTML
BuildArch: noarch
+BuildRequires: cmake >= 2.8
BuildRequires: doxygen
BuildRequires: fdupes
-BuildRequires: graphviz-gnome
-BuildRequires: texlive-latex
-BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
+BuildRequires: graphviz-gnome
BuildRequires: libyui-devel >= 3.0.4
+BuildRequires: texlive-latex
-
-URL: http://github.com/libyui/
+Url: http://github.com/libyui/
Summary: Libyui-ncurses-pkg documentation
+License: LGPL-2.1 or LGPL-3.0
+Group: Documentation/HTML
%description
This package extends the character based (ncurses) user interface
@@ -46,10 +46,8 @@
%prep
-
%setup -n libyui-ncurses-pkg-%{version}
-
%build
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
@@ -65,18 +63,15 @@
make %{?jobs:-j%jobs} docs
-
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-ncurses-pkg5
-
%clean
rm -rf "$RPM_BUILD_ROOT"
-
%files
%defattr(-,root,root)
%doc %{_docdir}/libyui-ncurses-pkg5
++++++ libyui-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.nV9tVq/_old 2013-07-16 15:41:26.000000000 +0200
+++ /var/tmp/diff_new_pack.nV9tVq/_new 2013-07-16 15:41:26.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libyui-ncurses-pkg (Version 2.44.1)
+# spec file for package libyui-ncurses-pkg
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -11,32 +11,31 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-#
-# norootforbuild
+
Name: libyui-ncurses-pkg
-Version: 2.44.1
+Version: 2.44.2
Release: 0
-License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
-Group: System/Libraries
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
-BuildRequires: pkg-config
BuildRequires: libyui-devel >= 3.0.4
+BuildRequires: pkg-config
%define libyui_ncurses_devel_version libyui-ncurses-devel >= 2.43.9
BuildRequires: %{libyui_ncurses_devel_version}
%define libzypp_devel_version libzypp-devel >= 12.3.0
BuildRequires: %{libzypp_devel_version}
-URL: http://github.com/libyui/
+Url: http://github.com/libyui/
Summary: Libyui - yast2 package selector widget for the ncurses UI
+License: LGPL-2.1 or LGPL-3.0
+Group: System/Libraries
%description
This package extends the character based (ncurses) user interface
@@ -45,8 +44,6 @@
%package -n libyui-ncurses-pkg5
-Group: System/Libraries
-
Requires: libyui5
Provides: libyui-ncurses-pkg = %{version}
@@ -55,9 +52,9 @@
Provides: libyui_pkg
-
-URL: http://github.com/libyui/
+Url: http://github.com/libyui/
Summary: Libyui - yast2 package selector widget for the ncurses UI
+Group: System/Libraries
%description -n libyui-ncurses-pkg5
This package extends the character based (ncurses) user interface
@@ -67,17 +64,16 @@
%package devel
-Group: Development/Languages/C and C++
-
-Requires: libyui-ncurses-pkg5 = %{version}
-Requires: glibc-devel
-Requires: libstdc++-devel
-Requires: boost-devel
Requires: %{libyui_ncurses_devel_version}
Requires: %{libzypp_devel_version}
+Requires: boost-devel
+Requires: glibc-devel
+Requires: libstdc++-devel
+Requires: libyui-ncurses-pkg5 = %{version}
-URL: http://github.com/libyui/
+Url: http://github.com/libyui/
Summary: Libyui-ncurses-pkg header files
+Group: Development/Languages/C and C++
%description devel
This package extends the character based (ncurses) user interface
@@ -91,7 +87,6 @@
%prep
%setup -q -n libyui-ncurses-pkg-%{version}
-
%build
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
@@ -118,7 +113,6 @@
make %{?jobs:-j%jobs}
-
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ libyui-ncurses-pkg-2.44.1.tar.bz2 -> libyui-ncurses-pkg-2.44.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/ChangeLog
new/libyui-ncurses-pkg-2.44.2/ChangeLog
--- old/libyui-ncurses-pkg-2.44.1/ChangeLog 2013-07-03 14:28:09.000000000
+0200
+++ new/libyui-ncurses-pkg-2.44.2/ChangeLog 2013-07-11 14:18:09.000000000
+0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jul 11 14:06:27 CEST 2013 - [email protected]
+
+- Online Update: show irrelevant patches only in list 'All Patches',
+ improve handling of the patch status, enhance help text
+- Version 2.44.2
+
+-------------------------------------------------------------------
Wed Jul 3 14:18:13 CEST 2013 - [email protected]
- remove webpin search from configuration menu (bnc#821866),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/VERSION.cmake
new/libyui-ncurses-pkg-2.44.2/VERSION.cmake
--- old/libyui-ncurses-pkg-2.44.1/VERSION.cmake 2013-07-03 14:28:09.000000000
+0200
+++ new/libyui-ncurses-pkg-2.44.2/VERSION.cmake 2013-07-11 14:18:09.000000000
+0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "44" )
-SET( VERSION_PATCH "1" )
+SET( VERSION_PATCH "2" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPackageSelector.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPackageSelector.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPackageSelector.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPackageSelector.cc 2013-07-11
14:18:09.000000000 +0200
@@ -792,67 +792,66 @@
NCPkgTable * packageList = PackageList();
bool displayPatch = false;
- if ( !packageList || !patchPtr
- || !selectable )
+ if ( !packageList )
{
yuiError() << "Widget is not a valid NCPkgTable widget" << endl;
return false;
}
- yuiDebug() << "Filter: " << filter << endl;
- switch ( filter )
+ if ( !patchPtr || !selectable || !selectable->hasCandidateObj() )
{
- case NCPkgMenuFilter::F_All:
- {
- displayPatch = true;
- break;
- }
- case NCPkgMenuFilter::F_Unneeded: // unneeded means not relevant
or satisfied
- {
- if ( selectable->hasCandidateObj() &&
- ( !selectable->candidateObj().isRelevant() ||
- ( selectable->candidateObj().isSatisfied() &&
- !
selectable->candidateObj().status().isToBeInstalled() ) ) )
- {
- displayPatch = true;
- }
- break;
- }
- case NCPkgMenuFilter::F_Needed: // needed means relevant patches
- {
- // only shows patches relevant to the system
- if ( selectable->hasCandidateObj() &&
- selectable->candidateObj().isRelevant() )
- {
- // and only those that are needed
- if ( ! selectable->candidateObj().isSatisfied() ||
- // may be it is satisfied because is preselected
- selectable->candidateObj().status().isToBeInstalled() )
- displayPatch = true;
- }
- break;
- }
- case NCPkgMenuFilter::F_Security:
- {
- if ( patchPtr->category() == "security" )
- displayPatch = true;
- break;
- }
- case NCPkgMenuFilter::F_Recommended:
- {
- if ( patchPtr->category() == "recommended" )
- displayPatch = true;
- break;
- }
- case NCPkgMenuFilter::F_Optional:
- {
- if ( patchPtr->category() == "optional" )
- displayPatch = true;
- break;
- }
- default:
- yuiWarning() << "Unknown patch filter" << endl;
+ yuiError() << "Patch data not valid" << endl;
+ return false;
}
+ yuiDebug() << "Filter: " << filter << endl;
+ if ( filter == NCPkgMenuFilter::F_All )
+ {
+ displayPatch = true;
+ }
+ // only show patches relevant for the system, means any of the patch
packages is installed
+ else if ( selectable->candidateObj().isRelevant() )
+ {
+ switch ( filter )
+ {
+ case NCPkgMenuFilter::F_Unneeded: // unneeded means satisfied
(installed)
+ {
+ if ( selectable->candidateObj().isSatisfied() &&
+
!selectable->candidateObj().status().isToBeInstalled() )
+ {
+ displayPatch = true;
+ }
+ break;
+ }
+ case NCPkgMenuFilter::F_Needed: // needed means not satisfied...
+ {
+ if ( !selectable->candidateObj().isSatisfied() ||
+ // or already satified because the patch is
preselected
+ selectable->candidateObj().status().isToBeInstalled()
)
+ displayPatch = true;
+ break;
+ }
+ case NCPkgMenuFilter::F_Security:
+ {
+ if ( patchPtr->category() == "security" )
+ displayPatch = true;
+ break;
+ }
+ case NCPkgMenuFilter::F_Recommended:
+ {
+ if ( patchPtr->category() == "recommended" )
+ displayPatch = true;
+ break;
+ }
+ case NCPkgMenuFilter::F_Optional:
+ {
+ if ( patchPtr->category() == "optional" )
+ displayPatch = true;
+ break;
+ }
+ default:
+ yuiWarning() << "Unknown patch filter" << endl;
+ }
+ }
if ( displayPatch )
packageList->createPatchEntry( patchPtr, selectable );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgMenuAction.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuAction.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgMenuAction.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuAction.cc 2013-07-11
14:18:09.000000000 +0200
@@ -103,12 +103,15 @@
toggleItem = new YMenuItem( _( "&Toggle [SPACE]" ) );
installItem = new YMenuItem( _( "&Install [+]" ) );
deleteItem = new YMenuItem( _( "&Do Not Install [-]" ) );
+ tabooItem = new YMenuItem( _( "&Lock or Taboo [!]" ) );
// end: Update Actions menu
- // update isn't supported for patches
+
+ // update and delete aren't supported for patches
items.push_back( toggleItem );
items.push_back( installItem );
items.push_back( deleteItem );
+ items.push_back( tabooItem );
addItems( items );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgMenuFilter.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuFilter.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgMenuFilter.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuFilter.cc 2013-07-11
14:18:09.000000000 +0200
@@ -71,21 +71,21 @@
// begin:
needed = new YMenuItem( _( "&Needed Patches" ) );
// _( "Re&levant Patches" )
+ unneeded = new YMenuItem( _( "&Installed Patches" ) );
// _( "&Satisfied Patches" ) );
- unneeded = new YMenuItem( _( "&Unneeded Patches" ) );
- allPatches = new YMenuItem( _( "&All Patches" ) );
recommended = new YMenuItem( _( "&Recommended" ) );
security = new YMenuItem( _( "&Security" ) );
optional = new YMenuItem( _( "&Optional" ) );
+ allPatches = new YMenuItem( _( "&All Patches" ) );
// end:
search = new YMenuItem( _( "S&earch" ) );
items.push_back( needed );
items.push_back( unneeded );
- items.push_back( allPatches );
items.push_back( recommended );
items.push_back( security );
items.push_back( optional );
+ items.push_back( allPatches );
items.push_back( search );
addItems( items );
@@ -149,6 +149,7 @@
pkgList->setKeyboardFocus();
+ pkgList->showInformation( );
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgMenuHelp.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuHelp.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgMenuHelp.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuHelp.cc 2013-07-11
14:18:09.000000000 +0200
@@ -142,6 +142,7 @@
text += NCPkgStrings::YouHelp1();
text += NCPkgStrings::YouHelp2();
text += NCPkgStrings::YouHelp3();
+ text += NCPkgStrings::YouHelp4();
}
else
yuiError() << "zatim nic" << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgPackageDetails.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgPackageDetails.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgPackageDetails.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgPackageDetails.cc 2013-07-11
14:18:09.000000000 +0200
@@ -406,13 +406,6 @@
descr += patchPtr->edition().asString();
descr += "</p>";
- if ( !selectable->installedEmpty()
- && selectable->installedObj().isBroken() )
- {
- descr += _( "----- this patch is broken !!! -----" );
- descr += "<br>";
- }
-
// get and format the patch description
std::string value = patchPtr->description();
std::string html_text = "";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgStatusStrategy.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgStatusStrategy.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgStatusStrategy.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgStatusStrategy.cc 2013-07-11
14:18:09.000000000 +0200
@@ -352,57 +352,64 @@
ZyppObj objPtr,
ZyppStatus & newStat )
{
- if ( !slbPtr )
+ if ( !slbPtr || !slbPtr->hasCandidateObj() )
return false;
bool valid = true;
ZyppStatus retStat = S_NoInst;
ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr );
- bool installed = !slbPtr->installedEmpty();
+ bool toBeInst = slbPtr->candidateObj().status().isToBeInstalled();
+ bool isRelevant = slbPtr->candidateObj().isRelevant();
+ bool isBroken = slbPtr->candidateObj().isBroken();
+
+ yuiMilestone() << slbPtr->name() << ": " << (toBeInst?"to be
installed":"not to be installed,")
+ << " old status: " << oldStatus << endl;
// get the new status
switch ( key )
{
case '-':
- if ( installed ) // installed ->set status to delete
- {
- retStat = S_Del;
- }
- else
- {
+ // To be installed includes S_Install and S_AutoInstall
+ if ( toBeInst )
+ {
retStat = S_NoInst;
}
+ else if ( oldStatus == S_Taboo )
+ {
+ if ( isBroken )
+ {
+ retStat = S_Install;
+ }
+ else
+ {
+ retStat = S_NoInst;
+ }
+ }
+ else // patches cannot be deleted
+ {
+ valid = false;
+ }
break;
case '+':
- if ( oldStatus == S_NoInst
- || oldStatus == S_AutoInstall )
+ // only relevant patches can be installed
+ if ( isRelevant &&
+ ( oldStatus == S_NoInst ||
+ oldStatus == S_AutoInstall ||
+ oldStatus == S_KeepInstalled ) )
{
retStat = S_Install;
}
- else if ( oldStatus == S_Del
- || oldStatus == S_AutoDel)
- {
- retStat = S_KeepInstalled;
- }
else
{
valid = false;
}
-
break;
- case '>':
- if ( oldStatus == S_KeepInstalled
- || oldStatus == S_Del
- || oldStatus == S_AutoDel )
- {
- if ( slbPtr->hasCandidateObj() )
- {
- retStat = S_Update;
- }
- }
- else
- {
- valid = false;
+ case '!':
+ {
+ // For patches there isn't an installed object available
(patches are not installed,
+ // they can be satisfied because required version/s of the
patch package/s is/are
+ // installed). Therefore they only can be set to S_Taboo (not
to S_Protected).
+ retStat = S_Taboo;
}
break;
default:
@@ -411,13 +418,14 @@
}
if ( valid )
+ {
newStat = retStat;
+ }
+ yuiMilestone() << "New status: " << newStat << endl;
return valid;
}
-#if EXTRA_PATCH_STRATEGY
-
///////////////////////////////////////////////////////////////////
//
// PatchStatStrategy::toggleStatus()
@@ -428,49 +436,47 @@
ZyppObj objPtr,
ZyppStatus & newStat )
{
- if ( !slbPtr )
+ if ( !slbPtr || !slbPtr->hasCandidateObj() )
return false;
bool ok = true;
ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr );
+ bool isBroken = slbPtr->candidateObj().isBroken();
ZyppStatus newStatus = oldStatus;
switch ( oldStatus )
{
case S_Install:
case S_AutoInstall:
- newStatus =S_NoInst ;
- break;
- case S_Update:
- case S_AutoUpdate:
- case S_AutoDel:
- newStatus = S_KeepInstalled;
+ newStatus = S_NoInst ;
break;
case S_KeepInstalled:
- if ( slbPtr->hasCandidateObj() )
- {
- newStatus = S_Update;
- }
+ newStatus = S_Install;
break;
case S_NoInst:
newStatus = S_Install ;
break;
case S_Taboo:
- newStatus = S_NoInst;
- break;
- case S_Protected:
- newStatus = S_KeepInstalled;
+ if ( isBroken )
+ {
+ newStatus = S_Install;
+ }
+ else
+ {
+ newStatus = S_NoInst;
+ }
break;
default:
newStatus = oldStatus;
}
+ yuiMilestone() << "Status toogled: old " << oldStatus << ", new " <<
newStatus << endl;
newStat = newStatus;
return ok;
}
-#endif
+
/////////////////////////////////////////////////////////////////
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgStatusStrategy.h
new/libyui-ncurses-pkg-2.44.2/src/NCPkgStatusStrategy.h
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgStatusStrategy.h 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgStatusStrategy.h 2013-07-11
14:18:09.000000000 +0200
@@ -45,7 +45,6 @@
#include "NCZypp.h"
#include <zypp/ui/Selectable.h>
-#define EXTRA_PATCH_STRATEGY 0
//------------------------------------------------------------
// Abstract base class for strategies to get status for packages or patches
@@ -218,7 +217,6 @@
ZyppObj objPtr,
ZyppStatus & newStat );
-#if EXTRA_PATCH_STRATEGY
/**
* Toggles the patch status (e.g. from selected to unselected)
* @param The object pointer
@@ -227,7 +225,6 @@
virtual bool toggleStatus( ZyppSel slbPtr,
ZyppObj objPtr,
ZyppStatus & newStat );
-#endif
/**
* Sets the status of the patch AND the status of the patch packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgStrings.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.cc
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgStrings.cc 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.cc 2013-07-11
14:18:09.000000000 +0200
@@ -626,6 +626,13 @@
return value;
}
+const std::string NCPkgStrings::YouHelp4()
+{
+ // help text online udpate continue
+ static const std::string value = _( "<p>More details about the
status:<br>If there are several patches for a package or for a set of packages
which aren't yet applied to the system all got preselected and have status
<b>a+</b>. If you want to deselect one of the patches with '-' it might show
the status <b>i</b> afterwards. This is because any of the other patches
concerning the same packages is still selected and the newer packages would be
installed and withit would satisfy this patch.</p>");
+ return value;
+}
+
//
// label, text for translation
//
@@ -731,8 +738,7 @@
{
// A label for a list of YOU Patches - keep it short - max. 25 chars!
// (the list shows all patches which are already installed)
- //static const std::string value = _( "Installed Patches" );
- static const std::string value = _( "Unneeded Patches" );
+ static const std::string value = _( "Installed Patches" );
//static const std::string value = _( "Satisfied Patches" );
return value;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.1/src/NCPkgStrings.h
new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.h
--- old/libyui-ncurses-pkg-2.44.1/src/NCPkgStrings.h 2013-07-03
14:28:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.h 2013-07-11
14:18:09.000000000 +0200
@@ -237,8 +237,9 @@
static const std::string YouHelp1();
static const std::string YouHelp2();
static const std::string YouHelp3();
+ static const std::string YouHelp4();
- static const std::string WarningLabel();
+ static const std::string WarningLabel();
static const std::string ErrorLabel();
static const std::string NotifyLabel();
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
