Hello community,
here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory
checked in at Thu Dec 4 18:08:13 CET 2008.
--------
--- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-11-07 18:20:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-12-04 17:46:07.433648000 +0100
@@ -1,0 +2,8 @@
+Thu Dec 4 17:33:49 CET 2008 - kmachalkova@suse.cz
+
+- Installed patterns/patches are marked as 'i' (bnc#442484)
+- Adjusted switching between pattern states (bnc#445415 for ncurses)
+- Enabled sorting of pkg tables (partially bnc#437217)
+- 2.17.11
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ncurses-pkg-2.17.10.tar.bz2
New:
----
yast2-ncurses-pkg-2.17.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.Kz7725/_old 2008-12-04 18:08:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Kz7725/_new 2008-12-04 18:08:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses-pkg (Version 2.17.10)
+# spec file for package yast2-ncurses-pkg (Version 2.17.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-ncurses-pkg
-Version: 2.17.10
+Version: 2.17.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-pkg-2.17.10.tar.bz2
+Source0: yast2-ncurses-pkg-2.17.11.tar.bz2
Prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel
@@ -45,7 +45,7 @@
%prep
-%setup -n yast2-ncurses-pkg-2.17.10
+%setup -n yast2-ncurses-pkg-2.17.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,11 @@
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so
%doc %{prefix}/share/doc/packages/yast2-ncurses-pkg
%changelog
+* Thu Dec 04 2008 kmachalkova@suse.cz
+- Installed patterns/patches are marked as 'i' (bnc#442484)
+- Adjusted switching between pattern states (bnc#445415 for ncurses)
+- Enabled sorting of pkg tables (partially bnc#437217)
+- 2.17.11
* Fri Nov 07 2008 kmachalkova@suse.cz
- Sort patterns according to order AND category (bnc#439088)
- 2.17.10
++++++ yast2-ncurses-pkg-2.17.10.tar.bz2 -> yast2-ncurses-pkg-2.17.11.tar.bz2 ++++++
++++ 58090 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.10/config.h.in new/yast2-ncurses-pkg-2.17.11/config.h.in
--- old/yast2-ncurses-pkg-2.17.10/config.h.in 2008-10-23 19:21:56.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.11/config.h.in 2008-12-04 11:23:10.000000000 +0100
@@ -45,6 +45,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.10/configure.in new/yast2-ncurses-pkg-2.17.11/configure.in
--- old/yast2-ncurses-pkg-2.17.10/configure.in 2008-10-23 19:21:39.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.11/configure.in 2008-12-04 11:22:54.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses-pkg
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses-pkg, 2.17.8, http://bugs.opensuse.org/, yast2-ncurses-pkg)
+AC_INIT(yast2-ncurses-pkg, 2.17.10, http://bugs.opensuse.org/, yast2-ncurses-pkg)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.8"
+VERSION="2.17.10"
RPMNAME="yast2-ncurses-pkg"
MAINTAINER="Katarina Machalkova "
@@ -144,8 +144,14 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+PKG_CHECK_EXISTS([yast2-core],[
+ PKG_CHECK_MODULES(Y2CORE, yast2-core)
+])
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.10/src/NCPkgStatusStrategy.cc new/yast2-ncurses-pkg-2.17.11/src/NCPkgStatusStrategy.cc
--- old/yast2-ncurses-pkg-2.17.10/src/NCPkgStatusStrategy.cc 2008-10-23 19:14:29.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.11/src/NCPkgStatusStrategy.cc 2008-12-04 16:55:35.000000000 +0100
@@ -183,7 +183,6 @@
if ( installed )
{
retStat = S_Protected;
- yuiError() << "porn.bat" << endl;
}
break;
default:
@@ -215,6 +214,8 @@
ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr );
ZyppStatus newStatus = oldStatus;
+ ZyppPattern patPtr = tryCastToZyppPattern (objPtr);
+
switch ( oldStatus )
{
@@ -228,7 +229,10 @@
newStatus = S_Del;
break;
case S_KeepInstalled:
- if ( slbPtr->hasCandidateObj() )
+ if ( patPtr )
+ newStatus = S_Install;
+
+ else if ( slbPtr->hasCandidateObj() )
{
newStatus = S_Update;
}
@@ -238,7 +242,7 @@
}
break;
case S_NoInst:
- if ( slbPtr->hasCandidateObj() )
+ if ( slbPtr->hasCandidateObj() || patPtr )
{
newStatus = S_Install;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.10/src/NCPkgTable.cc new/yast2-ncurses-pkg-2.17.11/src/NCPkgTable.cc
--- old/yast2-ncurses-pkg-2.17.10/src/NCPkgTable.cc 2008-10-23 19:14:29.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.11/src/NCPkgTable.cc 2008-12-04 17:00:51.000000000 +0100
@@ -82,14 +82,7 @@
case S_NoInst: // Is not installed and will not be installed
return " ";
case S_KeepInstalled: // Is installed - keep this version
- {
- ZyppPattern patternPtr = tryCastToZyppPattern (dataPointer);
- ZyppPatch patchPtr = tryCastToZyppPatch( dataPointer );
- if ( patternPtr || patchPtr )
- return " :-)";
- else
- return " i ";
- }
+ return " i ";
case S_Install: // Will be installed
return " + ";
case S_Del: // Will be deleted
@@ -810,27 +803,32 @@
case KEY_HOME: {
// show the corresponding information
showInformation( );
- ret = NCursesEvent::handled;
break;
}
case KEY_SPACE:
case KEY_RETURN: {
// toggle status
toggleObjStatus( );
-
- ret = NCursesEvent::handled;
break;
}
- default: {
+ case '-':
+ case '+':
+ case '>':
+ case '<':
+ case '!':
+ case '*': {
// set the new status
changeObjStatus( key );
-
- ret = NCursesEvent::handled;
+ break;
+ }
+ //from the parent class, esp. for CTRL-O to enable sorting
+ default: {
+ NCTable::wHandleInput( key);
break;
}
}
- return ret;
+ return NCursesEvent::handled;
}
///////////////////////////////////////////////////////////////////
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.10/VERSION new/yast2-ncurses-pkg-2.17.11/VERSION
--- old/yast2-ncurses-pkg-2.17.10/VERSION 2008-11-07 17:08:41.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.11/VERSION 2008-12-04 17:40:24.000000000 +0100
@@ -1 +1 @@
-2.17.10
+2.17.11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org