Hello community,
here is the log from the commit of package yast2-ftp-server
checked in at Mon Oct 6 15:56:24 CEST 2008.
--------
--- yast2-ftp-server/yast2-ftp-server.changes 2008-06-27 19:04:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ftp-server/yast2-ftp-server.changes 2008-09-30 18:22:29.000000000 +0200
@@ -2 +2,7 @@
-Fri Jun 27 10:44:22 CEST 2008 - juhliarik@suse.cz
+Tue Sep 30 18:12:18 CEST 2008 - juhliarik@suse.cz
+
+- corrected typo in help text (bnc #407517)
+- 2.17.1
+
+-------------------------------------------------------------------
+Thu Sep 11 08:27:00 CEST 2008 - jsrain@suse.cz
@@ -3,0 +10,4 @@
+- merged texts from proofread
+
+-------------------------------------------------------------------
+Fri Jun 27 10:44:22 CEST 2008 - juhliarik@suse.cz
calling whatdependson for head-i586
Old:
----
yast2-ftp-server-2.17.0.tar.bz2
New:
----
yast2-ftp-server-2.17.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.St2783/_old 2008-10-06 15:56:09.000000000 +0200
+++ /var/tmp/diff_new_pack.St2783/_new 2008-10-06 15:56:09.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-ftp-server (Version 2.17.0)
+# spec file for package yast2-ftp-server (Version 2.17.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-ftp-server
-Version: 2.17.0
+Version: 2.17.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ftp-server-2.17.0.tar.bz2
+Source0: yast2-ftp-server-2.17.1.tar.bz2
Prefix: /usr
Requires: yast2 yast2-inetd
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite
@@ -35,7 +42,7 @@
Jozef Uhliarik
%prep
-%setup -n yast2-ftp-server-2.17.0
+%setup -n yast2-ftp-server-2.17.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +78,11 @@
%doc %{prefix}/share/doc/packages/yast2-ftp-server
%changelog
+* Tue Sep 30 2008 juhliarik@suse.cz
+- corrected typo in help text (bnc #407517)
+- 2.17.1
+* Thu Sep 11 2008 jsrain@suse.cz
+- merged texts from proofread
* Fri Jun 27 2008 juhliarik@suse.cz
- added fix for using <b></b> in dialog (bnc #398519)
- 2.17.0
++++++ yast2-ftp-server-2.17.0.tar.bz2 -> yast2-ftp-server-2.17.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/configure new/yast2-ftp-server-2.17.1/configure
--- old/yast2-ftp-server-2.17.0/configure 2008-06-27 10:41:57.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/configure 2008-09-30 18:13:41.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-ftp-server 2.16.11.
+# Generated by GNU Autoconf 2.61 for yast2-ftp-server 2.17.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ftp-server'
PACKAGE_TARNAME='yast2-ftp-server'
-PACKAGE_VERSION='2.16.11'
-PACKAGE_STRING='yast2-ftp-server 2.16.11'
+PACKAGE_VERSION='2.17.1'
+PACKAGE_STRING='yast2-ftp-server 2.17.1'
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-ftp-server 2.16.11 to adapt to many kinds of systems.
+\`configure' configures yast2-ftp-server 2.17.1 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-ftp-server 2.16.11:";;
+ short | recursive ) echo "Configuration of yast2-ftp-server 2.17.1:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ftp-server configure 2.16.11
+yast2-ftp-server configure 2.17.1
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-ftp-server $as_me 2.16.11, which was
+It was created by yast2-ftp-server $as_me 2.17.1, 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-ftp-server'
- VERSION='2.16.11'
+ VERSION='2.17.1'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.11"
+VERSION="2.17.1"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
@@ -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-ftp-server $as_me 2.16.11, which was
+This file was extended by yast2-ftp-server $as_me 2.17.1, 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-ftp-server config.status 2.16.11
+yast2-ftp-server config.status 2.17.1
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-ftp-server-2.17.0/configure.in new/yast2-ftp-server-2.17.1/configure.in
--- old/yast2-ftp-server-2.17.0/configure.in 2008-06-27 10:41:51.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/configure.in 2008-09-30 18:13:32.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-ftp-server, 2.16.11, http://bugs.opensuse.org/, yast2-ftp-server)
+AC_INIT(yast2-ftp-server, 2.17.1, http://bugs.opensuse.org/, yast2-ftp-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.11"
+VERSION="2.17.1"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/complex.ycp new/yast2-ftp-server-2.17.1/src/complex.ycp
--- old/yast2-ftp-server-2.17.0/src/complex.ycp 2008-06-27 10:41:27.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/src/complex.ycp 2008-09-18 10:42:27.000000000 +0200
@@ -82,7 +82,7 @@
`VBox(
`Heading (_("No server package installed")),
`Left(`Label(_("Please choose an ftp daemon."))),
- `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))),
+ `Left(`Label(_("Press <b>Cancel</b> to cancel the configuration of the ftp."))),
`Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)),
`Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))),
`HBox(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/ftp-server.ycp new/yast2-ftp-server-2.17.1/src/ftp-server.ycp
--- old/yast2-ftp-server-2.17.0/src/ftp-server.ycp 2008-06-02 15:08:19.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/src/ftp-server.ycp 2008-09-18 10:42:27.000000000 +0200
@@ -186,14 +186,14 @@
// access permissions for anonymous users
CommandLine::PrintNoCR(_("Access Permissions for Anonymous: "));
if (FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil == "NO") {
- CommandLine::PrintNoCR(_("Upload: enabled; "));
+ CommandLine::PrintNoCR(_("Upload enabled; "));
} else {
- CommandLine::PrintNoCR(_("Upload: disabled; "));
+ CommandLine::PrintNoCR(_("Upload disabled; "));
}
if (FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") {
- CommandLine::Print(_("Create directories: enabled"));
+ CommandLine::Print(_("Create directories enabled"));
} else {
- CommandLine::Print(_("Create directories: disabled"));
+ CommandLine::Print(_("Create directories disabled"));
}
// welcome message vsftpd only
@@ -826,7 +826,7 @@
"max_clients_ip" : $[
"handler" : FTPdCMDMaxClientsIP,
// TRANSLATORS: CommandLine help
- "help" : _("The maximum clients connected via IP"),
+ "help" : _("The maximum number of clients connected via IP"),
"example" : [
"max_clients_ip set_max_clients=20",
],
@@ -1029,7 +1029,7 @@
"set_idle_time":$[
"type" : "integer",
// TRANSLATORS: CommandLine help
- "help" : _("Maximal Idle Time (in minutes)."),
+ "help" : _("Maximum Idle Time (in minutes)."),
],
@@ -1043,7 +1043,7 @@
"set_max_rate":$[
"type" : "integer",
// TRANSLATORS: CommandLine help
- "help" : _("The maximum rate for ftp users (KB/s)."),
+ "help" : _("The maximum data transfer rate for ftp users (KB/s)."),
],
"anon_only": $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/FtpServer.ycp new/yast2-ftp-server-2.17.1/src/FtpServer.ycp
--- old/yast2-ftp-server-2.17.0/src/FtpServer.ycp 2008-06-02 15:08:19.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/src/FtpServer.ycp 2008-09-18 10:42:27.000000000 +0200
@@ -880,7 +880,7 @@
if (CommandLine::YesNo())
vsftpd_edit = true;
} else {
- CommandLine::Error(_("You have installed both daemons. You have to run the configuration in interactive mode."));
+ CommandLine::Error(_("You have installed both daemons. Therefore you have to run the configuration in interactive mode."));
return false;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/helps.ycp new/yast2-ftp-server-2.17.1/src/helps.ycp
--- old/yast2-ftp-server-2.17.0/src/helps.ycp 2008-06-02 15:08:19.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/src/helps.ycp 2008-09-30 18:10:15.000000000 +0200
@@ -106,7 +106,7 @@
/* general FTP dir for anonymous help 1/1 */
"FtpDirAnon": _("<p><b>FTP Directory for Anonymous Users:</b><br>
Here you can specify a directory which is used for ftp anonymous users.
-By pressing <b>Browse</b> you can select a directory from local filesystem.
+By pressing <b>Browse</b> you can select a directory from the local filesystem.
</p>
"),
@@ -114,7 +114,7 @@
/* general FTP dir for authenticated help 1/1 */
"FtpDirLocal": _("<p><b>FTP Directory for Authenticated Users:</b><br>
You can specify a directory which is used for ftp authenticated users.
-By pressing <b>Browse</b> you can select a directory from local filesystem.
+By pressing <b>Browse</b> you can select a directory from the local filesystem.
</p>
"),
@@ -165,14 +165,14 @@
"AnonAuthen": _("<p><b>Enable/Disable Anonymous and Local Users</b><br>
<b>Anonymous Only</b> If enabled only anonymous logins are permitted.
<b>Authenticated Users Only</b> If enabled only authenticated users are permitted.
-<b>Both</b> If enabled authenticated users and anonymous are permitted.
+<b>Both</b> If enabled authenticated users and anonymous users are permitted.
</p>
"),
/* authentication Enable Upload help 1/1 */
"EnableUpload": _("<p><b>Enable Upload</b><br>
-If enabled ftp users can upload. Anonymous users need to allow
- <b>Anonymous Can Upload</b> for enabling upload.
+If enabled ftp users can upload. To allow anonymous users
+to upload enable <b>Anonymous Can Upload</b>
</p>
"),
@@ -201,19 +201,21 @@
/* expert settings Enable Passive Mode help 1/1 */
"PassiveMode": _("<p><b>Enable Passive Mode</b><br>
-If enabled ftp server allow passive mode for connection.
+If enabled the ftp server will allow passive mode for connections.
</p>
"),
/* expert settings Min Port for Pas. Mode help 1/1 */
"PasMinPort":_("<p><b>Min Port for Passive Mode</b><br>
-Minimal value for a port range for passive connection replies. This is used for protection by means of a firewall.
+Minimum value for a port range for passive connection replies.
+This is used for protection by means of a firewall.
</p>
"),
/* expert settings Max Port for Pas. Mode help 1/1 */
"PasMaxPort": _("<p><b>Max Port for Pas. Mode</b><br>
-Maximal value for a port range for passive connection replies. This is used for protection by means of a firewall.
+Maximum value for a port range for passive connection replies.
+ This is used for protection by means of a firewall.
</p>
"),
@@ -283,21 +285,20 @@
"),
/* Ovreview dialog help 1/3 */
- "overview" : _("<p><b><big>FTP Server Configuration Overvie</big></b><br>
+ "overview" : _("<p><b><big>FTP Server Configuration Overview</big></b><br>
Obtain an overview of the installed ftp servers. Additionally,
edit their configurations.<br></p>
") +
/* Ovreview dialog help 2/3 */
_("<p><b><big>Adding a FTP Server</big></b><br>
-Press <b>Add</b> to configure an ftp server.</p>
+Press <b>Add</b> to configure a ftp server.</p>
") +
/* Ovreview dialog help 3/3 */
_("<p><b><big>Editing or Deleting</big></b><br>
-Choose an ftp server to change or remove.
-Then press <b>Edit</b> or <b>Delete</b>, respectively.</p>
-"),
+Choose a ftp server to change or remove.
+Then press <b>Edit</b> or <b>Delete</b>, respectively.</p>\n"),
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/VERSION new/yast2-ftp-server-2.17.1/VERSION
--- old/yast2-ftp-server-2.17.0/VERSION 2008-06-27 10:46:31.000000000 +0200
+++ new/yast2-ftp-server-2.17.1/VERSION 2008-09-30 18:13:15.000000000 +0200
@@ -1 +1 @@
-2.17.0
+2.17.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
