Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit yast2-ncurses
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 03 Mar 2007 14:39:05 +0100
  • Message-id: <20070303133906.2522B678183@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-ncurses
checked in at Sat Mar 3 14:39:05 CET 2007.

--------
--- yast2-ncurses/yast2-ncurses.changes 2007-02-22 12:43:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-03-02 12:44:17.289193000 +0100
@@ -1,0 +2,12 @@
+Fri Mar 2 11:11:50 CET 2007 - kmachalkova@xxxxxxx
+
+- Replaced 'Solve' label with 'OK -- Try again' in pkg manager (to
+ be compatible with Qt), enhanced help text (#213602)
+- 2.15.10
+
+-------------------------------------------------------------------
+Thu Mar 1 14:30:28 CET 2007 - gs@xxxxxxx
+
+- Replace &product; in RichText widget correctly (bug #247845)
+
+-------------------------------------------------------------------

Old:
----
yast2-ncurses-2.15.9.tar.bz2

New:
----
yast2-ncurses-2.15.10.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.T29513/_old 2007-03-03 14:39:00.000000000 +0100
+++ /var/tmp/diff_new_pack.T29513/_new 2007-03-03 14:39:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.15.9)
+# spec file for package yast2-ncurses (Version 2.15.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild

Name: yast2-ncurses
-Version: 2.15.9
+Version: 2.15.10
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.15.9.tar.bz2
+Source0: yast2-ncurses-2.15.10.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel
@@ -44,7 +44,7 @@


%prep
-%setup -n yast2-ncurses-2.15.9
+%setup -n yast2-ncurses-2.15.10

%build
%{prefix}/bin/y2tool y2autoconf
@@ -77,6 +77,12 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses

%changelog
+* Fri Mar 02 2007 - kmachalkova@xxxxxxx
+- Replaced 'Solve' label with 'OK -- Try again' in pkg manager (to
+ be compatible with Qt), enhanced help text (#213602)
+- 2.15.10
+* Thu Mar 01 2007 - gs@xxxxxxx
+- Replace &product; in RichText widget correctly (bug #247845)
* Thu Feb 22 2007 - gs@xxxxxxx
- Online Update: Add column with patch version and show the version in
the description window (bug #239829)

++++++ yast2-ncurses-2.15.9.tar.bz2 -> yast2-ncurses-2.15.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.9/configure new/yast2-ncurses-2.15.10/configure
--- old/yast2-ncurses-2.15.9/configure 2006-12-12 11:07:03.000000000 +0100
+++ new/yast2-ncurses-2.15.10/configure 2007-02-27 10:37:41.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.1.
+# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.9.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ncurses'
PACKAGE_TARNAME='yast2-ncurses'
-PACKAGE_VERSION='2.15.1'
-PACKAGE_STRING='yast2-ncurses 2.15.1'
+PACKAGE_VERSION='2.15.9'
+PACKAGE_STRING='yast2-ncurses 2.15.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1421,7 +1421,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-ncurses 2.15.1 to adapt to many kinds of systems.
+\`configure' configures yast2-ncurses 2.15.9 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1492,7 +1492,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ncurses 2.15.1:";;
+ short | recursive ) echo "Configuration of yast2-ncurses 2.15.9:";;
esac
cat <<\_ACEOF

@@ -1600,7 +1600,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ncurses configure 2.15.1
+yast2-ncurses configure 2.15.9
generated by GNU Autoconf 2.60

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1614,7 +1614,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

-It was created by yast2-ncurses $as_me 2.15.1, which was
+It was created by yast2-ncurses $as_me 2.15.9, which was
generated by GNU Autoconf 2.60. Invocation command line was

$ $0 $@
@@ -2415,7 +2415,7 @@

# Define the identity of the package.
PACKAGE='yast2-ncurses'
- VERSION='2.15.1'
+ VERSION='2.15.9'


cat >>confdefs.h <<_ACEOF
@@ -2642,7 +2642,7 @@



-VERSION="2.15.1"
+VERSION="2.15.9"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova <kmachalkova@xxxxxxx>"

@@ -21648,7 +21648,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ncurses $as_me 2.15.1, which was
+This file was extended by yast2-ncurses $as_me 2.15.9, which was
generated by GNU Autoconf 2.60. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -21701,7 +21701,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ncurses config.status 2.15.1
+yast2-ncurses config.status 2.15.9
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.9/configure.in new/yast2-ncurses-2.15.10/configure.in
--- old/yast2-ncurses-2.15.9/configure.in 2006-12-12 11:06:53.000000000 +0100
+++ new/yast2-ncurses-2.15.10/configure.in 2007-02-27 10:37:29.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses
dnl
-dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-ncurses, 2.15.1, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.15.9, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs

dnl Important YaST2 variables
-VERSION="2.15.1"
+VERSION="2.15.9"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova <kmachalkova@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.9/src/NCRichText.cc new/yast2-ncurses-2.15.10/src/NCRichText.cc
--- old/yast2-ncurses-2.15.9/src/NCRichText.cc 2006-11-05 09:12:13.000000000 +0100
+++ new/yast2-ncurses-2.15.10/src/NCRichText.cc 2007-03-02 11:23:29.000000000 +0100
@@ -95,7 +95,8 @@
break; // no ';' -> no need to continue

const wstring repl = entityLookup( txt.substr( special+1, colon-special-1 ) );
- if ( !repl.empty() )
+ if ( !repl.empty()
+ || txt.substr( special+1, colon-special-1 ) == L"product" ) // always replace &product;
{
txt.replace( special, colon-special+1, repl );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.9/src/PkgNames.cc new/yast2-ncurses-2.15.10/src/PkgNames.cc
--- old/yast2-ncurses-2.15.9/src/PkgNames.cc 2007-01-12 13:55:08.000000000 +0100
+++ new/yast2-ncurses-2.15.10/src/PkgNames.cc 2007-03-02 11:11:45.000000000 +0100
@@ -684,8 +684,9 @@

const string PkgNames::SolveLabel()
{
- // the label of the Solve button
- static const string value = _( "&Solve" );
+ // the label of the Solve button - 'try again' implies that user
+ // has to make some action (#213602)
+ static const string value = _( "&OK -- Try Again" );
return value;
}

@@ -1433,7 +1434,7 @@
const string PkgNames::HelpOnStatus2()
{
// part 1 of help text package status
- static const string value = _( "<p>By default, the package dependencies are checked with every status change. You will be informed about package conflicts and additionally required packages will be selected (the menu item <i>Etc.</i>/<i>Dependencies</i> offers different settings).</p>" );
+ static const string value = _( "<p>By default, the package dependencies are checked with every status change. You will be informed about package conflicts and additionally required packages will be selected (the menu item <i>Etc.</i>/<i>Dependencies</i> offers different settings). To resolve conflict, select one of the offered solution and press 'OK -- Try Again'.</p>" );
return value;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.9/VERSION new/yast2-ncurses-2.15.10/VERSION
--- old/yast2-ncurses-2.15.9/VERSION 2007-02-22 12:42:25.000000000 +0100
+++ new/yast2-ncurses-2.15.10/VERSION 2007-03-02 12:40:33.000000000 +0100
@@ -1 +1 @@
-2.15.9
+2.15.10


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread