Hello community, here is the log from the commit of package yast2-slp-server for openSUSE:Factory checked in at Wed Sep 21 17:33:57 CEST 2011.
-------- --- yast2-slp-server/yast2-slp-server.changes 2010-11-09 16:27:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-slp-server/yast2-slp-server.changes 2011-09-19 14:32:52.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Sep 16 11:43:56 CEST 2011 - [email protected] + +- remove unneded dialogs and deprecated import +- 2.21.0 + +------------------------------------------------------------------- +Fri Aug 5 12:35:10 CEST 2011 - [email protected] + +- fixed .desktop file (bnc #681249) + +------------------------------------------------------------------- +Fri Jul 1 12:58:01 CEST 2011 - [email protected] + +- Proofread texts for translation (by A.Turrini, bnc#703238). + +------------------------------------------------------------------- +Tue Jun 21 17:34:16 CET 2011 - [email protected] + +- use ButtonBox for OK/Cancel (bnc#701262) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-slp-server-2.20.0.tar.bz2 New: ---- yast2-slp-server-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp-server.spec ++++++ --- /var/tmp/diff_new_pack.irJhCQ/_old 2011-09-21 17:33:49.000000000 +0200 +++ /var/tmp/diff_new_pack.irJhCQ/_new 2011-09-21 17:33:49.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-slp-server (Version 2.20.0) +# spec file for package yast2-slp-server # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,16 @@ Name: yast2-slp-server -Version: 2.20.0 -Release: 1 +Version: 2.21.0 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-slp-server-2.20.0.tar.bz2 +Source0: yast2-slp-server-2.21.0.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite # network needs Wizard::OpenCancelOKDialog() @@ -44,7 +44,7 @@ SLP daemon. %prep -%setup -n yast2-slp-server-2.20.0 +%setup -n yast2-slp-server-2.21.0 %build %{prefix}/bin/y2tool y2autoconf @@ -81,4 +81,5 @@ %{prefix}/share/applications/YaST2/slp-server.desktop /usr/share/YaST2/scrconf/slp*.scr %doc %{prefix}/share/doc/packages/yast2-slp-server + %changelog ++++++ yast2-slp-server-2.20.0.tar.bz2 -> yast2-slp-server-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/MAINTAINER new/yast2-slp-server-2.21.0/MAINTAINER --- old/yast2-slp-server-2.20.0/MAINTAINER 2008-01-24 14:41:46.000000000 +0100 +++ new/yast2-slp-server-2.21.0/MAINTAINER 2011-09-15 17:20:53.000000000 +0200 @@ -1 +1 @@ -Michal Zugec <[email protected]> +Martin Vidner <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/Makefile.am new/yast2-slp-server-2.21.0/Makefile.am --- old/yast2-slp-server-2.20.0/Makefile.am 2009-05-21 14:01:01.000000000 +0200 +++ new/yast2-slp-server-2.21.0/Makefile.am 2011-08-19 09:48:42.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools install m4 snippets +# where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/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 cmp -s $< $@ || cp -f $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/Makefile.in new/yast2-slp-server-2.21.0/Makefile.in --- old/yast2-slp-server-2.20.0/Makefile.in 2009-05-21 14:01:11.000000000 +0200 +++ new/yast2-slp-server-2.21.0/Makefile.in 2011-08-19 09:48:42.000000000 +0200 @@ -226,10 +226,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools install m4 snippets +# where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/VERSION new/yast2-slp-server-2.21.0/VERSION --- old/yast2-slp-server-2.20.0/VERSION 2010-11-09 16:23:09.000000000 +0100 +++ new/yast2-slp-server-2.21.0/VERSION 2011-09-19 14:32:11.000000000 +0200 @@ -1 +1 @@ -2.20.0 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/configure new/yast2-slp-server-2.21.0/configure --- old/yast2-slp-server-2.20.0/configure 2009-05-21 14:01:08.000000000 +0200 +++ new/yast2-slp-server-2.21.0/configure 2011-08-19 09:48:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-slp-server 2.18.1. +# Generated by GNU Autoconf 2.63 for yast2-slp-server 2.17.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-slp-server' PACKAGE_TARNAME='yast2-slp-server' -PACKAGE_VERSION='2.18.1' -PACKAGE_STRING='yast2-slp-server 2.18.1' +PACKAGE_VERSION='2.17.1' +PACKAGE_STRING='yast2-slp-server 2.17.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-slp-server 2.18.1 to adapt to many kinds of systems. +\`configure' configures yast2-slp-server 2.17.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-slp-server 2.18.1:";; + short | recursive ) echo "Configuration of yast2-slp-server 2.17.1:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-slp-server configure 2.18.1 +yast2-slp-server configure 2.17.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,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-slp-server $as_me 2.18.1, which was +It was created by yast2-slp-server $as_me 2.17.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-slp-server' - VERSION='2.18.1' + VERSION='2.17.1' cat >>confdefs.h <<_ACEOF @@ -2511,7 +2511,7 @@ -VERSION="2.18.1" +VERSION="2.17.1" RPMNAME="yast2-slp-server" MAINTAINER="Michal Zugec <[email protected]>" @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-slp-server $as_me 2.18.1, which was +This file was extended by yast2-slp-server $as_me 2.17.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-slp-server config.status 2.18.1 +yast2-slp-server config.status 2.17.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/configure.in new/yast2-slp-server-2.21.0/configure.in --- old/yast2-slp-server-2.20.0/configure.in 2009-05-21 14:01:01.000000000 +0200 +++ new/yast2-slp-server-2.21.0/configure.in 2011-08-19 09:48:42.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-slp-server dnl -dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-slp-server, 2.18.1, http://bugs.opensuse.org/, yast2-slp-server) +AC_INIT(yast2-slp-server, 2.17.1, http://bugs.opensuse.org/, yast2-slp-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.1" +VERSION="2.17.1" RPMNAME="yast2-slp-server" MAINTAINER="Michal Zugec <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/src/complex.ycp new/yast2-slp-server-2.21.0/src/complex.ycp --- old/yast2-slp-server-2.20.0/src/complex.ycp 2009-01-26 14:22:57.000000000 +0100 +++ new/yast2-slp-server-2.21.0/src/complex.ycp 2011-09-16 11:44:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Zugec Michal <[email protected]> * - * $Id: complex.ycp 55008 2009-01-26 13:22:56Z mzugec $ + * $Id: complex.ycp 65738 2011-09-16 09:44:31Z visnov $ */ { @@ -14,7 +14,6 @@ import "Label"; import "Popup"; import "Wizard"; -import "Wizard_hw"; import "SlpServer"; include "slp-server/helps.ycp"; @@ -57,68 +56,5 @@ return ret ? `next : `abort; } -/** - * Summary dialog - * @return dialog result - */ -any SummaryDialog() { - - /* SlpServer summary dialog caption */ - string caption = _("SLP Server Configuration"); - - /* FIXME */ - list summary = SlpServer::Summary(); - list unconfigured = summary[1]:[]; - string configured = summary[0]:""; - - /* Frame label */ - term contents = Wizard_hw::DetectedContent(_("SLP Server to Configure"), - unconfigured, false, configured); - - Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", - Label::BackButton(), Label::FinishButton()); - Wizard::SetNextButton(`next, Label::OKButton()); - Wizard::SetAbortButton(`abort, Label::CancelButton()); - Wizard::HideBackButton(); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - /* abort? */ - if(ret == `abort || ret == `cancel || ret == `back) { - if(ReallyAbort()) break; - else continue; - } - /* overview dialog */ - else if(ret == `edit_button) { - ret = `overview; - break; - } - /* configure the selected device */ - else if(ret == `configure_button) { - // TODO FIXME: check for change of the configuration - any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem); - if(selected == `other) { - ret = `other; - } - else { - ret = `configure; - } - break; - } - else if(ret == `next) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; -} - /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/src/dialogs.ycp new/yast2-slp-server-2.21.0/src/dialogs.ycp --- old/yast2-slp-server-2.20.0/src/dialogs.ycp 2010-06-28 16:15:18.000000000 +0200 +++ new/yast2-slp-server-2.21.0/src/dialogs.ycp 2011-09-15 17:20:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Zugec Michal <[email protected]> * - * $Id: dialogs.ycp 62161 2010-06-28 14:15:17Z mzugec $ + * $Id: dialogs.ycp 64516 2011-06-21 15:35:11Z jreidinger $ */ { @@ -456,7 +456,7 @@ `VBox( // translators: combo box for selsect module from installed unknown modules `TextEntry(`id(`filename), _("Name of New File") ), - `HBox( + `ButtonBox( `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/src/helps.ycp new/yast2-slp-server-2.21.0/src/helps.ycp --- old/yast2-slp-server-2.20.0/src/helps.ycp 2008-01-24 14:41:46.000000000 +0100 +++ new/yast2-slp-server-2.21.0/src/helps.ycp 2011-09-16 11:44:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Zugec Michal <[email protected]> * - * $Id: helps.ycp 34516 2006-11-21 09:22:13Z mzugec $ + * $Id: helps.ycp 65738 2011-09-16 09:44:31Z visnov $ */ { @@ -38,24 +38,6 @@ </p> "), - /* Summary dialog help 1/3 */ - "summary" : _("<p><b><big>SLP Server Configuration</big></b><br> -Configure SLP server here.<br></p> -") + - - /* Summary dialog help 2/3 */ - _("<p><b><big>Adding an SLP Server</big></b><br> -Choose an SLP server from the list of detected SLP servers. -If your SLP server was not detected, use <b>Other (not detected)</b>. -Then press <b>Configure</b>.</p> -") + - - /* Summary dialog help 3/3 */ - _("<p><b><big>Editing or Deleting:</big></b><br> -If you press <b>Edit</b>, an additional dialog in which to change -the configuration opens.</p> -"), - /* Ovreview dialog help 1/3 */ "overview" : _("<p><b><big>SLP Server Configuration Overview</big></b><br> Obtain an overview of installed SLP servers. Additionally @@ -98,8 +80,8 @@ "server_settings" : _("<p>Here, set the mode in which to run the SLP daemon. The simplest mode is <b>Broadcast</b>. In it, the SLP daemon answers all requests sent by broadcast. The next mode is <b>Multicast</b>. In it, the daemon answers queries -sent by multicast in appropriates SCOPES. In the <b>DA Server</b> mode, it informs DA servers on the specified IP addresses -about statically and dynamically registrated services. The last options is <b>Becomes DA Server</b>. This is a cache server for service +sent by multicast in appropriate SCOPES. In the <b>DA Server</b> mode, it informs DA servers on the specified IP addresses +about statically and dynamically registered services. The last options is <b>Becomes DA Server</b>. This is a cache server for service answers.</p> "), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/src/slp-server.desktop new/yast2-slp-server-2.21.0/src/slp-server.desktop --- old/yast2-slp-server-2.20.0/src/slp-server.desktop 2010-03-25 14:55:04.000000000 +0100 +++ new/yast2-slp-server-2.21.0/src/slp-server.desktop 2011-09-15 17:20:53.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 X-SuSE-YaST-Call=slp-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.20.0/src/wizards.ycp new/yast2-slp-server-2.21.0/src/wizards.ycp --- old/yast2-slp-server-2.20.0/src/wizards.ycp 2009-01-26 14:22:57.000000000 +0100 +++ new/yast2-slp-server-2.21.0/src/wizards.ycp 2011-09-16 11:44:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Zugec Michal <[email protected]> * - * $Id: wizards.ycp 55008 2009-01-26 13:22:56Z mzugec $ + * $Id: wizards.ycp 65738 2011-09-16 09:44:31Z visnov $ */ { @@ -26,7 +26,6 @@ /* FIXME: adapt to your needs */ map aliases = $[ - "summary" : ``( SummaryDialog() ), "overview" : ``( OverviewDialog() ), "expert" : ``( ExpertDialog() ), "edit_reg" : ``( editRegFile() ) @@ -35,12 +34,6 @@ /* FIXME: adapt to your needs */ map sequence = $[ "ws_start" : "overview", - "summary" : $[ - `abort : `abort, - `next : `next, - `overview : "overview", - `expert : "expert" - ], "overview" : $[ `abort : `abort, `next : `next, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
