Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at Thu Jan 7 13:05:34 CET 2010.
--------
--- yast2-country/yast2-country.changes 2009-12-04 14:20:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2010-01-04 10:53:34.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 4 10:47:25 CET 2010 - jsuchome@suse.cz
+
+- returned keyboard desktop file, adapted help text (bnc#560713)
+- 2.19.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-country-2.19.3.tar.bz2
New:
----
yast2-country-2.19.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.FTqQhz/_old 2010-01-07 13:05:31.000000000 +0100
+++ /var/tmp/diff_new_pack.FTqQhz/_new 2010-01-07 13:05:31.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-country (Version 2.19.3)
+# spec file for package yast2-country (Version 2.19.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,10 +19,10 @@
Name: yast2-country
-Version: 2.19.3
+Version: 2.19.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.19.3.tar.bz2
+Source0: yast2-country-2.19.4.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -73,7 +73,7 @@
timezone) for yast2.
%prep
-%setup -n yast2-country-2.19.3
+%setup -n yast2-country-2.19.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -120,6 +120,7 @@
/usr/share/YaST2/schema/autoyast/rnc/*.rnc
%{prefix}/share/applications/YaST2/yast-language.desktop
%{prefix}/share/applications/YaST2/timezone.desktop
+%{prefix}/share/applications/YaST2/keyboard.desktop
%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.yapi.*.policy
%package data
++++++ yast2-country-2.19.3.tar.bz2 -> yast2-country-2.19.4.tar.bz2 ++++++
++++ 9568 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-country-2.19.3/VERSION new/yast2-country-2.19.4/VERSION
--- old/yast2-country-2.19.3/VERSION 2009-12-04 14:13:20.000000000 +0100
+++ new/yast2-country-2.19.4/VERSION 2010-01-04 10:50:13.000000000 +0100
@@ -1 +1 @@
-2.19.3
+2.19.4
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-country-2.19.3/configure.in new/yast2-country-2.19.4/configure.in
--- old/yast2-country-2.19.3/configure.in 2009-07-31 08:14:12.000000000 +0200
+++ new/yast2-country-2.19.4/configure.in 2010-01-04 10:50:22.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-country
dnl
-dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-country, 2.18.15, http://bugs.opensuse.org/, yast2-country)
+AC_INIT(yast2-country, 2.19.4, http://bugs.opensuse.org/, yast2-country)
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.18.15"
+VERSION="2.19.4"
RPMNAME="yast2-country"
MAINTAINER="Jiri Suchomel "
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-country-2.19.3/keyboard/src/dialogs.ycp new/yast2-country-2.19.4/keyboard/src/dialogs.ycp
--- old/yast2-country-2.19.3/keyboard/src/dialogs.ycp 2008-12-18 14:47:04.000000000 +0100
+++ new/yast2-country-2.19.4/keyboard/src/dialogs.ycp 2010-01-04 10:51:42.000000000 +0100
@@ -10,7 +10,7 @@
* Summary:
* Dialogs for keyboard configuration
*
- * $Id: dialogs.ycp 50253 2008-08-21 10:40:18Z jsuchome $
+ * $Id: dialogs.ycp 60212 2010-01-04 09:51:26Z jsuchome $
*/
{
textdomain "country";
@@ -208,24 +208,36 @@
// help text for keyboard screen (header)
string help_text = _("
-<p><big><b>Keyboard Configuration</b></big></p>") +
+<p><big><b>Keyboard Configuration</b></big></p>");
- // help text for keyboard screen
- _("<p>
+ if (Stage::initial () || Stage::firstboot ())
+ {
+
+ help_text = help_text +
+ // help text for keyboard screen (installation)
+ _("<p>
Choose the <b>Keyboard Layout</b> to use for
installation and in the installed system.
Test the layout in <b>Test</b>.
For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>.
</p>
");
-
- // general help trailer
- help_text = help_text + _("<p>
+ // general help trailer
+ help_text = help_text + _("<p>
If unsure, use the default values already selected.
</p>");
+ }
+ else
+ help_text = help_text +
+ // help text for keyboard screen (installation)
+ _("<p>
+Choose the <b>Keyboard Layout</b> to use in the system.
+For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>.</p>
+<p>Find more options as well as more layouts in the keyboard layout tool of your desktop environment.</p>
+");
// Screen title for keyboard screen
- Wizard::SetContents ( _("Keyboard Configuration"), contents, help_text,
+ Wizard::SetContents ( _("System Keyboard Configuration"), contents, help_text,
args["enable_back"]:true, args["enable_next"]:true);
Wizard::SetDesktopIcon("keyboard");
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-country-2.19.3/missing new/yast2-country-2.19.4/missing
--- old/yast2-country-2.19.3/missing 2009-07-31 08:14:16.000000000 +0200
+++ new/yast2-country-2.19.4/missing 2010-01-04 10:50:27.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org