commit yast2-country

11 Sep 2007

Hello community,

here is the log from the commit of package yast2-country
checked in at Tue Sep 11 21:42:48 CEST 2007.

--------

--- yast2-country/yast2-country.changes	2007-09-06 18:58:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes	2007-09-11 21:32:25.533320000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 11 21:21:01 CEST 2007 - jsuchome@suse.cz
+
+- do not call xset in text mode (#309438)
+- 2.15.19
+
+-------------------------------------------------------------------

Old:
----
  yast2-country-2.15.18.tar.bz2

New:
----
  yast2-country-2.15.19.tar.bz2

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

Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.W18950/_old	2007-09-11 21:42:32.000000000 +0200
+++ /var/tmp/diff_new_pack.W18950/_new	2007-09-11 21:42:32.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-country (Version 2.15.18)
+# spec file for package yast2-country (Version 2.15.19)
 #
 # 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-country
-Version:        2.15.18
-Release:        13
+Version:        2.15.19
+Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-country-2.15.18.tar.bz2
+Source0:        yast2-country-2.15.19.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
 Requires:       yast2-trans-stats yast2-perl-bindings timezone
@@ -64,7 +64,7 @@
     Jiri Suchomel <jsuchome@suse.cz>
 
 %prep
-%setup -n yast2-country-2.15.18
+%setup -n yast2-country-2.15.19
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,9 @@
 %{prefix}/share/applications/YaST2/timezone.desktop
 
 %changelog
+* Tue Sep 11 2007 - jsuchome@suse.cz
+- do not call xset in text mode (#309438)
+- 2.15.19
 * Thu Sep 06 2007 - kmachalkova@suse.cz
 - Accept also IP as a valid NTP server address (handle receiving
   `invalid_hostname from ntp-client) (#308265)

++++++ yast2-country-2.15.18.tar.bz2 -> yast2-country-2.15.19.tar.bz2 ++++++
++++ 11395 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.15.18/configure.in new/yast2-country-2.15.19/configure.in
--- old/yast2-country-2.15.18/configure.in	2007-07-27 12:20:15.000000000 +0200
+++ new/yast2-country-2.15.19/configure.in	2006-12-11 09:59:02.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-country
 dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - 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-country, 2.15.13, http://bugs.opensuse.org/, yast2-country)
+AC_INIT(yast2-country, 2.15.2, http://bugs.opensuse.org/, yast2-country)
 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.13"
+VERSION="2.15.2"
 RPMNAME="yast2-country"
 MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>"
 
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.15.18/language/testsuite/tests/IncompleteTranslation.ycp new/yast2-country-2.15.19/language/testsuite/tests/IncompleteTranslation.ycp
--- old/yast2-country-2.15.18/language/testsuite/tests/IncompleteTranslation.ycp	2007-05-18 10:56:17.000000000 +0200
+++ new/yast2-country-2.15.19/language/testsuite/tests/IncompleteTranslation.ycp	2006-09-08 11:20:22.000000000 +0200
@@ -1,7 +1,7 @@
 /**
  * tests for Language::IncompleteTranslation
  * Author:	jsuchome@suse.cz
- * $Id: IncompleteTranslation.ycp 31976 2006-07-25 08:02:24Z jsuchome $
+ * $Id: IncompleteTranslation.ycp 31977 2006-07-25 08:02:35Z jsuchome $
  */
 {
 
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.15.18/missing new/yast2-country-2.15.19/missing
--- old/yast2-country-2.15.18/missing	2007-07-27 12:20:22.000000000 +0200
+++ new/yast2-country-2.15.19/missing	2006-12-11 09:59:08.000000000 +0100
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,8 +33,6 @@
 fi
 
 run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -46,7 +44,7 @@
 
 msg="missing on your system"
 
-case $1 in
+case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -79,7 +77,6 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
 # 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).
-case $1 in
+case "$1" in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -138,7 +135,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case "$1" in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -167,7 +164,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case $f in
+      case "$f" in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
     if test -f "$file"; then
 	touch $file
     else
@@ -217,25 +214,25 @@
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
+    if [ $# -ne 1 ]; then
         eval LASTARG="\${$#}"
-	case $LASTARG in
+	case "$LASTARG" in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if test ! -f y.tab.h; then
+    if [ ! -f y.tab.h ]; then
 	echo >y.tab.h
     fi
-    if test ! -f y.tab.c; then
+    if [ ! -f y.tab.c ]; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -247,18 +244,18 @@
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if test $# -ne 1; then
+    if [ $# -ne 1 ]; then
         eval LASTARG="\${$#}"
-	case $LASTARG in
+	case "$LASTARG" in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if test ! -f lex.yy.c; then
+    if [ ! -f lex.yy.c ]; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -270,9 +267,11 @@
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -324,13 +317,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case $firstarg in
+	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case $firstarg in
+	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
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.15.18/timezone/src/Timezone.ycp new/yast2-country-2.15.19/timezone/src/Timezone.ycp
--- old/yast2-country-2.15.18/timezone/src/Timezone.ycp	2007-08-09 08:57:07.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/src/Timezone.ycp	2007-09-11 21:20:55.000000000 +0200
@@ -163,7 +163,8 @@
     //
     if (!Mode::config () && really )
     {
-	if (Stage::initial () || Stage::cont ())
+	boolean textmode	= Language::GetTextMode ();
+	if ((Stage::initial () || Stage::cont ()) && !textmode)
 	    SCR::Execute ( .target.bash, "/usr/bin/xset -dpms");
 	string cmd = "/usr/sbin/zic -l " + timezone;
 	y2milestone( "Set cmd %1", cmd );
@@ -174,7 +175,7 @@
 	    y2milestone( "Set cmd %1", cmd );
 	    y2milestone( "Set ret %1", SCR::Execute(.target.bash_output, cmd ));
 	}
-	if (Stage::initial () || Stage::cont ())
+	if ((Stage::initial () || Stage::cont ()) && !textmode)
 	    SCR::Execute ( .target.bash, "/usr/bin/xset +dpms");
     }
 
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.15.18/timezone/testsuite/tests/GetDateTimeMap.ycp new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTimeMap.ycp
--- old/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTimeMap.ycp	2007-05-18 10:56:17.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTimeMap.ycp	2006-09-08 11:21:28.000000000 +0200
@@ -2,7 +2,7 @@
  * test for Timezone::GetDateTimeMap
  *	- check correct parsing after changed time format (bug #62312)
  * Author: jsuchome@suse.cz
- * $Id: GetDateTimeMap.ycp 31665 2006-06-26 14:24:27Z jsuchome $
+ * $Id: GetDateTimeMap.ycp 31664 2006-06-26 14:24:19Z jsuchome $
  */
 {
     // testedfiles: Timezone.ycp
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.15.18/timezone/testsuite/tests/GetDateTime.ycp new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTime.ycp
--- old/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTime.ycp	2007-05-18 10:56:17.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTime.ycp	2006-09-08 11:21:28.000000000 +0200
@@ -1,7 +1,7 @@
 /**
  * tests for Timezone::GetDateTime
  * Author: jsuchome@suse.cz
- * $Id: GetDateTime.ycp 31665 2006-06-26 14:24:27Z jsuchome $
+ * $Id: GetDateTime.ycp 31664 2006-06-26 14:24:19Z jsuchome $
  */
 {
 
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.15.18/VERSION new/yast2-country-2.15.19/VERSION
--- old/yast2-country-2.15.18/VERSION	2007-08-31 17:26:05.000000000 +0200
+++ new/yast2-country-2.15.19/VERSION	2007-09-11 21:22:01.000000000 +0200
@@ -1 +1 @@
-2.15.18
+2.15.19


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



Remember to have fun...

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

    

root＠Hilbert.suse.de

tags

participants (1)