December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ncurses
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Thu Dec 7 21:45:37 CET 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-12-05 10:12:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-12-06 17:30:51.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 5 10:33:13 CET 2006 - kmachalkova(a)suse.cz + +- Added RunInTerminal UI builtin for running external programs in + the same terminal +- 2.15.1 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.15.0.tar.bz2 New: ---- yast2-ncurses-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.7tUw46/_old 2006-12-07 21:45:30.000000000 +0100 +++ /var/tmp/diff_new_pack.7tUw46/_new 2006-12-07 21:45:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.15.0) +# spec file for package yast2-ncurses (Version 2.15.1) # # Copyright (c) 2006 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.0 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.15.0.tar.bz2 +Source0: yast2-ncurses-2.15.1.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -34,6 +34,8 @@ Requires: glibc-locale #zypp::ui::PatternContents Requires: libzypp >= 2.7.0 +# UI builtins +Requires: yast2-core >= 2.15.1 %description This package contains the character based (ncurses) user interface @@ -42,7 +44,7 @@ %prep -%setup -n yast2-ncurses-2.15.0 +%setup -n yast2-ncurses-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +78,10 @@ %changelog -n yast2-ncurses * Tue Dec 05 2006 - kmachalkova(a)suse.cz +- Added RunInTerminal UI builtin for running external programs in + the same terminal +- 2.15.1 +* Tue Dec 05 2006 - kmachalkova(a)suse.cz - Use the same color palette - 8 colors - for all terminals (thanks to tiwai) (#221614) - Highlight keyboard shortcuts in mono theme (#224892) ++++++ yast2-ncurses-2.15.0.tar.bz2 -> yast2-ncurses-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.0/VERSION new/yast2-ncurses-2.15.1/VERSION --- old/yast2-ncurses-2.15.0/VERSION 2006-12-05 09:59:38.000000000 +0100 +++ new/yast2-ncurses-2.15.1/VERSION 2006-12-05 10:33:06.000000000 +0100 @@ -1 +1 @@ -2.15.0 +2.15.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.0/configure new/yast2-ncurses-2.15.1/configure --- old/yast2-ncurses-2.15.0/configure 2006-12-05 09:59:57.000000000 +0100 +++ new/yast2-ncurses-2.15.1/configure 2006-12-06 17:15:16.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.0. +# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.1. # # 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.0' -PACKAGE_STRING='yast2-ncurses 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-ncurses 2.15.1' 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.0 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.15.1 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.0:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.15.1:";; 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.0 +yast2-ncurses configure 2.15.1 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.0, which was +It was created by yast2-ncurses $as_me 2.15.1, 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.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2642,7 +2642,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -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.0, which was +This file was extended by yast2-ncurses $as_me 2.15.1, 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.0 +yast2-ncurses config.status 2.15.1 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.0/configure.in new/yast2-ncurses-2.15.1/configure.in --- old/yast2-ncurses-2.15.0/configure.in 2006-12-05 09:59:44.000000000 +0100 +++ new/yast2-ncurses-2.15.1/configure.in 2006-12-06 17:15:04.000000000 +0100 @@ -3,7 +3,7 @@ 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.0, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.15.1, 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.0" +VERSION="2.15.1" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.0/src/NCstyle.cc new/yast2-ncurses-2.15.1/src/NCstyle.cc --- old/yast2-ncurses-2.15.0/src/NCstyle.cc 2006-12-05 10:08:49.000000000 +0100 +++ new/yast2-ncurses-2.15.1/src/NCstyle.cc 2006-12-05 10:23:13.000000000 +0100 @@ -306,7 +306,7 @@ if ( getenv( "Y2_BRAILLE" ) != NULL ) { styleName = "braille"; } else { - if ( term_t == "xterm-256color" ) + if ( term_t == "xterm" ) styleName = "xterm"; } } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.0/src/YNCursesUI.cc new/yast2-ncurses-2.15.1/src/YNCursesUI.cc --- old/yast2-ncurses-2.15.0/src/YNCursesUI.cc 2006-12-04 17:11:52.000000000 +0100 +++ new/yast2-ncurses-2.15.1/src/YNCursesUI.cc 2006-12-05 11:03:49.000000000 +0100 @@ -76,7 +76,7 @@ { string language = getenv( "LANG" ); string encoding = nl_langinfo( CODESET ); - + // setlocale ( LC_ALL, "" ) is called in WMFInterpreter::WFMInterpreter; // Explicitly set LC_CTYPE so that it won't be changed if setenv( LANG ) is called elsewhere. @@ -775,6 +775,40 @@ /////////////////////////////////////////////////////////////////// // // +// METHOD NAME : YNCursesUI::runInTerminal +// METHOD TYPE : YCPValue +// +// DESCRIPTION:: Run external program supplied as string parameter +// in the same terminal +// + +int YNCursesUI::runInTerminal( const YCPString & module ) +{ + int ret; + string cmd = module->value(); + + //Save tty modes and end ncurses mode temporarily + ::def_prog_mode(); + ::endwin(); + + //Call external program + ret = system(cmd.c_str()); + + if ( ret != 0 ) + { + NCERR << cmd << " returned:" << ret << endl; + } + + //Resume tty modes and refresh the screen + ::reset_prog_mode(); + ::refresh(); + + return ret; +} + +/////////////////////////////////////////////////////////////////// +// +// // METHOD NAME : YNCursesUI::setConsoleFont // METHOD TYPE : YCPValue // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.0/src/YNCursesUI.h new/yast2-ncurses-2.15.1/src/YNCursesUI.h --- old/yast2-ncurses-2.15.0/src/YNCursesUI.h 2006-12-04 17:11:52.000000000 +0100 +++ new/yast2-ncurses-2.15.1/src/YNCursesUI.h 2006-12-04 16:31:44.000000000 +0100 @@ -337,6 +337,14 @@ virtual YCPValue setKeyboard ( ); /** + * UI-specific runInTerminal() function. + * Returns (integer) return code of external program it spawns + * in the same terminal + */ + + virtual int runInTerminal ( const YCPString & module); + + /** * UI-specific beep() function. * Beeps the system bell. */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-packager checked in at Thu Dec 7 21:45:30 CET 2006. -------- --- yast2-packager/yast2-packager.changes 2006-11-29 12:25:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-12-06 15:30:21.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 6 13:28:52 CET 2006 - lslezak(a)suse.cz + +- inst_source: removed extra UI::CloseDialog() call (#224944), + check number of arguments +- 2.15.1 + +------------------------------------------------------------------- +Mon Dec 4 18:36:44 CET 2006 - locilka(a)suse.cz + +- Wider text entry for filter form in SLP sources. + +------------------------------------------------------------------- +Wed Nov 29 16:12:44 CET 2006 - lslezak(a)suse.cz + +- split the long label to more lines (#215340) + +------------------------------------------------------------------- Old: ---- yast2-packager-2.15.0.tar.bz2 New: ---- yast2-packager-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.iTNZjn/_old 2006-12-07 21:45:15.000000000 +0100 +++ /var/tmp/diff_new_pack.iTNZjn/_new 2006-12-07 21:45:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.15.0) +# spec file for package yast2-packager (Version 2.15.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.15.0 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.15.0.tar.bz2 +Source0: yast2-packager-2.15.1.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml Requires: checkmedia yast2-country @@ -46,7 +46,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.15.0 +%setup -n yast2-packager-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -84,6 +84,14 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Wed Dec 06 2006 - lslezak(a)suse.cz +- inst_source: removed extra UI::CloseDialog() call (#224944), + check number of arguments +- 2.15.1 +* Mon Dec 04 2006 - locilka(a)suse.cz +- Wider text entry for filter form in SLP sources. +* Wed Nov 29 2006 - lslezak(a)suse.cz +- split the long label to more lines (#215340) * Wed Nov 29 2006 - lslezak(a)suse.cz - use Report::LongError(), the error message might be very long (esp. important in ncurses UI) (#222893) ++++++ yast2-packager-2.15.0.tar.bz2 -> yast2-packager-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.0/VERSION new/yast2-packager-2.15.1/VERSION --- old/yast2-packager-2.15.0/VERSION 2006-11-29 11:25:44.000000000 +0100 +++ new/yast2-packager-2.15.1/VERSION 2006-12-06 15:23:33.000000000 +0100 @@ -1 +1 @@ -2.15.0 +2.15.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.0/configure new/yast2-packager-2.15.1/configure --- old/yast2-packager-2.15.0/configure 2006-11-29 12:23:35.000000000 +0100 +++ new/yast2-packager-2.15.1/configure 2006-12-06 15:23:46.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-packager 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-packager 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-packager 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1180,7 +1180,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-packager 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1251,7 +1251,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.15.0:";; + short | recursive ) echo "Configuration of yast2-packager 2.15.1:";; esac cat <<\_ACEOF @@ -1329,7 +1329,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.15.0 +yast2-packager configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1343,7 +1343,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-packager $as_me 2.15.0, which was +It was created by yast2-packager $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2144,7 +2144,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.15.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2371,7 +2371,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3229,7 +3229,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.15.0, which was +This file was extended by yast2-packager $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3272,7 +3272,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.15.0 +yast2-packager config.status 2.15.1 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-packager-2.15.0/configure.in new/yast2-packager-2.15.1/configure.in --- old/yast2-packager-2.15.0/configure.in 2006-11-29 12:23:30.000000000 +0100 +++ new/yast2-packager-2.15.1/configure.in 2006-12-06 15:23:42.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.15.0, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.1, http://bugs.opensuse.org/, yast2-packager) 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.0" +VERSION="2.15.1" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.0/src/clients/inst_source.ycp new/yast2-packager-2.15.1/src/clients/inst_source.ycp --- old/yast2-packager-2.15.0/src/clients/inst_source.ycp 2006-11-22 09:27:29.000000000 +0100 +++ new/yast2-packager-2.15.1/src/clients/inst_source.ycp 2006-12-06 10:57:32.000000000 +0100 @@ -34,7 +34,7 @@ // Do not sync the changes to ZENworks even if rug is present // This is handy for repairing an already out-of-sync situation boolean have_rug = (integer)SCR::Read (.target.size, "/usr/bin/rug") >= 0; - boolean norug = !have_rug || WFM::Args(0) == "norug"; + boolean norug = !have_rug || (size(WFM::Args()) > 0 && WFM::Args(0) == "norug"); // constant Plaindir string plaindir_type = "Plaindir"; @@ -562,8 +562,6 @@ } until ( exit ); - UI::CloseDialog(); - y2debug( "Return: %1", input ); return input; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.0/src/include/checkmedia/ui.ycp new/yast2-packager-2.15.1/src/include/checkmedia/ui.ycp --- old/yast2-packager-2.15.0/src/include/checkmedia/ui.ycp 2006-10-13 11:12:09.000000000 +0200 +++ new/yast2-packager-2.15.1/src/include/checkmedia/ui.ycp 2006-11-29 16:15:38.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: ui.ycp 33383 2006-10-13 09:12:02Z lslezak $ + * $Id: ui.ycp 34649 2006-11-29 15:15:33Z lslezak $ * * All user interface functions. * @@ -333,7 +333,8 @@ "); // advice check of the media -string label = _("It is recommended to check all installation media to avoid installation problems."); +// for translators: split the message to more lines if needed, use max. 50 characters per line +string label = _("It is recommended to check all installation media\nto avoid installation problems."); term contents = `VBox( // combobox label diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.0/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.1/src/modules/PackageCallbacks.ycp --- old/yast2-packager-2.15.0/src/modules/PackageCallbacks.ycp 2006-11-20 16:37:54.000000000 +0100 +++ new/yast2-packager-2.15.1/src/modules/PackageCallbacks.ycp 2006-12-06 09:29:49.000000000 +0100 @@ -367,6 +367,8 @@ if (error != 0) { + y2milestone("DonePackage(error: %1, reason: '%2')", error, reason); + string infopath = (string) SCR::Read (.target.tmpdir) + "/rpmlog"; SCR::Execute (.target.bash, "/usr/bin/tail '" + String::Quote (Installation::destdir) + Directory::logdir + "/y2logRPM' > " + infopath); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.0/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.15.1/src/modules/SourceManagerSLP.ycp --- old/yast2-packager-2.15.0/src/modules/SourceManagerSLP.ycp 2006-11-13 10:07:19.000000000 +0100 +++ new/yast2-packager-2.15.1/src/modules/SourceManagerSLP.ycp 2006-12-06 13:28:32.000000000 +0100 @@ -48,7 +48,8 @@ `Left (`Heading(`id(`search_heading), _("SLP Search"))) ), `Left ( - `ReplacePoint(`id(`search_rp), `Empty()) + // progress information + `ReplacePoint(`id(`search_rp), `Label(_("Scanning network for installation services..."))) ) ) ); @@ -81,8 +82,9 @@ // frame label _("Filter Form"), `VSquash (`HBox ( - // Only some characters are valid 'A-Z a-z 0-9 .*-' - `HSquash(`TextEntry (`id (`filter_text), "")), + `HSquash(`MinWidth( + 22, `TextEntry (`id (`filter_text), "") + )), // push button `PushButton(`id(`filter), `opt(`default), _("&Filter")), `HStretch() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zapping
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package zapping checked in at Thu Dec 7 21:44:50 CET 2006. -------- --- GNOME/zapping/zapping.changes 2006-10-07 10:39:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/zapping/zapping.changes 2006-12-04 17:09:19.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 4 17:09:13 CET 2006 - sbrabec(a)suse.cz + +- Build as user. + +------------------------------------------------------------------- New: ---- zapping-norootforbuild.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zapping.spec ++++++ --- /var/tmp/diff_new_pack.yPFuNP/_old 2006-12-07 21:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.yPFuNP/_new 2006-12-07 21:44:45.000000000 +0100 @@ -8,18 +8,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: zapping BuildRequires: arts-devel docbook-xsl-stylesheets gnome-common intltool libglade2-devel libgnomeui-devel lirc mDNSResponder-devel perl-XML-Parser python-devel scrollkeeper sgml-skel update-desktop-files zvbi-devel URL: http://zapping.sf.net -License: GPL +License: GNU General Public License (GPL) Group: Hardware/TV Autoreqprov: on Version: 0.9.6 -Release: 29 +Release: 51 Summary: GNOME TV Application Source0: %{name}-%{version}.tar.bz2 Patch0: zapping-noincaudit.diff +Patch1: zapping-norootforbuild.patch Patch4: zapping-lib64.diff Patch5: zapping-gnomescreensaver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +40,7 @@ %prep %setup -q #%patch0 +%patch1 %patch4 -p1 -b .lib64 %patch5 -p1 @@ -58,9 +61,6 @@ make %install -if test "%{buildroot}" != ""; then - rm -rf "%{buildroot}" -fi export LIB="%{_lib}" make DESTDIR="%{buildroot}" install rm %{buildroot}/opt/gnome/bin/zapping_setup_fb @@ -80,6 +80,7 @@ /opt/gnome/bin/* /opt/gnome/%{_lib}/zapping %doc /opt/gnome/share/man/man*/* +# upstream uses 4755, root, root %verify(not mode) %attr (4750,root,video) /opt/gnome/sbin/zapping_setup_fb /opt/gnome/share/applications/zapping.desktop /opt/gnome/share/zapping @@ -100,6 +101,8 @@ fi %changelog -n zapping +* Mon Dec 04 2006 - sbrabec(a)suse.cz +- Build as user. * Sat Oct 07 2006 - aj(a)suse.de - Cleanup BuildRequires. * Wed May 03 2006 - rodrigo(a)suse.de ++++++ zapping-norootforbuild.patch ++++++ --- zapping_setup_fb/Makefile.am +++ zapping_setup_fb/Makefile.am @@ -17,7 +17,7 @@ if SUID_ZSFB $(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(sbindir) - $(INSTALL) -m4755 -o $(ZSFB_OWNER) -g $(ZSFB_GROUP) \ + -$(INSTALL) -m4755 -o $(ZSFB_OWNER) -g $(ZSFB_GROUP) \ zapping_setup_fb $(DESTDIR)$(sbindir) ln -sf $(DESTDIR)$(sbindir)/zapping_setup_fb \ $(DESTDIR)$(bindir)/zapping_setup_fb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yelp
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yelp checked in at Thu Dec 7 21:44:45 CET 2006. -------- --- GNOME/yelp/yelp.changes 2006-11-22 06:29:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2006-11-30 19:37:28.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 30 17:19:39 CET 2006 - sbrabec(a)suse.cz + +- Fixed xulrunner dependencies for older products. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.wS4d47/_old 2006-12-07 21:44:37.000000000 +0100 +++ /var/tmp/diff_new_pack.wS4d47/_new 2006-12-07 21:44:37.000000000 +0100 @@ -20,7 +20,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.1 -Release: 28 +Release: 30 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 Source1: help-title.png @@ -36,17 +36,17 @@ PreReq: filesystem gconf2 Requires: gnome-doc-utils Requires: libbeagle >= 0.2.0 -%if %suse_version < 1000 +%if %suse_version > 1010 || 0%{?opensuse_bs} +BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +Requires: mozilla-xulrunner%{xulrunner_version} +%else +%if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk -Requires: mozilla -%endif -%if %suse_version > 1000 && %suse_version < 1010 -BuildRequires: mozilla-xulrunner-devel Requires: mozilla-xulrunner +%else +BuildRequires: gecko-sdk +Requires: mozilla %endif -%if %suse_version > 1010 -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -Requires: mozilla-xulrunner%{xulrunner_version} %endif Provides: suse_help_viewer @@ -118,6 +118,8 @@ %{prefix}/share/icons/hicolor/192x192/apps/yelp-icon-big.png %changelog -n yelp +* Thu Nov 30 2006 - sbrabec(a)suse.cz +- Fixed xulrunner dependencies for older products. * Wed Nov 22 2006 - hpj(a)suse.de - Update yelp-suse-20060319.patch to include correct search path for KDE documents. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-vm
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-vm checked in at Thu Dec 7 21:44:40 CET 2006. -------- --- arch/i386/yast2-vm/yast2-vm.changes 2006-11-16 22:37:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-vm/yast2-vm.changes 2006-12-06 23:30:34.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 6 15:16:51 MST 2006 - carnold(a)novell.com + +- Yast2-vm does not remove the directory that contains the vm disk + image when deleting a vm. (#221258) +- Yast2-vm doesn't recognize an installation source set up as an + ISO file over NFS. (#224798) + +------------------------------------------------------------------- Old: ---- yast2-vm-2.14.2.tar.bz2 New: ---- yast2-vm-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.cDLazP/_old 2006-12-07 21:44:27.000000000 +0100 +++ /var/tmp/diff_new_pack.cDLazP/_new 2006-12-07 21:44:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.14.2) +# spec file for package yast2-vm (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-vm -Version: 2.14.2 +Version: 2.15.0 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.14.2.tar.bz2 +Source0: yast2-vm-2.15.0.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 yast2-installation @@ -34,7 +34,7 @@ Michael G. Fritch <mgfritch(a)novell.com> %prep -%setup -n yast2-vm-2.14.2 +%setup -n yast2-vm-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,11 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog -n yast2-vm +* Wed Dec 06 2006 - carnold(a)novell.com +- Yast2-vm does not remove the directory that contains the vm disk + image when deleting a vm. (#221258) +- Yast2-vm doesn't recognize an installation source set up as an + ISO file over NFS. (#224798) * Thu Nov 16 2006 - carnold(a)novell.com - yast2-vm acquires package from the wrong install source when a second source is specified for additional vm installs. (#217403) ++++++ yast2-vm-2.14.2.tar.bz2 -> yast2-vm-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/VERSION new/yast2-vm-2.15.0/VERSION --- old/yast2-vm-2.14.2/VERSION 2006-11-16 22:28:11.000000000 +0100 +++ new/yast2-vm-2.15.0/VERSION 2006-12-06 23:14:57.000000000 +0100 @@ -1 +1 @@ -2.14.2 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/src/VM_XEN.ycp new/yast2-vm-2.15.0/src/VM_XEN.ycp --- old/yast2-vm-2.14.2/src/VM_XEN.ycp 2006-11-16 22:25:30.000000000 +0100 +++ new/yast2-vm-2.15.0/src/VM_XEN.ycp 2006-12-06 23:26:55.000000000 +0100 @@ -3,12 +3,13 @@ * Package: XEN specific functions and values * Authors: Ladislav Slezak <lslezak(a)suse.cz> * Michael G. Fritch <mgfritch(a)novell.com> - * $Id: VM_XEN.ycp 34035 2006-11-04 00:38:38Z mgfritch $ + * $Id: VM_XEN.ycp 34834 2006-12-06 22:26:51Z mgfritch $ */ { module "VM_XEN"; import "VM_Common"; + import "URL"; import "Popup"; import "Report"; import "HTML"; @@ -128,6 +129,9 @@ if (VM_Common::GetCustomKernel()) { isNetWare = VM_Common::IsNetWareKernel(VM_Common::GetKernelImage()); } + if ( Arch::x86_64() ) { + VM_Common::memory_size = 512; // Default to 512 on 64 bit + } if (isNetWare && VM_Common::proposal_type != "install") { if (VM_Common::memory_size < 512) { VM_Common::memory_size = 512; // if NetWare, increase the memory_size=512 @@ -1871,6 +1875,28 @@ { map general_data = Pkg::SourceGeneralData (VM_Common::source_id); url = general_data["url"]:""; + map parsed_url = URL::Parse(url); + + // For when an ISO is mapped as an installation source via nfs + if ( parsed_url["scheme"]:"" == "iso" ) { + if (regexpmatch(parsed_url["query"]:"", "&url=")) { + integer pos1 = search(url, "iso="); + integer pos2 = search(url, "url="); + if ( pos1 > 0 && pos2 > 0 ) { + pos2 = pos2 + 4; // Move past url= + string new_url = substring (url, pos2); + pos1 = pos1 + 4; // Move past iso= + pos2 = (pos2 - 5) - pos1; // Calculate length of iso name + string new_iso = substring (url, pos1, pos2); + if (findlastof(new_url, "/") < size(new_url)-1) { + url = new_url + "/" + new_iso; + } + else { + url = new_url + new_iso; + } + } + } + } } else if (VM_Common::inst_type == `network_custom) { url = VM_Common::custom_source; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/src/inst_vm_manage.ycp new/yast2-vm-2.15.0/src/inst_vm_manage.ycp --- old/yast2-vm-2.14.2/src/inst_vm_manage.ycp 2006-11-16 22:25:30.000000000 +0100 +++ new/yast2-vm-2.15.0/src/inst_vm_manage.ycp 2006-12-01 16:29:26.000000000 +0100 @@ -83,7 +83,7 @@ }); // remove any autoyast.img files from the vm image directory - string img_dir = VM::GetImgPrefix() + VM_Common::config_name; + string img_dir = VM::GetImgPrefix() + item["cfg_file"]:""; SCR::Execute(.target.remove, img_dir + "/autoyast.img"); // try to remove the vm image directory (if it is not empty, it should not be deleted). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/src/inst_vm_source.ycp new/yast2-vm-2.15.0/src/inst_vm_source.ycp --- old/yast2-vm-2.14.2/src/inst_vm_source.ycp 2006-11-16 22:25:30.000000000 +0100 +++ new/yast2-vm-2.15.0/src/inst_vm_source.ycp 2006-12-06 23:26:55.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: Ask the user for installation source for the virtual machine. * - * $Id: inst_vm_source.ycp 32678 2006-09-01 22:23:11Z mgfritch $ + * $Id: inst_vm_source.ycp 34834 2006-12-06 22:26:51Z mgfritch $ * */ { @@ -36,7 +36,13 @@ map general_data = Pkg::SourceGeneralData (id); string srcurl = general_data["url"]:""; map parsed_url = URL::Parse(srcurl); - if (!URL::Check(srcurl) || parsed_url["host"]:"" == "") { + boolean isurl = false; + + if ( parsed_url["scheme"]:"" == "iso" ) { + isurl = regexpmatch(parsed_url["query"]:"", "&url="); + } + + if (!URL::Check(srcurl) || (parsed_url["host"]:"" == "" && isurl == false)) { return nil; } else { @@ -654,8 +660,13 @@ } map parsed_url = URL::Parse(srcurl); + boolean isurl = false; + + if ( parsed_url["scheme"]:"" == "iso" ) { + isurl = regexpmatch(parsed_url["query"]:"", "&url="); + } - if (!URL::Check(srcurl) || parsed_url["host"]:"" == "") + if (!URL::Check(srcurl) || (parsed_url["host"]:"" == "" && isurl == false)) { // popup error message Report::Error(_("Entered URL value is not valid.")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-users checked in at Thu Dec 7 21:44:29 CET 2006. -------- --- yast2-users/yast2-users.changes 2006-11-27 18:26:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2006-12-04 16:40:28.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 16:25:13 CET 2006 - jsuchome(a)suse.cz + +- differ GenericName from Name in desktop files (#223549) +- check root password for CA constraints (F300438) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-users-2.14.1.tar.bz2 New: ---- yast2-users-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.rpzxKO/_old 2006-12-07 21:43:27.000000000 +0100 +++ /var/tmp/diff_new_pack.rpzxKO/_new 2006-12-07 21:43:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.14.1) +# spec file for package yast2-users (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-users -Version: 2.14.1 +Version: 2.15.0 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.14.1.tar.bz2 +Source0: yast2-users-2.15.0.tar.bz2 prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-mail-aliases yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security yast2-mail-aliases cracklib perl-Digest-SHA1 perl-gettext yast2-ldap-client @@ -42,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.14.1 +%setup -n yast2-users-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +86,10 @@ %doc %{prefix}/share/doc/packages/yast2-users %changelog -n yast2-users +* Mon Dec 04 2006 - jsuchome(a)suse.cz +- differ GenericName from Name in desktop files (#223549) +- check root password for CA constraints (F300438) +- 2.15.0 * Mon Nov 27 2006 - jsuchome(a)suse.cz - fixed schema file (#215249) - 2.14.1 ++++++ yast2-users-2.14.1.tar.bz2 -> yast2-users-2.15.0.tar.bz2 ++++++ ++++ 32292 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-users-2.14.1/Makefile.am new/yast2-users-2.15.0/Makefile.am --- old/yast2-users-2.14.1/Makefile.am 2006-11-27 18:39:41.000000000 +0100 +++ new/yast2-users-2.15.0/Makefile.am 2006-01-27 08:42:11.000000000 +0100 @@ -7,7 +7,7 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -66,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in config.status +$(RPMNAME).pc: $(RPMNAME).pc.in ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -95,7 +95,7 @@ done pot: - $(Y2TOOL) y2makepot -s $(srcdir) + y2tool y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +116,7 @@ fi spellcheck: pot - $(Y2TOOL) pot-spellcheck + y2tool pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +143,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(Y2TOOL); then \ - echo "$(Y2TOOL): not found."; \ + if ! test -x $(PREFIX)/bin/y2tool; then \ + echo "$(PREFIX)/bin/y2tool: not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local -TAGVERSION = $(Y2TOOL) tagversion +TAGVERSION = $(PREFIX)/bin/y2tool tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -199,13 +199,10 @@ false; \ fi -check-textdomain: - $(Y2TOOL) check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package - $(Y2TOOL) checkin-stable + $(PREFIX)/bin/y2tool checkin-stable # For po/ modules 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-users-2.14.1/Makefile.am.common new/yast2-users-2.15.0/Makefile.am.common --- old/yast2-users-2.14.1/Makefile.am.common 2006-11-27 18:39:40.000000000 +0100 +++ new/yast2-users-2.15.0/Makefile.am.common 2006-01-27 08:42:11.000000000 +0100 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep 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-users-2.14.1/VERSION new/yast2-users-2.15.0/VERSION --- old/yast2-users-2.14.1/VERSION 2006-11-27 18:22:41.000000000 +0100 +++ new/yast2-users-2.15.0/VERSION 2006-12-04 16:26:54.000000000 +0100 @@ -1 +1 @@ -2.14.1 +2.15.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-users-2.14.1/configure.in new/yast2-users-2.15.0/configure.in --- old/yast2-users-2.14.1/configure.in 2006-11-27 18:39:40.000000000 +0100 +++ new/yast2-users-2.15.0/configure.in 2006-01-27 08:42:11.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-users dnl -dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-users, 2.14.1, http://bugs.opensuse.org/, yast2-users) +AC_INIT(yast2-users, 2.13.11, http://www.suse.de/feedback, yast2-users) 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.14.1" +VERSION="2.13.11" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -111,8 +111,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -145,9 +143,6 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) dnl Check packages expect and dejagnu AC_PATH_PROG(MYEXPECT, expect, false) 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-users-2.14.1/src/cmdline.ycp new/yast2-users-2.15.0/src/cmdline.ycp --- old/yast2-users-2.14.1/src/cmdline.ycp 2006-11-22 16:08:17.000000000 +0100 +++ new/yast2-users-2.15.0/src/cmdline.ycp 2006-12-01 13:43:22.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Command line interface functions. * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: cmdline.ycp 31992 2006-07-26 07:43:01Z jsuchome $ + * $Id: cmdline.ycp 31989 2006-07-26 07:42:34Z jsuchome $ * * All command line interface functions. */ @@ -262,8 +262,32 @@ if (!haskey(user,"userpassword")) { - // question label - string pw = CommandLine::PasswordInput (_("Password for New User:")); + string pw = ""; + integer i = 0; + while (true) + { + // question on command line + pw = CommandLine::PasswordInput (_("Password for New User:")); + string p2 = CommandLine::PasswordInput ( + // question on command line + _("Confirm the password:")); + if (pw != p2) + { + if (i < 2) + { + // error message + CommandLine::Print(_("Passwords do not match. Try again.")); + i = i + 1; + } + else + { + // error message + CommandLine::Print(_("Passwords do not match. Exiting.")); + return false; + } + } + else break; + } user["userpassword"] = pw; } string error = Users::CheckPassword (user["userpassword"]:""); 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-users-2.14.1/src/dialogs.ycp new/yast2-users-2.15.0/src/dialogs.ycp --- old/yast2-users-2.14.1/src/dialogs.ycp 2006-11-22 16:08:17.000000000 +0100 +++ new/yast2-users-2.15.0/src/dialogs.ycp 2006-09-18 17:53:18.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Johannes Buchhold <jbuch(a)suse.de>, * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 32824 2006-09-12 13:37:24Z jsuchome $ + * $Id: dialogs.ycp 32823 2006-09-12 13:37:16Z 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-users-2.14.1/src/groups.desktop new/yast2-users-2.15.0/src/groups.desktop --- old/yast2-users-2.14.1/src/groups.desktop 2006-11-27 18:24:19.000000000 +0100 +++ new/yast2-users-2.15.0/src/groups.desktop 2006-11-30 09:24:38.000000000 +0100 @@ -20,22 +20,41 @@ Exec=/sbin/yast2 groups Name=Group Management +GenericName=Add, Edit or Delete User Groups Name[cs]=Správce skupin +GenericName[cs]=Správce skupin Name[de]=Gruppen bearbeiten und anlegen +GenericName[de]=Gruppen bearbeiten und anlegen Name[es]=Editar y crear grupos +GenericName[es]=Editar y crear grupos Name[hu]=Csoportok létrehozása és módosítása +GenericName[hu]=Csoportok létrehozása és módosítása Name[it]=Modifica e crea gruppi +GenericName[it]=Modifica e crea gruppi Name[ko]=그룹 편집/생성 +GenericName[ko]=그룹 편집/생성 Name[nl]=Wijzigen en aanmaken van groepen +GenericName[nl]=Wijzigen en aanmaken van groepen Name[pt]=Editar e criar grupos +GenericName[pt]=Editar e criar grupos Name[sk]=Upraviť a vytvoriť skupiny +GenericName[sk]=Upraviť a vytvoriť skupiny Name[sv]=Redigera och skapa grupper +GenericName[sv]=Redigera och skapa grupper Name[bg]=Редактиране и създаване на групи +GenericName[bg]=Редактиране и създаване на групи Name[da]=Redigér og opret grupper +GenericName[da]=Redigér og opret grupper Name[el]=Επεξεργαστείτε και δημιουργήστε ομάδες +GenericName[el]=Επεξεργαστείτε και δημιουργήστε ομάδες Name[fr]=Modifier et créer des groupes +GenericName[fr]=Modifier et créer des groupes Name[ja]=グループを作成あるいは編集する +GenericName[ja]=グループを作成あるいは編集する Name[lt]=Keisti ir sukurti grupes +GenericName[lt]=Keisti ir sukurti grupes Name[sl]=Uredi in kreiraj skupine +GenericName[sl]=Uredi in kreiraj skupine Name[tr]=Grup ekle ve düzenle +GenericName[tr]=Grup ekle ve düzenle X-KDE-SubstituteUID=true 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-users-2.14.1/src/helps.ycp new/yast2-users-2.15.0/src/helps.ycp --- old/yast2-users-2.14.1/src/helps.ycp 2006-11-22 16:08:17.000000000 +0100 +++ new/yast2-users-2.15.0/src/helps.ycp 2006-09-18 17:53:18.000000000 +0200 @@ -6,7 +6,7 @@ * Authors: Johannes Buchhold <jbuch(a)suse.de>, * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: helps.ycp 32824 2006-09-12 13:37:24Z jsuchome $ + * $Id: helps.ycp 32823 2006-09-12 13:37:16Z 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-users-2.14.1/src/inst_root.ycp new/yast2-users-2.15.0/src/inst_root.ycp --- old/yast2-users-2.14.1/src/inst_root.ycp 2006-11-22 16:08:17.000000000 +0100 +++ new/yast2-users-2.15.0/src/inst_root.ycp 2006-11-29 09:32:38.000000000 +0100 @@ -19,20 +19,27 @@ { textdomain "users"; +import "GetInstArgs"; import "Label"; import "Linuxrc"; import "Mode"; import "Popup"; +import "ProductFeatures"; import "Report"; import "Security"; // Perl module (Users.pm) donesn't call constructor... import "Stage"; import "Users"; import "UsersCache"; import "Wizard"; -import "GetInstArgs"; include "users/widgets.ycp"; // for EncryptionPopup() + boolean check_CA_constraints = + ProductFeatures::GetBooleanFeature ("globals","root_password_ca_check"); + + // minimal pw length for CA-management (F#300438) + integer pw_min_CA = 4; + string valid_password_chars = Users::ValidPasswordChars (); boolean this_is_for_real = ! Mode::test (); @@ -96,6 +103,14 @@ Do not forget this \"root\" password. "); + if (check_CA_constraints) + { + helptext = helptext + sformat ( +// additional help text about password +_("If you intend to use this password for creating certificates, +it has to be at least %1 characters long."), pw_min_CA); + } + Wizard::SetDesktopIcon("users"); Wizard::SetContents (title, contents, helptext, GetInstArgs::enable_back(), @@ -175,6 +190,24 @@ // map with id's of confirmed questions map<string,integer> ui_map = $[]; boolean failed = false; + + if (check_CA_constraints && (size (pw1) < pw_min_CA)) + { + if (Popup::YesNo (sformat ( +// yes/no popup question, %1 is a number +_("If you intend to create certificates, +the password should have at least %1 characters. +Really use this shorter password?"), pw_min_CA))) + { + // skip other checks for short passwords + ui_map["short"] = 1; + } + else + { + ret = `notnext; + continue; + } + } do { error_map = Users::CheckPasswordUI ("root", pw1, ui_map); 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-users-2.14.1/src/users.desktop new/yast2-users-2.15.0/src/users.desktop --- old/yast2-users-2.14.1/src/users.desktop 2006-11-27 18:24:19.000000000 +0100 +++ new/yast2-users-2.15.0/src/users.desktop 2006-11-30 09:23:38.000000000 +0100 @@ -24,22 +24,41 @@ Exec=/sbin/yast2 users Name=User Management +GenericName=Add, Edit or Delete Users Name[cs]=Správce uživatelů +GenericName[cs]=Správce uživatelů Name[de]=Benutzer bearbeiten und anlegen +GenericName[de]=Benutzer bearbeiten und anlegen Name[es]=Editar y crear usuarios +GenericName[es]=Editar y crear usuarios Name[hu]=Felhasználók létrehozása és módosítása +GenericName[hu]=Felhasználók létrehozása és módosítása Name[it]=Modifica e crea utenti +GenericName[it]=Modifica e crea utenti Name[ko]=사용자 편집/생성 +GenericName[ko]=사용자 편집/생성 Name[nl]=Wijzigen en aanmaken van gebruikers +GenericName[nl]=Wijzigen en aanmaken van gebruikers Name[pt]=Editar e criar usuários +GenericName[pt]=Editar e criar usuários Name[sk]=Úprava a vytváranie používateľov +GenericName[sk]=Úprava a vytváranie používateľov Name[sv]=Redigera och skapa användare +GenericName[sv]=Redigera och skapa användare Name[bg]=Редактиране и създаване на потребители +GenericName[bg]=Редактиране и създаване на потребители Name[da]=Redigér og opret brugere +GenericName[da]=Redigér og opret brugere Name[el]=Επεξεργαστείτε και δημιουργήστε χρήστες +GenericName[el]=Επεξεργαστείτε και δημιουργήστε χρήστες Name[fr]=Modifier et créer des utilisateurs +GenericName[fr]=Modifier et créer des utilisateurs Name[ja]=ユーザを作成あるいは編集する +GenericName[ja]=ユーザを作成あるいは編集する Name[lt]=Keisti ir sukurti vartotojus +GenericName[lt]=Keisti ir sukurti vartotojus Name[sl]=Uredi in kreiraj uporabnike +GenericName[sl]=Uredi in kreiraj uporabnike Name[tr]=Kullanıcı ekle ve düzenle +GenericName[tr]=Kullanıcı ekle ve düzenle X-KDE-SubstituteUID=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-update checked in at Thu Dec 7 21:44:19 CET 2006. -------- --- yast2-update/yast2-update.changes 2006-11-10 09:00:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2006-12-05 14:11:29.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 10:42:16 CET 2006 - locilka(a)suse.cz + +- Installation Media (update) proposal: using key "label" instead + of "productname", which is used as a fallback now (#225256). +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-update-2.14.7.tar.bz2 New: ---- update.tgz yast2-update-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.hyINBv/_old 2006-12-07 21:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.hyINBv/_new 2006-12-07 21:43:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.14.7) +# spec file for package yast2-update (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-update -Version: 2.14.7 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.14.7.tar.bz2 +Source0: yast2-update-2.15.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml Requires: yast2 yast2-installation yast2-storage yast2-packager @@ -40,7 +40,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.14.7 +%setup -n yast2-update-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,10 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog -n yast2-update +* Mon Dec 04 2006 - locilka(a)suse.cz +- Installation Media (update) proposal: using key "label" instead + of "productname", which is used as a fallback now (#225256). +- 2.15.0 * Fri Nov 10 2006 - locilka(a)suse.cz - Removing `ignore button for now (#148105, comments #22-#28). - 2.14.7 ++++++ yast2-update-2.14.7.tar.bz2 -> yast2-update-2.15.0.tar.bz2 ++++++ ++++ 5361 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-update-2.14.7/Makefile.am new/yast2-update-2.15.0/Makefile.am --- old/yast2-update-2.14.7/Makefile.am 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/Makefile.am 2006-12-05 14:11:59.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common 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-update-2.14.7/Makefile.am.common new/yast2-update-2.15.0/Makefile.am.common --- old/yast2-update-2.14.7/Makefile.am.common 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/Makefile.am.common 2006-12-05 14:11:59.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-update-2.14.7/VERSION new/yast2-update-2.15.0/VERSION --- old/yast2-update-2.14.7/VERSION 2006-11-10 09:00:37.000000000 +0100 +++ new/yast2-update-2.15.0/VERSION 2006-12-05 14:10:06.000000000 +0100 @@ -1 +1 @@ -2.14.7 +2.15.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-update-2.14.7/autodocs-ycp.ami new/yast2-update-2.15.0/autodocs-ycp.ami --- old/yast2-update-2.14.7/autodocs-ycp.ami 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/autodocs-ycp.ami 2006-12-05 14:11:59.000000000 +0100 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $ +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc 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-update-2.14.7/configure.in new/yast2-update-2.15.0/configure.in --- old/yast2-update-2.14.7/configure.in 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/configure.in 2006-12-05 14:11:59.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.13.19 - 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-update, 2.14.4, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.15.0, http://bugs.opensuse.org/, yast2-update) 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.14.4" +VERSION="2.15.0" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) ( cd src/config; ln -sf update.xml update.glade ) 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-update-2.14.7/src/modules/Update.ycp new/yast2-update-2.15.0/src/modules/Update.ycp --- old/yast2-update-2.14.7/src/modules/Update.ycp 2006-11-09 13:31:46.000000000 +0100 +++ new/yast2-update-2.15.0/src/modules/Update.ycp 2006-12-04 10:47:39.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 34202 2006-11-09 12:31:44Z locilka $ + * $Id: Update.ycp 34713 2006-12-04 09:47:38Z locilka $ */ { module "Update"; @@ -308,7 +308,8 @@ return false; } - updateVersion["name"] = new_product["productname"]:"?"; + // bugzilla #225256, use "label" first, then a "productname" + updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; updateVersion["version"] = new_product["productversion"]:"?"; fill_version_map (updateVersion); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-sound
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-sound checked in at Thu Dec 7 21:43:19 CET 2006. -------- --- yast2-sound/yast2-sound.changes 2006-11-10 10:06:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-sound/yast2-sound.changes 2006-12-05 14:29:09.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 30 13:29:42 CET 2006 - lslezak(a)suse.cz + +- align action buttons to the left in the advanced dialog (#211557) +- display "Index" in the table header (#211555) +- enahced description of "Start Sequencer" option (#211559) +- display kernel module name in driver list +- use sliders in the mixer dialog, display [OK] button (#211563) +- added type information, fixed type mismatch (#115256) +- correctly export volume settings in autoyast (#219399) +- volume export/import testsuite +- fixed volume configuration in autoyast (config mode) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-sound-2.14.0.tar.bz2 New: ---- yast2-sound-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sound.spec ++++++ --- /var/tmp/diff_new_pack.Bc9PX6/_old 2006-12-07 21:43:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Bc9PX6/_new 2006-12-07 21:43:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-sound (Version 2.14.0) +# spec file for package yast2-sound (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-sound -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-sound-2.14.0.tar.bz2 +Source0: yast2-sound-2.15.0.tar.bz2 prefix: /usr BuildRequires: alsa-devel doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Requires: yast2 alsa @@ -38,7 +38,7 @@ Dan Meszaros %prep -%setup -n yast2-sound-2.14.0 +%setup -n yast2-sound-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -83,6 +83,17 @@ %doc %{prefix}/share/doc/packages/yast2-sound %changelog -n yast2-sound +* Thu Nov 30 2006 - lslezak(a)suse.cz +- align action buttons to the left in the advanced dialog (#211557) +- display "Index" in the table header (#211555) +- enahced description of "Start Sequencer" option (#211559) +- display kernel module name in driver list +- use sliders in the mixer dialog, display [OK] button (#211563) +- added type information, fixed type mismatch (#115256) +- correctly export volume settings in autoyast (#219399) +- volume export/import testsuite +- fixed volume configuration in autoyast (config mode) +- 2.15.0 * Fri Nov 10 2006 - lslezak(a)suse.cz - added a RNC schema for Autoyast profile validation (#219011) - 2.14.0 ++++++ yast2-sound-2.14.0.tar.bz2 -> yast2-sound-2.15.0.tar.bz2 ++++++ ++++ 2802 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-sound-2.14.0/VERSION new/yast2-sound-2.15.0/VERSION --- old/yast2-sound-2.14.0/VERSION 2006-11-10 07:20:37.000000000 +0100 +++ new/yast2-sound-2.15.0/VERSION 2006-12-05 13:32:55.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.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-sound-2.14.0/configure.in new/yast2-sound-2.15.0/configure.in --- old/yast2-sound-2.14.0/configure.in 2006-11-10 10:00:00.000000000 +0100 +++ new/yast2-sound-2.15.0/configure.in 2006-12-05 13:57:07.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-sound, 2.14.0, http://bugs.opensuse.org/, yast2-sound) +AC_INIT(yast2-sound, 2.15.0, http://bugs.opensuse.org/, yast2-sound) 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.14.0" +VERSION="2.15.0" RPMNAME="yast2-sound" MAINTAINER="Ladislav Slezak <lslezak(a)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-sound-2.14.0/sound/src/Sound.ycp new/yast2-sound-2.15.0/sound/src/Sound.ycp --- old/yast2-sound-2.14.0/sound/src/Sound.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/Sound.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Sound data * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: Sound.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: Sound.ycp 34778 2006-12-05 13:08:38Z lslezak $ */ { @@ -81,7 +81,7 @@ /** * settings to save using .audio.alsa ... mixer */ - global list volume_settings = []; + global list<list<list> > volume_settings = []; /** * rc settings @@ -167,7 +167,7 @@ */ global list<map> modules_conf_b = nil; map rc_vars_b = nil; - list volume_settings_b = nil; + list<list<list> > volume_settings_b = nil; global string selected_uniq = ""; @@ -743,6 +743,94 @@ return true; } + global list<list<map> > ExportVolumeSettings(list<list<list> > volume_setup) + { + y2milestone("ExportVolumeSettings: %1", volume_setup); + list<list<map> > ret = []; + + if (volume_setup == nil) + { + return ret; + } + + foreach(list card, (list<list>)volume_setup, + { + list<map> channels = []; + + foreach(list channel, (list<list>)card, + { + map ch = $[ + "name" : channel[0]:"unknown", + "volume" : channel[1]:0, + "mute" : channel[2]:false + ]; + + channels = add(channels, ch); + } + ); + + ret = add(ret, channels); + } + ); + + y2milestone("Exported volume setting: %1", ret); + + return ret; + } + + global list<list<list> > ImportVolumeSettings(list volume_setup) + { + list<list<list> > ret = []; + + y2milestone("ImportVolumeSettings: %1", volume_setup); + + if (volume_setup == nil) + { + return ret; + } + + foreach(list card, (list<list>)volume_setup, + { + list<list> channels = []; + + foreach(any channel, card, + { + list ch = []; + + if (is(channel, map)) + { + map channel_map = (map)channel; + + // convert map to list + ch = add(ch, channel_map["name"]:"unknown"); + ch = add(ch, channel_map["volume"]:0); + ch = add(ch, channel_map["mute"]:false); + } + else if (is(channel, list)) + { + // use the list + ch = (list)channel; + } + else + { + // wrong type + y2error("Wrong channel configuration '%1', expected list or map!", channel); + } + + channels = add(channels, ch); + } + ); + + ret = add(ret, channels); + } + ); + + y2milestone("Imported volume setting: %1", ret); + + return ret; + } + + /** * Just Set module data * @param settings Sound configuration settings @@ -751,7 +839,7 @@ global define void Set(map settings) ``{ modules_conf = settings["modules_conf"]:[]; rc_vars = settings["rc_vars"]:$[]; - volume_settings = settings["volume_settings"]:[]; + volume_settings = ImportVolumeSettings(settings["volume_settings"]:[]); configure_detected = settings["configure_detected"]:false; } @@ -780,7 +868,7 @@ return $[ "modules_conf" : modules_conf, "rc_vars" : rc_vars, - "volume_settings" : volume_settings, + "volume_settings" : ExportVolumeSettings(volume_settings), "configure_detected": configure_detected ]; } @@ -843,13 +931,21 @@ sformat(_("Configured as %1."), card["alias"]:"snd-card-0")) )); - foreach(map card, detected_cards, ``{ - if (!contains(keys, card["unique_key"]:"...")) - { - retlist = add (retlist, Summary::Device ( - get_card_label(card), Summary::NotConfigured())); - } - }); + if (detected_cards != nil) + { + foreach(map card, detected_cards, ``{ + if (!contains(keys, card["unique_key"]:"...")) + { + retlist = add (retlist, Summary::Device ( + get_card_label(card), Summary::NotConfigured())); + } + }); + } + else + { + y2milestone("detected_cards: nil"); + } + return Summary::DevicesList (retlist); } @@ -1149,7 +1245,12 @@ { p = topath (sformat( ".audio.alsa.cards.%1.channels.%2.volume", c, ch)); - volume_settings[tointeger(c)] = [ch, SCR::Read(p), "false"]; + + // add the channel + list<list> tmp = volume_settings[tointeger(c)]:[]; + tmp = add(tmp, [ch, SCR::Read(p), "false"]); + + volume_settings[tointeger(c)] = tmp; } }); }); @@ -1177,7 +1278,37 @@ // alsa is not running. probably autoinstallation or someone wants // to change proposed volume // store volume to volume_settings datastricure in autoinstallation - volume_settings [c_id] = [ channel, value ]; + + list<list> tmp = volume_settings[c_id]:[]; + + boolean found = false; + list<list> updated_channels = []; + foreach(list ch, tmp, + { + list new_ch = ch; + + if (new_ch[0]:"" == channel) + { + new_ch[1] = value; + found = true; + } + + updated_channels = add(updated_channels, new_ch); + } + ); + + if (found) + { + // the channel has been found, use the updates list + tmp = updated_channels; + } + else + { + // the channel has not been found, add it to the list + tmp = add(tmp, [ channel, value, false ]); + } + + volume_settings [c_id] = tmp; return true; } } 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-sound-2.14.0/sound/src/complex.ycp new/yast2-sound-2.15.0/sound/src/complex.ycp --- old/yast2-sound-2.14.0/sound/src/complex.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/complex.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -16,7 +16,7 @@ * String corrections by Christian Steinruecken <cstein(a)suse.de>, 2001/08/01 * * - * $Id: complex.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: complex.ycp 34778 2006-12-05 13:08:38Z lslezak $ * */ @@ -29,10 +29,12 @@ import "Popup"; import "Mode"; import "WizardHW"; + import "Report"; import "Sound"; include "sound/mixer.ycp"; include "sound/options.ycp"; // sound_options + include "sound/volume.ycp"; // VolumeDialog /** * creates summary table with card labels and thier states @@ -166,8 +168,18 @@ define symbol Mixer() { symbol ret = nil; + map res = $[]; - map res = mixerDialog(Sound::card_id); + if (Mode::config()) + { + symbol dialog_result = VolumeDialog(Sound::modules_conf[Sound::card_id]:$[], true, Sound::card_id); + + res["ui"] = dialog_result; + } + else + { + res = mixerDialog(Sound::card_id); + } ret = (symbol)res["ui"]:nil; @@ -296,7 +308,7 @@ `VSpacing(0.5), `Left(`CheckBox(`id(`sequencer), // check box label - _("&Start sequencer"), Sound::rc_vars["LOAD_ALSA_SEQ"]:"no" == "yes") + _("&Start Sequencer (Load MIDI Drivers)"), Sound::rc_vars["LOAD_ALSA_SEQ"]:"no" == "yes") ), `VSpacing(0.5) ) @@ -397,7 +409,7 @@ WizardHW::CreateHWDialog(_("Sound Configuration"), Sound::STRINGS["ComplexDialog"]:"", // table header - [_("Number"), _("Card Model")], + [_("Index"), _("Card Model")], extra_buttons ); 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-sound-2.14.0/sound/src/manual.ycp new/yast2-sound-2.15.0/sound/src/manual.ycp --- old/yast2-sound-2.14.0/sound/src/manual.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/manual.ycp 2006-12-05 13:32:32.000000000 +0100 @@ -15,7 +15,7 @@ * String corrections by Christian Steinruecken <cstein(a)suse.de>, 2001/08/01 * * - * $Id: manual.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: manual.ycp 34695 2006-12-01 12:24:01Z lslezak $ * */ @@ -263,7 +263,7 @@ // selection box title _("Sound Card &Vendor") : // selection box title - _("Sound card &driver"), + _("Sound Card &Driver"), keys_names)); UI::ChangeWidget(`id(`sel_keys), `CurrentItem, new_key); 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-sound-2.14.0/sound/src/mixer.ycp new/yast2-sound-2.15.0/sound/src/mixer.ycp --- old/yast2-sound-2.14.0/sound/src/mixer.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/mixer.ycp 2006-12-05 13:32:32.000000000 +0100 @@ -13,7 +13,7 @@ * * String corrections by Christian Steinruecken <cstein(a)suse.de>, 2001/08/01 * - * $Id: mixer.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: mixer.ycp 34729 2006-12-04 15:11:42Z lslezak $ * */ @@ -98,7 +98,7 @@ * @return term widget */ define term volElement(string label, integer value, boolean spec) ``{ - if (spec) + if (UI::HasSpecialWidget(`Slider)) { return `Slider(`id(label), `opt(`notify), translateChannelName(label), 0, 100, value); } @@ -281,9 +281,8 @@ term con = mixerWidget (channels); // dialog header - Wizard::SetContents (sformat(_("Volume Settings for Card %1"), card_id), - con, help, true, true); - Wizard::RestoreNextButton(); + Wizard::SetContentsButtons (sformat(_("Volume Settings for Card %1"), card_id), + con, help, Label::BackButton(), Label::OKButton() ); any ui = nil; // value can be `next `abort... or string (channel name) integer value = 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-sound-2.14.0/sound/src/options.ycp new/yast2-sound-2.15.0/sound/src/options.ycp --- old/yast2-sound-2.14.0/sound/src/options.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/options.ycp 2006-12-05 13:32:32.000000000 +0100 @@ -16,7 +16,7 @@ * Dan Vesely <dan(a)suse.cz> * Dan Meszaros <dmeszar(a)suse.cz> * - * $Id: options.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: options.ycp 34672 2006-11-30 13:55:58Z lslezak $ * * parameters: 1st: parameter list * @@ -407,7 +407,7 @@ `PushButton (`id (`add), Label::AddButton()), `PushButton (`id (`edit), Label::EditButton()), `PushButton (`id (`delete), Label::DeleteButton()), - `HSpacing(3), + `HStretch(), // restore original option values `PushButton (`id (`reset), _("R&eset all")) ), 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-sound-2.14.0/sound/src/routines.ycp new/yast2-sound-2.15.0/sound/src/routines.ycp --- old/yast2-sound-2.14.0/sound/src/routines.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/routines.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -12,7 +12,7 @@ * Dan Vesely <dan(a)suse.cz> * Dan Meszaros <dmeszar(a)suse.cz> * - * $Id: routines.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: routines.ycp 34778 2006-12-05 13:08:38Z lslezak $ * */ @@ -22,6 +22,7 @@ import "Popup"; import "Sound"; import "Label"; + import "Arch"; textdomain "sound"; @@ -309,7 +310,9 @@ { Sound::LoadDatabase(true); list<term> mods = maplist (string k, map v, (map<string,map<string,any> >)Sound::db_modules, ``{ - return `item(`id(k), v["description"]:k); + // format description of a kernel driver, %1 is a description + // (e.g. Sound Blaster 16), %2 is a module name (e.g. snd-sb16) + return `item(`id(k), sformat(_("%1 (%2)"), v["description"]:k, k)); }); mods = sort(term a, term b, mods, ``{ @@ -350,7 +353,7 @@ ] * @return list as above */ - define list get_vol_settings() ``{ + define list<list<list> > get_vol_settings() ``{ if (!Sound::use_alsa) return []; @@ -358,10 +361,10 @@ Sound::LoadDatabase(true); integer bound = size(SCR::Dir(.audio.alsa.cards)); integer i = 0; - list retlist = []; + list<list<list> > retlist = []; while (i < bound) { - list sublist = []; + list<list> sublist = []; string modname = Sound::modules_conf[i,"module"]:"snd-dummy"; list<string> chans = Sound::db_modules[modname, "mixer_elements"]:[]; @@ -384,6 +387,7 @@ sublist = add(sublist, [e, SCR::Read(pth1), SCR::Read(pth2)]); }); retlist = add (retlist, sublist); + i = i + 1; } return retlist; @@ -657,6 +661,8 @@ ret = add(ret, "name", modname); } + y2milestone("card: '%1', using module %2", card["model"]:"", ret["name"]:""); + return ret; } 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-sound-2.14.0/sound/src/sound_auto.ycp new/yast2-sound-2.15.0/sound/src/sound_auto.ycp --- old/yast2-sound-2.14.0/sound/src/sound_auto.ycp 2005-08-22 13:20:51.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/sound_auto.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Dan Meszaros <dmeszar(a)suse.cz> * - * $Id: sound_auto.ycp 21736 2005-02-19 23:13:44Z nashif $ + * $Id: sound_auto.ycp 34778 2006-12-05 13:08:38Z lslezak $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -77,12 +77,15 @@ }); // ------------------------------------------------ // now configure cards not included in control file + + y2milestone("configure_detected: %1", settings["configure_detected"]:false); + if (settings["configure_detected"]:false) { // Now update Sound data, so the configured cards can be recognized // Import is not used, because it would remove detected cards Sound::modules_conf = eval (save_info); - Sound::volume_settings = eval (settings["volume_settings"]:[]); + Sound::volume_settings = eval (Sound::ImportVolumeSettings(settings["volume_settings"]:[])); Sound::UpdateUnconfiguredCards (); foreach (map card, Sound::unconfigured_cards, ``{ @@ -97,7 +100,7 @@ y2milestone ("Added sound card '%1'", card["model"]:""); } }); - settings["volume_settings"] = Sound::volume_settings; + settings["volume_settings"] = Sound::ExportVolumeSettings(Sound::volume_settings); } settings["modules_conf"] = eval (save_info); return settings; 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-sound-2.14.0/sound/src/texts.ycp new/yast2-sound-2.15.0/sound/src/texts.ycp --- old/yast2-sound-2.14.0/sound/src/texts.ycp 2006-10-23 16:08:13.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/texts.ycp 2006-12-05 13:32:32.000000000 +0100 @@ -13,7 +13,7 @@ * Summary: * Text constants for sound module * - * $Id: texts.ycp 33577 2006-10-23 14:08:10Z lslezak $ + * $Id: texts.ycp 34695 2006-12-01 12:24:01Z lslezak $ * */ { @@ -259,7 +259,7 @@ if ( Sound::use_alsa ) { ret = add(ret, "ComplexDialog", -_("Sound Cards +_("<big>Sound Cards<big> This is the complete sound card list. Use Finish to save sound card information. @@ -270,8 +270,6 @@ configure the card manually. ") + -_("Use Delete to remove a configured sound card. ") + - _(" To change the configuration of a card, select the card. Then press Edit. @@ -280,7 +278,7 @@ _(" Use Other to set the volume of the selected card or configure -module loading for playing MIDI files. These modules can be loaded on demand. +module loading for playing MIDI files (Start Sequencer). ") + 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-sound-2.14.0/sound/src/volume.ycp new/yast2-sound-2.15.0/sound/src/volume.ycp --- old/yast2-sound-2.14.0/sound/src/volume.ycp 2006-01-04 12:41:33.000000000 +0100 +++ new/yast2-sound-2.15.0/sound/src/volume.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -15,7 +15,7 @@ * Dan Meszaros <dmeszar(a)suse.cz> * * - * $Id: volume.ycp 26766 2006-01-04 11:41:34Z lslezak $ + * $Id: volume.ycp 34778 2006-12-05 13:08:38Z lslezak $ * * Steps: * 1. try to insert kernel module @@ -68,7 +68,7 @@ `Label (`opt(`outputField), save_entry["model"]:"") )), // frame label - `Frame(_("Volume adjust and test"), `HBox( + `Frame(_("Volume Adjust and Test"), `HBox( `HSpacing (), `VBox ( `VSpacing (0.5), @@ -99,8 +99,22 @@ define symbol VolumeDialog (map save_entry, boolean finish, integer card_id) ``{ + string modname = save_entry["module"]:"snd-dummy"; + string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; + string help_text = Sound::STRINGS["VolumeDialog"]:""; integer vol = 50; + + list<list> channels = Sound::volume_settings[card_id]:[]; + foreach(list ch, channels, + { + if (ch[0]:"" == master_elem) + { + vol = ch[1]:50; + } + } + ); + term con = VolumeCon(save_entry, vol); // dialog title @@ -122,8 +136,6 @@ InstallFonts("", false); } - string modname = save_entry["module"]:"snd-dummy"; - string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; setVolume (master_elem, card_id, vol); // some cards use Headphone instead of Master (bug #26539): setVolume ("Headphone", card_id, vol); @@ -156,7 +168,7 @@ } } } - else if (ui == `next && Sound::conf_joystick) + else if (ui == `next && Sound::conf_joystick && !Mode::config()) { symbol ret = joy_dialog(card_id, `next); if (ret == `back) 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-sound-2.14.0/sound/src/volume_routines.ycp new/yast2-sound-2.15.0/sound/src/volume_routines.ycp --- old/yast2-sound-2.14.0/sound/src/volume_routines.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/volume_routines.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -13,7 +13,7 @@ * Dan Meszaros <dmeszar(a)suse.cz> * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: volume_routines.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: volume_routines.ycp 34778 2006-12-05 13:08:38Z lslezak $ * */ @@ -66,10 +66,37 @@ } else { - // store volume to Sound::volume_settings for autoinstallation use - map oldmap = Sound::volume_settings[cardid]:$[]; - // if current size of volume_settings < cardid, there will be nil! - Sound::volume_settings[cardid] = add (oldmap, group, value); + list<list> tmp = Sound::volume_settings[cardid]:[]; + + boolean found = false; + list<list> updated_channels = []; + foreach(list ch, tmp, + { + list new_ch = ch; + + if (new_ch[0]:"" == group) + { + new_ch[1] = value; + found = true; + } + + updated_channels = add(updated_channels, new_ch); + } + ); + + if (found) + { + // the channel has been found, use the updates list + tmp = updated_channels; + } + else + { + // the channel has not been found, add it to the list + tmp = add(tmp, [ group, value, false ]); + } + + Sound::volume_settings[cardid] = tmp; + return true; } } 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-sound-2.14.0/sound/src/wizards.ycp new/yast2-sound-2.15.0/sound/src/wizards.ycp --- old/yast2-sound-2.14.0/sound/src/wizards.ycp 2006-10-12 10:07:54.000000000 +0200 +++ new/yast2-sound-2.15.0/sound/src/wizards.ycp 2006-12-05 14:08:41.000000000 +0100 @@ -6,7 +6,7 @@ * Dan Meszaros <dmeszar(a)suse.cz>, * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: wizards.ycp 33336 2006-10-12 08:07:50Z lslezak $ + * $Id: wizards.ycp 34778 2006-12-05 13:08:38Z lslezak $ */ { @@ -77,7 +77,7 @@ // we have to remember volume/mute settings because after a // card removal everything is muted and set to 0. - list vol_settings = get_vol_settings(); + list<list<list> > vol_settings = get_vol_settings(); if (Mode::config()) vol_settings = Sound::volume_settings; 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-sound-2.14.0/sound/testsuite/tests/export_volume.out new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.out --- old/yast2-sound-2.14.0/sound/testsuite/tests/export_volume.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.out 2006-12-04 14:36:06.000000000 +0100 @@ -0,0 +1,3 @@ +Return [] +Return [] +Return [[$["mute":false, "name":"Master", "volume":80], $["mute":false, "name":"CD", "volume":90]]] 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-sound-2.14.0/sound/testsuite/tests/export_volume.ycp new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.ycp --- old/yast2-sound-2.14.0/sound/testsuite/tests/export_volume.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.ycp 2006-12-04 14:37:22.000000000 +0100 @@ -0,0 +1,11 @@ +{ + // testedfiles: Sound.ycp + include "testsuite.ycp"; + + import "Sound"; + + list<list<list> > input = [[ ["Master", 80, false], ["CD", 90, false] ]]; + TEST(``(Sound::ExportVolumeSettings(nil)), [], nil); + TEST(``(Sound::ExportVolumeSettings([])), [], nil); + TEST(``(Sound::ExportVolumeSettings(input)), [], nil); +} 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-sound-2.14.0/sound/testsuite/tests/import_volume.out new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.out --- old/yast2-sound-2.14.0/sound/testsuite/tests/import_volume.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.out 2006-12-04 14:44:56.000000000 +0100 @@ -0,0 +1,4 @@ +Return [] +Return [] +Return [[["Master", 80, false], ["CD", 90, false]]] +Return [[["Master", 80, false], ["CD", 90, false]]] 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-sound-2.14.0/sound/testsuite/tests/import_volume.ycp new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.ycp --- old/yast2-sound-2.14.0/sound/testsuite/tests/import_volume.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.ycp 2006-12-04 14:47:20.000000000 +0100 @@ -0,0 +1,19 @@ +{ + // testedfiles: Sound.ycp + include "testsuite.ycp"; + + import "Sound"; + + + // Important: import of the new and the old format must produce the same output! + + list input_old_format = [[ ["Master", 80, false], ["CD", 90, false] ]]; + + TEST(``(Sound::ImportVolumeSettings(nil)), [], nil); + TEST(``(Sound::ImportVolumeSettings([])), [], nil); + TEST(``(Sound::ImportVolumeSettings(input_old_format)), [], nil); + + list input_new_format = [ [$["mute":false, "name":"Master", "volume":80], $["mute":false, "name":"CD", "volume":90]] ]; + + TEST(``(Sound::ImportVolumeSettings(input_new_format)), [], nil); +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-printer checked in at Thu Dec 7 21:43:12 CET 2006. -------- --- yast2-printer/yast2-printer.changes 2006-11-27 18:22:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2006-11-30 14:52:40.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 14:20:57 CET 2006 - mzugec(a)suse.de + +- ServerName widget minimal size +- 2.14.16 + +------------------------------------------------------------------- Old: ---- yast2-printer-2.14.15.tar.bz2 New: ---- yast2-printer-2.14.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.BP30SC/_old 2006-12-07 21:43:03.000000000 +0100 +++ /var/tmp/diff_new_pack.BP30SC/_new 2006-12-07 21:43:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.14.15) +# spec file for package yast2-printer (Version 2.14.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-printer -Version: 2.14.15 +Version: 2.14.16 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.14.15.tar.bz2 +Source0: yast2-printer-2.14.16.tar.bz2 prefix: /usr BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel Requires: yast2 netcat zlib blocxx @@ -34,7 +34,7 @@ %prep -%setup -n yast2-printer-2.14.15 +%setup -n yast2-printer-2.14.16 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,9 @@ %doc %{prefix}/share/doc/packages/yast2-printer %changelog -n yast2-printer +* Thu Nov 30 2006 - mzugec(a)suse.de +- ServerName widget minimal size +- 2.14.16 * Mon Nov 27 2006 - mzugec(a)suse.cz - #223840 - stops hplip even if it was running - 2.14.15 ++++++ yast2-printer-2.14.15.tar.bz2 -> yast2-printer-2.14.16.tar.bz2 ++++++ ++++ 19948 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-printer-2.14.15/Makefile.am new/yast2-printer-2.14.16/Makefile.am --- old/yast2-printer-2.14.15/Makefile.am 2006-11-27 17:52:31.000000000 +0100 +++ new/yast2-printer-2.14.16/Makefile.am 2006-11-30 14:03:13.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH 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-printer-2.14.15/Makefile.am.common new/yast2-printer-2.14.16/Makefile.am.common --- old/yast2-printer-2.14.15/Makefile.am.common 2006-11-27 17:52:30.000000000 +0100 +++ new/yast2-printer-2.14.16/Makefile.am.common 2006-11-30 14:03:13.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-printer-2.14.15/VERSION new/yast2-printer-2.14.16/VERSION --- old/yast2-printer-2.14.15/VERSION 2006-11-27 18:20:49.000000000 +0100 +++ new/yast2-printer-2.14.16/VERSION 2006-11-30 14:20:51.000000000 +0100 @@ -1 +1 @@ -2.14.15 +2.14.16 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-printer-2.14.15/config.h.in new/yast2-printer-2.14.16/config.h.in --- old/yast2-printer-2.14.15/config.h.in 2006-11-27 17:53:28.000000000 +0100 +++ new/yast2-printer-2.14.16/config.h.in 2006-11-30 14:03:27.000000000 +0100 @@ -65,7 +65,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ 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-printer-2.14.15/configure.in new/yast2-printer-2.14.16/configure.in --- old/yast2-printer-2.14.15/configure.in 2006-11-27 17:52:30.000000000 +0100 +++ new/yast2-printer-2.14.16/configure.in 2006-11-30 14:03:13.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-printer dnl -dnl -- This file is generated by y2autoconf 2.13.21 - 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-printer, 2.14.14, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.14.15, http://bugs.opensuse.org/, yast2-printer) 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.14.14" +VERSION="2.14.15" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -119,6 +119,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -151,6 +153,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) 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-printer-2.14.15/src/common/dialogs.ycp new/yast2-printer-2.14.16/src/common/dialogs.ycp --- old/yast2-printer-2.14.15/src/common/dialogs.ycp 2006-10-30 18:23:55.000000000 +0100 +++ new/yast2-printer-2.14.16/src/common/dialogs.ycp 2006-11-30 14:52:13.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Petr Blahos <pblahos(a)suse.cz> * - * $Id: dialogs.ycp 33905 2006-10-30 17:22:25Z mzugec $ + * $Id: dialogs.ycp 34669 2006-11-30 13:50:30Z mzugec $ * Main dialogs. */ { @@ -2325,7 +2325,8 @@ map event = hw_ret["event"]:$[]; string selected = hw_ret["selected"]:""; ret = (symbol) event["ID"]:nil; - Printer::selectPrinter(tointeger(selected)); + if (tointeger(selected) != nil) Printer::selectPrinter(tointeger(selected)); + else Printer::selectPrinter(-1); if (new_spooler == "cups" && CUPS::InstallationType () == `client) { new_spooler = "cups-client"; 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-printer-2.14.15/src/cups/dialogs-cups.ycp new/yast2-printer-2.14.16/src/cups/dialogs-cups.ycp --- old/yast2-printer-2.14.15/src/cups/dialogs-cups.ycp 2006-11-07 15:37:52.000000000 +0100 +++ new/yast2-printer-2.14.16/src/cups/dialogs-cups.ycp 2006-11-30 14:52:13.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Petr Blahos <pblahos(a)suse.cz> * - * $Id: dialogs-cups.ycp 34125 2006-11-07 14:37:50Z mzugec $ + * $Id: dialogs-cups.ycp 34669 2006-11-30 13:50:30Z mzugec $ * * Main dialogs. */ @@ -125,13 +125,16 @@ term contents = `VBox ( `HBox ( - `HSpacing(20), +// `HSpacing(20), + `HStretch(), +// `VWeight( 20, + `MinWidth( 20, `ReplacePoint ( `id (`hostent_replace), `ComboBox (`id (`hostnameent), `opt (`editable, `hstretch), // Combobox label _("&Server Name"), [ CUPS::server_hostname ] ) - ), + )), `VBox ( `Label (" "), // menubutton @@ -144,7 +147,8 @@ `item (`id (`get_hosts), _("Look Up &All Hosts")), ]) ), - `HSpacing(20) +// `HSpacing(20) + `HStretch() ), `VSpacing (2), `HBox ( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-pkg-bindings
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Thu Dec 7 21:43:06 CET 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-11-22 13:58:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-11-29 10:13:18.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 09:54:31 CET 2006 - lslezak(a)suse.cz + +- removed undefined methods, removed obsoleted callbacks +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.14.4.tar.bz2 New: ---- yast2-pkg-bindings-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.SE4zs6/_old 2006-12-07 21:43:01.000000000 +0100 +++ /var/tmp/diff_new_pack.SE4zs6/_new 2006-12-07 21:43:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.14.4) +# spec file for package yast2-pkg-bindings (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.14.4 +Version: 2.15.0 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.14.4.tar.bz2 +Source0: yast2-pkg-bindings-2.15.0.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 2.4.0 @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.14.4 +%setup -n yast2-pkg-bindings-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Wed Nov 29 2006 - lslezak(a)suse.cz +- removed undefined methods, removed obsoleted callbacks +- 2.15.0 * Wed Nov 22 2006 - lslezak(a)suse.cz - provide installation summary about packages from a YUM source (medium number is 0) (#220242) ++++++ yast2-pkg-bindings-2.14.4.tar.bz2 -> yast2-pkg-bindings-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.4/VERSION new/yast2-pkg-bindings-2.15.0/VERSION --- old/yast2-pkg-bindings-2.14.4/VERSION 2006-11-22 13:54:50.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.0/VERSION 2006-11-29 08:19:15.000000000 +0100 @@ -1 +1 @@ -2.14.4 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.4/configure new/yast2-pkg-bindings-2.15.0/configure --- old/yast2-pkg-bindings-2.14.4/configure 2006-11-22 13:56:25.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.0/configure 2006-11-29 10:09:49.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-pkg-bindings 2.14.4. +# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.14.4' -PACKAGE_STRING='yast2-pkg-bindings 2.14.4' +PACKAGE_VERSION='2.15.0' +PACKAGE_STRING='yast2-pkg-bindings 2.15.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1428,7 +1428,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-pkg-bindings 2.14.4 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1499,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.14.4:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.0:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.14.4 +yast2-pkg-bindings configure 2.15.0 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1621,7 +1621,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-pkg-bindings $as_me 2.14.4, which was +It was created by yast2-pkg-bindings $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.14.4' + VERSION='2.15.0' cat >>confdefs.h <<_ACEOF @@ -2649,7 +2649,7 @@ -VERSION="2.14.4" +VERSION="2.15.0" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21609,7 +21609,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.14.4, which was +This file was extended by yast2-pkg-bindings $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21662,7 +21662,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.14.4 +yast2-pkg-bindings config.status 2.15.0 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-pkg-bindings-2.14.4/configure.in new/yast2-pkg-bindings-2.15.0/configure.in --- old/yast2-pkg-bindings-2.14.4/configure.in 2006-11-22 13:56:10.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.0/configure.in 2006-11-29 10:09:37.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.14.4, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.15.0, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.14.4" +VERSION="2.15.0" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.4/src/Callbacks.cc new/yast2-pkg-bindings-2.15.0/src/Callbacks.cc --- old/yast2-pkg-bindings-2.14.4/src/Callbacks.cc 2006-11-15 10:27:56.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.0/src/Callbacks.cc 2006-11-29 09:42:25.000000000 +0100 @@ -2055,21 +2055,4 @@ return SET_YCP_CB( CB_Message, args ); } -YCPValue PkgModuleFunctions::CallbackStartSourceRefresh( const YCPString& args ) { - y2warning("Pkg::CallbackStartSourceRefresh is obsoleted, do not use it (empty implementation)!"); - return YCPVoid(); -} -YCPValue PkgModuleFunctions::CallbackProgressSourceRefresh( const YCPString& args ) { - y2warning("Pkg::CallbackProgressSourceRefresh is obsoleted, do not use it (empty implementation)!"); - return YCPVoid(); -} -YCPValue PkgModuleFunctions::CallbackErrorSourceRefresh( const YCPString& args ) { - y2warning("Pkg::CallbackErrorSourceRefresh is obsoleted, do not use it (empty implementation)!"); - return YCPVoid(); -} -YCPValue PkgModuleFunctions::CallbackDoneSourceRefresh( const YCPString& args ) { - y2warning("Pkg::CallbackDoneSourceRefresh is obsoleted, do not use it (empty implementation)!"); - return YCPVoid(); -} - #undef SET_YCP_CB diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.4/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.15.0/src/PkgModuleFunctions.h --- old/yast2-pkg-bindings-2.14.4/src/PkgModuleFunctions.h 2006-11-16 11:47:38.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.0/src/PkgModuleFunctions.h 2006-11-29 09:46:07.000000000 +0100 @@ -198,25 +198,12 @@ /* TYPEINFO: void(string) */ YCPValue CallbackFinishPatchDownload( const YCPString& func); - // backward compatibity /* TYPEINFO: void(string) */ YCPValue CallbackStartDownload (const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackProgressDownload (const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackDoneDownload (const YCPString& func); - /* TYPEINFO: void(string) */ - YCPValue CallbackSourceCreateEndProbe( const YCPString& func); - /* TYPEINFO: void(string) */ - YCPValue CallbackSourceCreateProgressData( const YCPString& func); - /* TYPEINFO: void(string) */ - YCPValue CallbackStartSourceRefresh( const YCPString& func); - /* TYPEINFO: void(string) */ - YCPValue CallbackProgressSourceRefresh( const YCPString& func); - /* TYPEINFO: void(string) */ - YCPValue CallbackErrorSourceRefresh( const YCPString& func); - /* TYPEINFO: void(string) */ - YCPValue CallbackDoneSourceRefresh( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceCreateStart( const YCPString& func); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0