Hello community,
here is the log from the commit of package yast2-slp-server
checked in at Fri Apr 25 15:09:42 CEST 2008.
--------
--- yast2-slp-server/yast2-slp-server.changes 2008-04-14 12:15:41.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-slp-server/yast2-slp-server.changes 2008-04-25 11:49:27.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 24 21:53:30 CEST 2008 - mzugec@suse.cz
+
+- fixed SCR agent for slp.reg.d/* files (bnc#374310)
+- 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-slp-server-2.16.1.tar.bz2
New:
----
yast2-slp-server-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-slp-server.spec ++++++
--- /var/tmp/diff_new_pack.cEk373/_old 2008-04-25 15:09:38.000000000 +0200
+++ /var/tmp/diff_new_pack.cEk373/_new 2008-04-25 15:09:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-slp-server (Version 2.16.1)
+# spec file for package yast2-slp-server (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://forge.novell.com/modules/xfmod/project/?yast
Name: yast2-slp-server
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-slp-server-2.16.1.tar.bz2
+Source0: yast2-slp-server-2.16.2.tar.bz2
Prefix: /usr
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
Requires: yast2
@@ -36,7 +36,7 @@
Michal Zugec
%prep
-%setup -n yast2-slp-server-2.16.1
+%setup -n yast2-slp-server-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,9 @@
/usr/share/YaST2/scrconf/slp*.scr
%doc %{prefix}/share/doc/packages/yast2-slp-server
%changelog
+* Thu Apr 24 2008 mzugec@suse.cz
+- fixed SCR agent for slp.reg.d/* files (bnc#374310)
+- 2.16.2
* Mon Mar 17 2008 jsrain@suse.cz
- added 'StartupNotify=true' to the desktop file (bnc #304964)
- 2.16.1
++++++ yast2-slp-server-2.16.1.tar.bz2 -> yast2-slp-server-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-slp-server-2.16.1/agents/slp_reg.scr new/yast2-slp-server-2.16.2/agents/slp_reg.scr
--- old/yast2-slp-server-2.16.1/agents/slp_reg.scr 2007-05-18 10:06:59.000000000 +0200
+++ new/yast2-slp-server-2.16.2/agents/slp_reg.scr 2008-04-25 11:06:21.000000000 +0200
@@ -40,9 +40,10 @@
// $[ "match" : [ "^[#;][ \t]*([^ \t]+)[ \t]+([^ \t]+)[ \t]+$", "%s %s" ]],
$[ "match" : [ "^[#;][ \t]*([^ \t\=]+)[ \t\=:]+(.+)[ \t]*$", "; %s %s" ]],
// Options with more possible values
- $[ "match" : [ "^[ \t]*([^ \t\=]+)[ \t\=]+[ ]*(.+)[ \t]*$", "%s %s" ]],
+ $[ "match" : [ "^[ \t]*([^ \t\=]+)[ \t\=]+[ ]*(.+)[ \t]*$", "%s=%s" ]],
+ $[ "match" : [ "^[ \t]*([^ \t\:]+)[ \t\:]+[ ]*(.+)[ \t]*$", "%s:%s" ]],
- $[ "match" : [ "^[ \t]*([^ \t:]+)[ \t\:]+[ ]*(.+)[ \t]*$", "%s %s" ]],
+// $[ "match" : [ "^[ \t]*([^ \t:]+)[ \t\:]+[ ]*(.+)[ \t]*$", "%s %s" ]],
],
]
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-slp-server-2.16.1/configure new/yast2-slp-server-2.16.2/configure
--- old/yast2-slp-server-2.16.1/configure 2008-04-14 12:15:25.000000000 +0200
+++ new/yast2-slp-server-2.16.2/configure 2008-04-25 11:21:01.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-slp-server 2.16.1.
+# Generated by GNU Autoconf 2.61 for yast2-slp-server 2.16.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-slp-server'
PACKAGE_TARNAME='yast2-slp-server'
-PACKAGE_VERSION='2.16.1'
-PACKAGE_STRING='yast2-slp-server 2.16.1'
+PACKAGE_VERSION='2.16.2'
+PACKAGE_STRING='yast2-slp-server 2.16.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.1 to adapt to many kinds of systems.
+\`configure' configures yast2-slp-server 2.16.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-slp-server 2.16.1:";;
+ short | recursive ) echo "Configuration of yast2-slp-server 2.16.2:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-slp-server configure 2.16.1
+yast2-slp-server configure 2.16.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.1, which was
+It was created by yast2-slp-server $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-slp-server'
- VERSION='2.16.1'
+ VERSION='2.16.2'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.1"
+VERSION="2.16.2"
RPMNAME="yast2-slp-server"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,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.16.1, which was
+This file was extended by yast2-slp-server $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-slp-server config.status 2.16.1
+yast2-slp-server config.status 2.16.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-slp-server-2.16.1/configure.in new/yast2-slp-server-2.16.2/configure.in
--- old/yast2-slp-server-2.16.1/configure.in 2008-04-14 12:15:20.000000000 +0200
+++ new/yast2-slp-server-2.16.2/configure.in 2008-04-25 11:20:33.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-slp-server, 2.16.1, http://bugs.opensuse.org/, yast2-slp-server)
+AC_INIT(yast2-slp-server, 2.16.2, 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.16.1"
+VERSION="2.16.2"
RPMNAME="yast2-slp-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-slp-server-2.16.1/slp-server.pot new/yast2-slp-server-2.16.2/slp-server.pot
--- old/yast2-slp-server-2.16.1/slp-server.pot 2008-04-01 10:52:03.000000000 +0200
+++ new/yast2-slp-server-2.16.2/slp-server.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,370 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 10:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/SlpServer.ycp:164
-#, ycp-format
-msgid "<p>To configure the SLP server, the <b>%1</b> package must be installed.</p>"
-msgstr ""
-
-#: src/SlpServer.ycp:165
-msgid "<p>Do you want to install it now?</p>"
-msgstr ""
-
-#. SlpServer read dialog caption
-#: src/SlpServer.ycp:181
-msgid "Initializing SLP Server Configuration"
-msgstr ""
-
-#. Progress stage 1/3
-#: src/SlpServer.ycp:193
-msgid "Read the database"
-msgstr ""
-
-#. Progress stage 2/3
-#: src/SlpServer.ycp:195
-msgid "Read the previous settings"
-msgstr ""
-
-#. Progress stage 3/3
-#: src/SlpServer.ycp:197
-msgid "Detect the devices"
-msgstr ""
-
-#. Progress step 1/3
-#: src/SlpServer.ycp:200
-msgid "Reading the database..."
-msgstr ""
-
-#. Progress step 2/3
-#: src/SlpServer.ycp:202
-msgid "Reading the previous settings..."
-msgstr ""
-
-#. Progress step 3/3
-#: src/SlpServer.ycp:204
-msgid "Detecting the devices..."
-msgstr ""
-
-#. Progress finished
-#: src/SlpServer.ycp:206 src/SlpServer.ycp:278
-msgid "Finished"
-msgstr ""
-
-#: src/SlpServer.ycp:231
-msgid "Cannot read database2."
-msgstr ""
-
-#. SlpServer read dialog caption
-#: src/SlpServer.ycp:257
-msgid "Saving SLP Server Configuration"
-msgstr ""
-
-#. Progress stage 1/2
-#: src/SlpServer.ycp:269
-msgid "Write the settings"
-msgstr ""
-
-#. Progress stage 2/2
-#: src/SlpServer.ycp:271
-msgid "Run SuSEconfig"
-msgstr ""
-
-#. Progress step 1/2
-#: src/SlpServer.ycp:274
-msgid "Writing the settings..."
-msgstr ""
-
-#. Progress step 2/2
-#: src/SlpServer.ycp:276
-msgid "Running SuSEconfig..."
-msgstr ""
-
-#. Error message
-#: src/SlpServer.ycp:289
-msgid "Cannot write settings."
-msgstr ""
-
-#: src/SlpServer.ycp:356
-msgid "Configuration summary..."
-msgstr ""
-
-#. SlpServer summary dialog caption
-#. Initialization dialog caption
-#: src/complex.ycp:67 src/dialogs.ycp:623 src/wizards.ycp:109
-msgid "SLP Server Configuration"
-msgstr ""
-
-#. Frame label
-#: src/complex.ycp:75
-msgid "SLP Server to Configure"
-msgstr ""
-
-#. radio button (starting SLP service - option 1)
-#: src/dialogs.ycp:73
-msgid "When &Booting"
-msgstr ""
-
-#. radio button (starting SLP service - option 2)
-#: src/dialogs.ycp:75
-msgid "&Manually"
-msgstr ""
-
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/dialogs.ycp:78
-msgid "When Booting"
-msgstr ""
-
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/dialogs.ycp:80
-msgid "Manually"
-msgstr ""
-
-#: src/dialogs.ycp:94 src/dialogs.ycp:97
-msgid "Show Log"
-msgstr ""
-
-#: src/dialogs.ycp:105 src/dialogs.ycp:108
-msgid "Expert Settings"
-msgstr ""
-
-#: src/dialogs.ycp:120
-msgid "Response To"
-msgstr ""
-
-#: src/dialogs.ycp:121
-msgid "Broadcast"
-msgstr ""
-
-#: src/dialogs.ycp:122
-msgid "Multicast"
-msgstr ""
-
-#: src/dialogs.ycp:123
-msgid "DA Server"
-msgstr ""
-
-#: src/dialogs.ycp:124
-msgid "Becomes DA Server"
-msgstr ""
-
-#: src/dialogs.ycp:127
-msgid "&IP Addresses of DA Servers"
-msgstr ""
-
-#: src/dialogs.ycp:128
-msgid "&Scopes"
-msgstr ""
-
-#: src/dialogs.ycp:135
-msgid "SLP Server Settings"
-msgstr ""
-
-#: src/dialogs.ycp:439
-msgid "Really delete this file?"
-msgstr ""
-
-#. translators: combo box for selsect module from installed unknown modules
-#: src/dialogs.ycp:456
-msgid "Name of New File"
-msgstr ""
-
-#: src/dialogs.ycp:582
-msgid "Scope and IP address must be inserted."
-msgstr ""
-
-#: src/dialogs.ycp:590
-msgid "Scope must be inserted."
-msgstr ""
-
-#: src/dialogs.ycp:599
-msgid "Global SLP Configuration"
-msgstr ""
-
-#: src/dialogs.ycp:644
-msgid "Server Details"
-msgstr ""
-
-#: src/dialogs.ycp:663
-msgid "Static Configuration Files"
-msgstr ""
-
-#. SlpServer overview dialog caption
-#: src/dialogs.ycp:679
-msgid "SLP Server Overview"
-msgstr ""
-
-#: src/dialogs.ycp:687
-msgid "<h1>SLP Server</h1>"
-msgstr ""
-
-#: src/dialogs.ycp:707
-msgid "SLP Server Configuration--Expert Dialog"
-msgstr ""
-
-#: src/dialogs.ycp:726
-msgid "SLP Server Configuration--Edit .reg File"
-msgstr ""
-
-#. Read dialog help 1/2
-#: src/helps.ycp:20
-msgid ""
-"<p><b><big>Initializing SLP Server Configuration</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Read dialog help 2/2
-#: src/helps.ycp:25
-msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
-msgstr ""
-
-#. Write dialog help 1/2
-#: src/helps.ycp:30
-msgid ""
-"<p><b><big>Saving SLP Server Configuration</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Write dialog help 2/2
-#: src/helps.ycp:35
-msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>\n"
-"Abort the save procedure by pressing <b>Abort</b>.\n"
-"An additional dialog informs whether it is safe to do so.\n"
-"</p>\n"
-msgstr ""
-
-#. Summary dialog help 1/3
-#: src/helps.ycp:42
-msgid ""
-"<p><b><big>SLP Server Configuration</big></b><br>\n"
-"Configure SLP server here.<br></p>\n"
-msgstr ""
-
-#. Summary dialog help 2/3
-#: src/helps.ycp:47
-msgid ""
-"<p><b><big>Adding an SLP Server</big></b><br>\n"
-"Choose an SLP server from the list of detected SLP servers.\n"
-"If your SLP server was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>\n"
-msgstr ""
-
-#. Summary dialog help 3/3
-#: src/helps.ycp:54
-msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>\n"
-"If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>\n"
-msgstr ""
-
-#. Ovreview dialog help 1/3
-#: src/helps.ycp:60
-msgid ""
-"<p><b><big>SLP Server Configuration Overview</big></b><br>\n"
-"Obtain an overview of installed SLP servers. Additionally\n"
-"edit their configurations.<br></p>\n"
-msgstr ""
-
-#. Ovreview dialog help 2/3
-#: src/helps.ycp:66
-msgid ""
-"<p><b><big>Adding an SLP Server</big></b><br>\n"
-"Press <b>Add</b> to configure an SLP server.</p>\n"
-msgstr ""
-
-#. Ovreview dialog help 3/3
-#: src/helps.ycp:71
-msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>\n"
-"Choose an SLP server to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
-msgstr ""
-
-#. Configure1 dialog help 1/2
-#: src/helps.ycp:77
-msgid ""
-"<p><b><big>Configuration Part One</big></b><br>\n"
-"Press <b>Next</b> to continue.\n"
-"<br></p>"
-msgstr ""
-
-#. Configure1 dialog help 2/2
-#. Configure2 dialog help 2/2
-#: src/helps.ycp:82 src/helps.ycp:93
-msgid ""
-"<p><b><big>Selecting Something</big></b><br>\n"
-"It is not possible. You must code it first. :-)\n"
-"</p>"
-msgstr ""
-
-#. Configure2 dialog help 1/2
-#: src/helps.ycp:87
-msgid ""
-"<p><b><big>Configuration Part Two</big></b><br>\n"
-"Press <b>Next</b> to continue.\n"
-"<br></p>\n"
-msgstr ""
-
-#: src/helps.ycp:97
-msgid "<p>To show the slpd log file, use <b>Show Log</b>.</p>"
-msgstr ""
-
-#: src/helps.ycp:99
-msgid ""
-"<p>Here, set the mode in which to run the SLP daemon. The simplest mode is <b>Broadcast</b>.\n"
-"In it, the SLP daemon answers all requests sent by broadcast. The next mode is <b>Multicast</b>. In it, the daemon answers queries\n"
-"sent by multicast in appropriates SCOPES. In the <b>DA Server</b> mode, it informs DA servers on the specified IP addresses\n"
-"about statically and dynamically registrated services. The last options is <b>Becomes DA Server</b>. This is a cache server for service\n"
-"answers.</p>\n"
-msgstr ""
-
-#: src/helps.ycp:106
-msgid "<p>With <b>Expert Settings</b>, access all options available in /etc/slp.conf.</p>"
-msgstr ""
-
-#: src/helps.ycp:108
-msgid ""
-"Configuration files for static registration to SLP. With <b>Add</b>, create a new empty file. With <b>Modify</b>,\n"
-"change the values of any existing file. With <b>Delete</b>, it is possible to delete files not owned by any package."
-msgstr ""
-
-#: src/helps.ycp:111
-msgid "Help for regedit"
-msgstr ""
-
-#. Command line help text for the Xslp-server module
-#: src/slp-server.ycp:34
-msgid "Configuration of an SLP server"
-msgstr ""
-
-#. Rich text title for SlpServer in proposals
-#: src/slp-server_proposal.ycp:65
-msgid "SLP Server"
-msgstr ""
-
-#. Menu title for SlpServer in proposals
-#: src/slp-server_proposal.ycp:67
-msgid "&SLP Server"
-msgstr ""
-
-#. Initialization dialog contents
-#: src/wizards.ycp:111
-msgid "Initializing..."
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-slp-server-2.16.1/src/dialogs.ycp new/yast2-slp-server-2.16.2/src/dialogs.ycp
--- old/yast2-slp-server-2.16.1/src/dialogs.ycp 2007-07-18 12:39:31.000000000 +0200
+++ new/yast2-slp-server-2.16.2/src/dialogs.ycp 2008-04-24 21:56:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Zugec Michal
*
- * $Id: dialogs.ycp 39423 2007-07-16 11:01:56Z mzugec $
+ * $Id: dialogs.ycp 47047 2008-04-24 20:19:58Z mzugec $
*/
{
@@ -21,6 +21,8 @@
import "TablePopup";
import "LogView";
import "IP";
+import "String";
+
include "slp-server/helps.ycp";
void initServerSettings(string key);
@@ -554,7 +556,7 @@
else
if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc;
else
- if (size(SlpServer::slp_config["net.slp.daaddresses"]:"")>0) mode = `da;
+ if (size(String::CutBlanks(SlpServer::slp_config["net.slp.daaddresses"]:""))>0) mode = `da;
else mode = `mc;
UI::ChangeWidget(`id(`resp), `CurrentButton, mode);
changeResponseTo(mode);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-slp-server-2.16.1/VERSION new/yast2-slp-server-2.16.2/VERSION
--- old/yast2-slp-server-2.16.1/VERSION 2008-04-14 12:12:11.000000000 +0200
+++ new/yast2-slp-server-2.16.2/VERSION 2008-04-24 21:53:27.000000000 +0200
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
