March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ftp-server for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2012-03-30 14:21:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ftp-server", Maintainer is "jsrain(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2011-10-04 18:01:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes 2012-03-30 14:21:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 14:56:18 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-2.21.1.tar.bz2 New: ---- yast2-ftp-server-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.kNgKGh/_old 2012-03-30 14:21:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kNgKGh/_new 2012-03-30 14:21:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ftp-server # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,54 +15,54 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-ftp-server -Version: 2.21.1 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ftp-server-2.21.1.tar.bz2 - -Prefix: /usr +Source0: yast2-ftp-server-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Requires: yast2-inetd -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-inetd +BuildRequires: yast2-testsuite BuildArch: noarch Summary: YaST2 - FTP configuration +License: GPL-2.0 +Group: System/YaST %description This package contains the YaST2 component for FTP configuration. It can configure two daemons: pure-ftpd and vsftpd. %prep -%setup -n yast2-ftp-server-2.21.1 +%setup -n yast2-ftp-server-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -77,9 +77,9 @@ /usr/share/YaST2/clients/ftp-server.ycp /usr/share/YaST2/clients/ftp-server_*.ycp /usr/share/YaST2/modules/FtpServer.* -%{prefix}/share/applications/YaST2/ftp-server.desktop +%{_prefix}/share/applications/YaST2/ftp-server.desktop /usr/share/YaST2/schema/autoyast/rnc/ftp-server.rnc /usr/share/YaST2/scrconf/*.scr -%doc %{prefix}/share/doc/packages/yast2-ftp-server +%doc %{_prefix}/share/doc/packages/yast2-ftp-server %changelog ++++++ yast2-ftp-server-2.21.1.tar.bz2 -> yast2-ftp-server-2.22.0.tar.bz2 ++++++ ++++ 2794 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-ftp-server-2.21.1/Makefile.am new/yast2-ftp-server-2.22.0/Makefile.am --- old/yast2-ftp-server-2.21.1/Makefile.am 2011-09-26 11:17:12.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/Makefile.am 2012-03-29 14:57:57.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) 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) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(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-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) 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-ftp-server-2.21.1/VERSION new/yast2-ftp-server-2.22.0/VERSION --- old/yast2-ftp-server-2.21.1/VERSION 2011-09-26 11:16:58.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/VERSION 2012-03-29 14:57:55.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.22.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-ftp-server-2.21.1/configure.in new/yast2-ftp-server-2.22.0/configure.in --- old/yast2-ftp-server-2.21.1/configure.in 2011-09-26 11:17:11.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/configure.in 2012-03-29 14:57:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ftp-server dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ftp-server, 2.21.1, http://bugs.opensuse.org/, yast2-ftp-server) +AC_INIT(yast2-ftp-server, 2.22.0, 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.21.1" +VERSION="2.22.0" RPMNAME="yast2-ftp-server" MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" 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-ftp-server-2.21.1/src/FtpServer.ycp new/yast2-ftp-server-2.22.0/src/FtpServer.ycp --- old/yast2-ftp-server-2.21.1/src/FtpServer.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/FtpServer.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -890,8 +890,8 @@ if ((vsftpd_installed)&&(pureftpd_installed)) { if (CommandLine::Interactive()) { CommandLine::Print(String::UnderlinedHeader(_("You have installed both daemons:"), 0)); - CommandLine::Print(_("Please choose one of them for configuration.")); - CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd")); + CommandLine::Print(_("Choose one of them for configuration.")); + CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd.")); CommandLine::Print(""); if (CommandLine::YesNo()) vsftpd_edit = true; @@ -980,7 +980,7 @@ if (PollAbort()) return false; Progress::NextStage (); // write settings for starting daemon - if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections!")); + if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections.")); sleep(sl); 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-ftp-server-2.21.1/src/complex.ycp new/yast2-ftp-server-2.22.0/src/complex.ycp --- old/yast2-ftp-server-2.21.1/src/complex.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/complex.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -79,9 +79,9 @@ UI::OpenDialog( `RadioButtonGroup(`id("IntstallFTPd"), `VBox( - `Heading (_("No server package installed")), - `Left(`Label(_("Please choose an ftp daemon."))), - `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))), + `Heading (_("No server package installed.")), + `Left(`Label(_("Choose an FTP daemon."))), + `Left(`Label(_("Press Cancel to cancel FTP configuration."))), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))), `HBox( @@ -142,11 +142,11 @@ vsftpd_init_count = vsftpd_init_count + 1; } } else if (result == false) { - Popup::Error(_("Package for ftp is not available.")); + Popup::Error(_("Package for FTP is not available.")); y2milestone("[ftp-server] Package for ftp is not available"); return false; } else if (result == nil) { - Popup::Error(_("Package not found")); + Popup::Error(_("Package not found.")); y2milestone("[ftp-server] Package was not found"); return 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-ftp-server-2.21.1/src/dialogs.ycp new/yast2-ftp-server-2.22.0/src/dialogs.ycp --- old/yast2-ftp-server-2.21.1/src/dialogs.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/dialogs.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -75,8 +75,8 @@ map<string,any> StartStop () { map<string,any> result = $[]; result["service_id"] = "vsftpd"; - result["service_running_label"] = _("ftp is running"); - result["service_not_running_label"] = _("ftp is not running"); + result["service_running_label"] = _("FTP is running"); + result["service_not_running_label"] = _("FTP is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartVsftpd; @@ -85,11 +85,11 @@ result["stop_now_action"] = StopNowVsftpd; result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true), // part of help text - push button label, NO SHORTCUT!!! - _("Start FTP daemon Now"), + _("Start FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Stop FTP daemon Now"), + _("Stop FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Save Settings and Restart FTP daemon Now")); + _("Save Settings and Restart FTP Daemon Now")); return result; } @@ -104,8 +104,8 @@ map<string,any> StartStopPure () { map<string,any> result = $[]; result["service_id"] = "pure-ftpd"; - result["service_running_label"] = _("ftp is running"); - result["service_not_running_label"] = _("ftp is not running"); + result["service_running_label"] = _("FTP is running"); + result["service_not_running_label"] = _("FTP is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartPure; @@ -114,11 +114,11 @@ result["stop_now_action"] = StopNowPure; result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true), // part of help text - push button label, NO SHORTCUT!!! - _("Start FTP daemon Now"), + _("Start FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Stop FTP daemon Now"), + _("Stop FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Save Settings and Restart FTP daemon Now")); + _("Save Settings and Restart FTP Daemon Now")); return result; } @@ -319,7 +319,7 @@ map<string,any> FtpDirAnon () { map<string,any> result = $[]; - result["label"] = _("Ftp Directory for Anon&ymous Users"); + result["label"] = _("FTP Directory for Anon&ymous Users"); result["widget"] = `textentry; result["opt"] = [`notify]; result["init"] = InitFtpDirAnon; @@ -364,7 +364,7 @@ map<string,any> FtpDirLocal () { map<string,any> result = $[]; - result["label"] = _("&Ftp Directory for Authenticated Users"); + result["label"] = _("&FTP Directory for Authenticated Users"); result["widget"] = `textentry; result["opt"] = [`notify]; result["init"] = InitFtpDirLocal; @@ -798,7 +798,7 @@ map<string,any> CertFile () { map<string,any> result = $[]; - result["label"] = _("D&SA Certificate to Use for SSL Encrypted Connections"); + result["label"] = _("D&SA Certificate to Use for SSL-encrypted Connections"); result["widget"] = `textentry; result["init"] = InitCertFile; result["validate_type"] = `function; @@ -908,7 +908,7 @@ `VStretch () ); // TRANSLATORS: part of dialog caption - result["caption"] = _("FTP Start-Up"); + result["caption"] = _("FTP Start-up"); // TRANSLATORS: tree menu item result["tree_item_label"] = _("Start-Up"); result["widget_names"] = ["StartMode", "StartStop", "RBVsPureFTPd", "StartStopRestart"]; 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-ftp-server-2.21.1/src/ftp-server.ycp new/yast2-ftp-server-2.22.0/src/ftp-server.ycp --- old/yast2-ftp-server-2.21.1/src/ftp-server.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/ftp-server.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -44,14 +44,14 @@ //start-up settings CommandLine::PrintNoCR(_("Start-Up:")); if (GetStartedViaXinetd ()) { - CommandLine::Print(_("Ftp daemon is started via xinetd")); + CommandLine::Print(_("FTP daemon is started via xinetd.")); } else { if (GetEnableService()) { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("Ftp daemon is enabled in the boot process")); + CommandLine::Print(_("FTP daemon is enabled in the boot process.")); } else { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("Ftp daemon needs manual starting")); + CommandLine::Print(_("FTP daemon needs manual starting.")); } } //logging settings @@ -80,7 +80,7 @@ CommandLine::Print(FtpServer::EDIT_SETTINGS["UmaskAnon"]:nil); } else { CommandLine::PrintNoCR(_("Umask for Anonymous:")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } if (FtpServer::EDIT_SETTINGS["UmaskLocal"]:nil != "") { CommandLine::PrintNoCR(_("Umask for Authenticated Users: ")); @@ -88,7 +88,7 @@ //CommandLine::Print(""); } else { CommandLine::PrintNoCR(_("Umask for Authenticated Users: ")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); //CommandLine::Print(""); } } else { @@ -98,7 +98,7 @@ //CommandLine::Print(""); } else { CommandLine::PrintNoCR(_("Umask: ")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); //CommandLine::Print(""); } } // end of if (FtpServer::vsftpd_edit) @@ -109,7 +109,7 @@ if (FtpServer::EDIT_SETTINGS["FtpDirLocal"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["FtpDirLocal"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } @@ -119,7 +119,7 @@ if (FtpServer::EDIT_SETTINGS["FtpDirAnon"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["FtpDirAnon"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // port range CommandLine::PrintNoCR(_("Port Range: ")); @@ -128,7 +128,7 @@ CommandLine::PrintNoCR(_(" - ")); CommandLine::Print(FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // idle time @@ -136,7 +136,7 @@ if (FtpServer::EDIT_SETTINGS["MaxIdleTime"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxIdleTime"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // maximum clients per IP @@ -144,7 +144,7 @@ if (FtpServer::EDIT_SETTINGS["MaxClientsPerIP"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxClientsPerIP"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // maximum clients @@ -152,7 +152,7 @@ if (FtpServer::EDIT_SETTINGS["MaxClientsNumber"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxClientsNumber"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // max rate for authenticated users @@ -160,7 +160,7 @@ if (FtpServer::EDIT_SETTINGS["LocalMaxRate"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["LocalMaxRate"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // max rate for anonymous users @@ -168,7 +168,7 @@ if (FtpServer::EDIT_SETTINGS["AnonMaxRate"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["AnonMaxRate"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // general settings for access @@ -180,7 +180,7 @@ } else if (FtpServer::EDIT_SETTINGS["AnonAuthen"]:nil == "0") { CommandLine::Print(_("Anonymous and Authenticated Users")); } else { - CommandLine::Print(_("Option has wrong value!")); + CommandLine::Print(_("Option has wrong value.")); } // access permissions for anonymous users @@ -202,7 +202,7 @@ if (FtpServer::EDIT_SETTINGS["Banner"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["Banner"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } //CommandLine::PrintNoCR(_("Security settings: ")); @@ -266,7 +266,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Enabling ftp daemon in the boot process...")); + CommandLine::Print(_("Enabling FTP daemon in the boot process...")); CommandLine::Print(""); SetEnableService(true); } else if (options["manual"]:nil!=nil) { @@ -275,7 +275,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Removing ftp daemon from the boot process...")); + CommandLine::Print(_("Removing FTP daemon from the boot process...")); CommandLine::Print(""); SetEnableService(false); } else if (options["xinetd"]:nil!=nil) { @@ -284,7 +284,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Start ftp daemon via xinetd")); + CommandLine::Print(_("Start FTP daemon via xinetd")); CommandLine::Print(""); SetStartedViaXinetd(true); if (options["startxinetd"]:nil == nil) { @@ -341,12 +341,12 @@ FtpServer::EDIT_SETTINGS["UmaskAnon"] = temp[0]:nil; FtpServer::EDIT_SETTINGS["UmaskLocal"] = temp[1]:nil; } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <local users>:<anonymous> (177:077)")); CommandLine::Print(""); } } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <local users>:<anonymous> (177:077)")); CommandLine::Print(""); } @@ -362,7 +362,7 @@ CommandLine::Print(""); FtpServer::EDIT_SETTINGS["Umask"] = value; } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <files>:<dirs> (set_umask=177:077)")); CommandLine::Print(""); } @@ -442,12 +442,12 @@ CommandLine::Print(""); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Please enter minimal port < maximal port.")); + CommandLine::Error(_("Enter minimal port < maximal port.")); CommandLine::Print(""); } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Please enter correct numbers.")); + CommandLine::Error(_("Enter correct numbers.")); CommandLine::Print(""); } } else { @@ -480,7 +480,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); return false; } @@ -542,7 +542,7 @@ CommandLine::Print(""); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); return false; } @@ -571,7 +571,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 or 2 parameters are allowed.")); + CommandLine::Error(_("Only one or two parameters are allowed.")); CommandLine::Print(""); return false; } @@ -602,7 +602,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); CommandLine::Print(_("Example of correct input: welcome_message=\"Hello everybody\"")); CommandLine::Print(""); @@ -645,13 +645,13 @@ } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong option!")); + CommandLine::Error(_("Wrong option.")); CommandLine::Print(""); return false; } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); name_option_EDIT_SETTINGS = "Example of correct using: " + name_option_EDIT_SETTINGS + " enable/disable"; CommandLine::Print(name_option_EDIT_SETTINGS); @@ -716,13 +716,13 @@ } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong option!")); + CommandLine::Error(_("Wrong option.")); CommandLine::Print(""); return false; } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); CommandLine::Print(_("Example of correct input: SSL_TLS enable/disable/only")); CommandLine::Print(""); @@ -734,7 +734,7 @@ map cmdline_description = $[ "id" : "ftp-server", /* Command line help text for the Xftpd module */ - "help" : _("Configuration of ftp server"), + "help" : _("Configuration of FTP server"), "guihandler" : FtpdSequence, "initialize" : FtpServer::Read, "finish" : FtpServer::Write, @@ -800,7 +800,7 @@ "authen_dir" : $[ "handler" : FTPdCMDAuthenDir, // TRANSLATORS: CommandLine help - "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)"), + "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)."), "example" : [ "authen_dir set_authen_dir=/srv/ftp", ], @@ -863,7 +863,7 @@ "access" : $[ "handler" : FTPdCMDAccess, // TRANSLATORS: CommandLine help - "help" : _("The access permissions"), + "help" : _("Access permissions"), "example" : [ "access anon_only", "access authen_only", @@ -874,7 +874,7 @@ "anon_access" : $[ "handler" : FTPdCMDAnonAccess, // TRANSLATORS: CommandLine help - "help" : _("The access permissions for anonymous users"), + "help" : _("Access permissions for anonymous users"), "example" : [ "access anon_only", "access authen_only", @@ -886,7 +886,7 @@ "welcome_message" : $[ "handler" : FTPdCMDWelMessage, // TRANSLATORS: CommandLine help - "help" : _("Welcome message is text to display when someone connects to the server (vsftpd only)"), + "help" : _("Welcome message is the text to display when someone connects to the server (vsftpd only)."), "example" : [ "welcome_message=\"hello everybody\"", ], @@ -896,7 +896,7 @@ "SSL" : $[ "handler" : FTPdCMDSSL, // TRANSLATORS: CommandLine help - "help" : _("vsftpd support secure connections via SSL (vsftpd only)"), + "help" : _("vsftpd supports secure connections via SSL (vsftpd only)."), "example" : [ "SSL enable", "SSL disable", @@ -907,7 +907,7 @@ "SSLv2" : $[ "handler" : FTPdCMDSSLv2, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)."), "example" : [ "SSLv2 enable", "SSLv2 disable", @@ -918,7 +918,7 @@ "SSLv3" : $[ "handler" : FTPdCMDSSLv3, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)."), "example" : [ "SSLv3 enable", "SSLv3 disable", @@ -929,7 +929,7 @@ "TLS" : $[ "handler" : FTPdCMDTLS, // TRANSLATORS: CommandLine help - "help" : _("vsftpd support connections via TLS (vsftpd only)"), + "help" : _("vsftpd supports connections via TLS (vsftpd only)."), "example" : [ "TLS enable", "TLS disable", @@ -941,7 +941,7 @@ "antiwarez" : $[ "handler" : FTPdCMDAntiwarez, // TRANSLATORS: CommandLine help - "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)"), + "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)."), "example" : [ "antiwarez enable", "antiwarez disable", @@ -972,19 +972,19 @@ "options" : $[ "atboot" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon in the boot process"), + "help" : _("Start FTP daemon in the boot process."), ], "manual" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon manually"), + "help" : _("Start FTP daemon manually."), ], "xinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon via xinetd"), + "help" : _("Start FTP daemon via xinetd"), ], "startxinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start xinetd if it is not running"), + "help" : _("Start xinetd if it is not running."), ], "enable": $[ @@ -1018,19 +1018,19 @@ "set_min_port":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The minimum value for port range for passive connection replies."), + "help" : _("The minimum value for port range for passive connection replies"), ], "set_max_port":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum value for port range for passive connection replies."), + "help" : _("The maximum value for port range for passive connection replies"), ], "set_idle_time":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("Maximum Idle Time (in minutes)."), + "help" : _("Maximum Idle Time (in minutes)"), ], @@ -1044,7 +1044,7 @@ "set_max_rate":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum data transfer rate for ftp users (KB/s)."), + "help" : _("The maximum data transfer rate for ftp users (KB/s)"), ], "anon_only": $[ @@ -1064,18 +1064,18 @@ "can_upload": $[ // TRANSLATORS: CommandLine help - "help" : _("Anonymous users can upload"), + "help" : _("Anonymous users can upload."), ], "create_dirs": $[ // TRANSLATORS: CommandLine help - "help" : _("Anonymous users can create directories"), + "help" : _("Anonymous users can create directories."), ], //only vsftd "set_message": $[ "type" : "string", // TRANSLATORS: CommandLine help - "help" : _("Welcome message is text to display when someone connects to the server"), + "help" : _("Welcome message is the text to display when someone connects to the server."), ], //only vsftd @@ -1093,7 +1093,7 @@ //only vsftd "only": $[ // TRANSLATORS: CommandLine help - "help" : _("Refuse connections that do not use SSL/TLS security mechanisms"), + "help" : _("Refuse connections that do not use SSL/TLS security mechanisms."), ], 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-ftp-server-2.21.1/src/helps.ycp new/yast2-ftp-server-2.22.0/src/helps.ycp --- old/yast2-ftp-server-2.21.1/src/helps.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/helps.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -18,7 +18,7 @@ /* Read dialog help 1/2 */ "read" : _("<big>Initializing FTP Server Configuration</big> -Please wait... + ") + /* Read dialog help 2/2 */ @@ -28,7 +28,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving FTP Server Configuration</big> -Please wait... + ") + @@ -47,9 +47,10 @@ /*Start widget switching daemons help 1/1 */ "selected_services": _("Selected Service - Frame shows which daemon is currently configured: vsftpd, pure-ftpd, + The frame shows which daemon is currently configured: vsftpd, pure-ftpd, . If you have installed both daemons you can switch between them. -"), + +"), /** *-----------================= GENERAL SCREEN =============---------- @@ -58,7 +59,7 @@ /* general welcome message help 1/1 */ "Banner": _("Welcome Message -This option is the name of a file containing +Specify the name of a file containing the text to display when someone connects to the server. "), @@ -69,14 +70,14 @@ When enabled, local users will be (by default) placed in a chroot() jail in their home directory after login. Warning: This option has security implications, -especially if the users have upload permission, -or shell access. Only enable if you know what you are doing. +especially if users have upload permission +or shell access. Only enable Chroot if you know what you are doing. "), /* general logging help 1/1 */ "VerboseLogging": _("Verbose Logging -When enabled, all ftp requests and responses are logged. +When enabled, all FTP requests and responses are logged. "), @@ -89,7 +90,7 @@ /* general umask for anonymous help - only vsftpd 1/1 */ "UmaskAnon": _("Umask for Anonymous: -The value that the umask for file creation is set to for anonymous users. +The value to which the umask for file creation is set for anonymous users. If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. @@ -97,7 +98,7 @@ /* general umask for authenticated users help - only vsftpd 1/1 */ "UmaskLocal": _("Umask for Authenticated Users: -The value that the umask for file creation is set to for authenticated users. +The value to which the umask for file creation is set for authenticated users. If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. @@ -105,16 +106,16 @@ /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("FTP Directory for Anonymous Users: -Here you can specify a directory which is used for ftp anonymous users. -By pressing Browse you can select a directory from the local filesystem. +Specify a directory which is used for FTP anonymous users. +Press Browse to select a directory from the local filesystem. "), /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("FTP Directory for Authenticated Users: -You can specify a directory which is used for ftp authenticated users. -By pressing Browse you can select a directory from the local filesystem. +Specify a directory which is used for FTP authenticated users. +Press Browse to select a directory from the local filesystem. "), @@ -127,22 +128,24 @@ /* performance Max Idle Time help 1/1 */ "MaxIdleTime": _("Max Idle Time: The maximum time (timeout) a remote client -may spend between ftp commands. +may wait between FTP commands. "), /* performance max clients per IP help 1/1 */ "MaxClientsPerIP": _("Max Clients for One IP: -This is the maximum number of clients which may be connected +The maximum number of clients allowed to connect from the same source internet address. -"), + +"), /* performance max clients help 1/1 */ "MaxClientsNumber": _("Max Clients: -This is the maximum number of clients which may be connected. -Any additional clients connecting will get an error message. -"), +The maximum number of clients allowed to connect. +Any additional clients trying to connect will get an error message. + +"), /* performance local max rate help 1/1 */ "LocalMaxRate": _("Local Max Rate: @@ -163,16 +166,16 @@ /* authentication Enable/Disable Anonymous and Local help 1/1 */ "AnonAuthen": _("Enable/Disable Anonymous and Local Users -Anonymous Only If enabled only anonymous logins are permitted. -Authenticated Users Only If enabled only authenticated users are permitted. -Both If enabled authenticated users and anonymous users are permitted. +Anonymous Only: If enabled, only anonymous logins are permitted. +Authenticated Users Only: If enabled, only authenticated users are permitted. +Both If enabled, authenticated users and anonymous users are permitted. "), /* authentication Enable Upload help 1/1 */ "EnableUpload": _("Enable Upload -If enabled ftp users can upload. To allow anonymous users -to upload enable Anonymous Can Upload +If enabled, FTP users can upload. To allow anonymous users +to upload, enable Anonymous Can Upload. "), @@ -187,9 +190,9 @@ /* authentication Anonymous Can Create Dirs help 1/1 */ "AnonCreatDirs": _("Anonymous Can Create Dirs -If enabled anonymous users can create directories. -vsftpd only: If you want that anonymous users can create directories you -need existing directory with allowed writing in home directory after login. +If enabled, anonymous users can create directories. +vsftpd only: If you want to allow anonymous users to create directories, +you need an existing directory with write permission in the home directory after login. "), @@ -201,7 +204,7 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("Enable Passive Mode -If enabled the ftp server will allow passive mode for connections. +If enabled, the FTP server will allow passive mode for connections. "), @@ -221,36 +224,41 @@ /* expert settings Enable SSL help 1/1 */ "SSLEnable": _("Enable SSL -If enabled SSL connections are allowed. -"), +If enabled, SSL connections are allowed. + +"), /* expert settings Enable SSL v2 help 1/1 */ "SSLv2": _("Enable SSL v2 -If enabled SSL version 2 connections are allowed. -"), +If enabled, SSL version 2 connections are allowed. + +"), /* expert settings Enable SSL v3 help 1/1 */ "SSLv3": _("Enable SSL v3 -If enabled SSL version 3 connections are allowed. -"), +If enabled, SSL version 3 connections are allowed. + +"), /* expert settings Enable TLS help 1/1 */ "TLS": _("Enable TLS -If enabled TLS connections are allowed. -"), +If enabled, TLS connections are allowed. + +"), /* expert settings DSA Certificate to Use for SSL Encrypted Connections help 1/1 */ -"CertFile": _("DSA Certificate to Use for SSL Encrypted Connections +"CertFile": _("DSA Certificate to Use for SSL-encrypted Connections This option specifies the location of the DSA certificate to -use for SSL encrypted connections. You can select a file by pressing Browse +use for SSL-encrypted connections. Select a file by pressing Browse. "), /* expert settings Disable Downloading Unvalidated Data help 1/1 */ "AntiWarez": _("Disable Downloading Unvalidated Data Disallow downloading of files that were uploaded -but not validated by a local admin -"), +but not validated by a local admin. + +"), /* expert settings Security Settings help 1/1 */ @@ -268,13 +276,13 @@ /* Summary dialog help 1/3 */ "summary" : _("<big>FTP Server Configuration</big> -Configure the ftp server here. +Configure the FTP server. ")+ /* Summary dialog help 2/3 */ _("<big>Adding an FTP Server:</big> -Choose an ftp server from the list of detected ftp servers. -If your ftp server was not detected, use Other (not detected). +Choose an FTP server from the list of detected FTP servers. +If your FTP server was not detected, use Other (not detected). Then press Configure. ") + @@ -286,19 +294,20 @@ /* Ovreview dialog help 1/3 */ "overview" : _("<big>FTP Server Configuration Overview</big> -Obtain an overview of the installed ftp servers. Additionally, +Obtain an overview of the installed FTP servers. Additionally, edit their configurations. ") + /* Ovreview dialog help 2/3 */ _("<big>Adding a FTP Server</big> -Press Add to configure a ftp server. +Press Add to configure a FTP server. ") + /* Ovreview dialog help 3/3 */ _("<big>Editing or Deleting</big> -Choose a ftp server to change or remove. -Then press Edit or Delete, respectively.\n"), +Choose a FTP server to change or remove. +Then press Edit or Delete respectively. +"), ]; 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-ftp-server-2.21.1/src/wid_functions.ycp new/yast2-ftp-server-2.22.0/src/wid_functions.ycp --- old/yast2-ftp-server-2.21.1/src/wid_functions.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/wid_functions.ycp 2012-03-29 14:56:09.000000000 +0200 @@ -172,7 +172,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::vsftp_xinetd_running = true; FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -207,7 +207,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -247,7 +247,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::vsftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -292,7 +292,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::pure_ftp_xinetd_running = true; FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -328,7 +328,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -366,7 +366,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::pure_ftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -445,14 +445,14 @@ void InitStartStopRestart (string key) { if ((FtpServer::pure_ftp_xinetd_running) && (!FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } if ((FtpServer::vsftp_xinetd_running) && (FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } @@ -677,7 +677,7 @@ symbol HandleBrowseAnon (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseAnon") { - string val = UI::AskForExistingDirectory ("/",_("Please select directory...")); + string val = UI::AskForExistingDirectory ("/",_("Select directory")); UI::ChangeWidget(`id( "FtpDirAnon" ), `Value, val); } return nil; @@ -708,7 +708,7 @@ symbol HandleBrowseLocal (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseLocal") { - string val = UI::AskForExistingDirectory ("/",_("Please select directory...")); + string val = UI::AskForExistingDirectory ("/",_("Select directory")); UI::ChangeWidget(`id( "FtpDirLocal" ), `Value, val); } return nil; @@ -915,7 +915,7 @@ yesno_question = _("Do you want to change permissions for ") + FtpServer::anon_homedir +_("Upload (allow writing)?"); - yesno_comment = _("If you want anonymous users to be able to upload, you need a directory with write access. + yesno_comment = _("To allow anonymous users to upload, you need a directory with write access. "); yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); @@ -928,7 +928,7 @@ if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { yesno_question = _("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); - yesno_comment = _("If you want anonymous users to be able to create directories, + yesno_comment = _("If you want to allow anonymous users to create directories, you have to create a directory with write access. "); @@ -1364,7 +1364,7 @@ symbol HandleBrowseCertFile (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseCertFile") { - string val = UI::AskForExistingFile ("/","*.*",_("Please Select File")); + string val = UI::AskForExistingFile ("/","*.*",_("Select File")); UI::ChangeWidget(`id( "CertFile" ), `Value, val); } } 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-ftp-server-2.21.1/src/write_load.ycp new/yast2-ftp-server-2.22.0/src/write_load.ycp --- old/yast2-ftp-server-2.21.1/src/write_load.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/write_load.ycp 2011-12-08 10:47:08.000000000 +0100 @@ -55,6 +55,11 @@ y2milestone("----------------------------------------------------"); //bnc#597842 Yast2-ftp-server module losses the chroot everyone (chroot-local-user) setting + //the problem appears to be that after vsftpd settings are parsed, + //the correct values are overwritten by parsing the (meaningless) + //settings for pure-ftpd. + + if ((FtpServer::vsftpd_edit) || (size(pure_ftpd_xinet_conf) == 0)) { y2milestone("skip SettingsXinetdPure() -> vsftpd is used or pure_ftpd_xinet_conf is empty"); -- 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-firstboot for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at 2012-03-30 14:21:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old) and /work/SRC/openSUSE:Factory/.yast2-firstboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-firstboot", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes 2012-01-17 16:17:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-firstboot.new/yast2-firstboot.changes 2012-03-30 14:21:06.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 14:47:01 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- 2.22.1 + +------------------------------------------------------------------- Old: ---- yast2-firstboot-2.22.0.tar.bz2 New: ---- yast2-firstboot-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.QTsY5m/_old 2012-03-30 14:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.QTsY5m/_new 2012-03-30 14:21:07.000000000 +0200 @@ -16,17 +16,21 @@ # - Name: yast2-firstboot -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-firstboot-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0 -BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-xml +BuildRequires: docbook-xsl-stylesheets +BuildRequires: libxslt +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite +BuildRequires: yast2-xml # Internet.ycp moved to yast2.rpm BuildRequires: yast2 >= 2.16.6 # Installation startup scripts @@ -43,6 +47,8 @@ BuildArch: noarch Summary: YaST2 - Initial System Configuration +License: GPL-2.0 +Group: System/YaST PreReq: %fillup_prereq %description ++++++ yast2-firstboot-2.22.0.tar.bz2 -> yast2-firstboot-2.22.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/VERSION new/yast2-firstboot-2.22.1/VERSION --- old/yast2-firstboot-2.22.0/VERSION 2012-01-13 09:46:54.000000000 +0100 +++ new/yast2-firstboot-2.22.1/VERSION 2012-03-29 14:47:08.000000000 +0200 @@ -1 +1 @@ -2.22.0 +2.22.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/Firstboot.ycp new/yast2-firstboot-2.22.1/src/Firstboot.ycp --- old/yast2-firstboot-2.22.0/src/Firstboot.ycp 2012-01-13 09:45:29.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/Firstboot.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Firstboot settings, input and output functions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Firstboot.ycp 57876 2009-07-07 08:09:35Z jsuchome $ + * $Id: Firstboot.ycp 67176 2012-01-13 10:16:38Z jsuchome $ * * Representation of the configuration of firstboot. * Input and output routines. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot.ycp new/yast2-firstboot-2.22.1/src/firstboot.ycp --- old/yast2-firstboot-2.22.0/src/firstboot.ycp 2012-01-13 09:45:23.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -21,7 +21,7 @@ /** * Maintainer: Jiri Srain <jsrain(a)suse.cz> * - * $Id: firstboot.ycp 57876 2009-07-07 08:09:35Z jsuchome $ + * $Id: firstboot.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { textdomain "firstboot"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_auto.ycp new/yast2-firstboot-2.22.1/src/firstboot_auto.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_auto.ycp 2012-01-13 09:44:37.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_auto.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -65,7 +65,8 @@ // text label, describing the check box meaning // keep in 2 lines with roughly the same length _("Check Enable Firstboot Sequence here to start YaST -firstboot utility on the first boot after configuration")), +firstboot utility on the first boot after configuration. +")), `VSpacing (), // check box label `CheckBox (`id (`enable), _("Enable Firstboot Sequence"), @@ -74,7 +75,8 @@ Wizard::CreateDialog(); // help text Wizard::SetContentsButtons (caption, contents, _("Check Enable Firstboot Sequence to start YaST firstboot utility on the first boot after configuration. -Check the documentation of yast2-firstboot module to find out more."), +Check the documentation of yast2-firstboot module for further information. +"), Label::BackButton(), Label::NextButton()); ret = UI::UserInput (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_desktop.ycp new/yast2-firstboot-2.22.1/src/firstboot_desktop.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_desktop.ycp 2012-01-13 09:44:46.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_desktop.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Firstboot Desktop Selection * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: firstboot_desktop.ycp 65961 2011-09-23 09:49:16Z lslezak $ + * $Id: firstboot_desktop.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { textdomain "firstboot"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_finish.ycp new/yast2-firstboot-2.22.1/src/firstboot_finish.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_finish.ycp 2012-01-13 09:44:48.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_finish.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -26,7 +26,7 @@ * * Display a nice congratulation message for the user. * - * $Id: firstboot_finish.ycp 62742 2010-11-03 16:09:56Z jsuchome $ + * $Id: firstboot_finish.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_keyboard.ycp new/yast2-firstboot-2.22.1/src/firstboot_keyboard.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_keyboard.ycp 2012-01-13 09:44:50.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_keyboard.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -23,7 +23,7 @@ * Author : Jiri Suchomel <jsuchome(a)suse.cz> * Purpose : Firstboot configuratiuon of keyboard * - * $Id: firstboot_keyboard.ycp 60169 2009-12-22 12:27:28Z jsuchome $ + * $Id: firstboot_keyboard.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { textdomain "country"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_language.ycp new/yast2-firstboot-2.22.1/src/firstboot_language.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_language.ycp 2012-01-13 09:44:55.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_language.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -32,7 +32,7 @@ * Modify: * * - * $Id: firstboot_language.ycp 62746 2010-11-03 16:12:56Z jsuchome $ + * $Id: firstboot_language.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_language_keyboard.ycp new/yast2-firstboot-2.22.1/src/firstboot_language_keyboard.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_language_keyboard.ycp 2012-01-13 09:44:52.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_language_keyboard.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -32,7 +32,7 @@ * Summary: * This client shows dialog for choosing the language and keyboard layout * - * $Id: firstboot_language_keyboard.ycp 62746 2010-11-03 16:12:56Z jsuchome $ + * $Id: firstboot_language_keyboard.ycp 67176 2012-01-13 10:16:38Z jsuchome $ * */ { @@ -106,8 +106,8 @@ // help text for firstboot language + keyboard screen string help_text = _(" -Choose the Language and the Keyboard layout to be used during -configuration and for the installed system. +Choose the Language and the Keyboard Layout to be used during +configuration and in the installed system. ") + // help text, continued diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_license.ycp new/yast2-firstboot-2.22.1/src/firstboot_license.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_license.ycp 2012-01-13 09:45:02.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_license.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -24,7 +24,7 @@ * Author : Ladislav Slezak <lslezak(a)suse.cz>, * Purpose : Display vendor license during firstboot configuration * - * $Id: firstboot_license.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: firstboot_license.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_license_novell.ycp new/yast2-firstboot-2.22.1/src/firstboot_license_novell.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_license_novell.ycp 2012-01-13 09:44:57.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_license_novell.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -23,7 +23,7 @@ * Authors: Ladislav Slezak <lslezak(a)suse.cz>, Jiri Suchomel <jsuchome(a)suse.cz> * Purpose: Display Novell license at the start of firstboot * - * $Id: firstboot_license_novell.ycp 49092 2008-07-15 10:49:23Z jsuchome $ + * $Id: firstboot_license_novell.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_licenses.ycp new/yast2-firstboot-2.22.1/src/firstboot_licenses.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_licenses.ycp 2012-01-13 09:45:00.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_licenses.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -21,7 +21,7 @@ /* * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration * - * $Id: firstboot_licenses.ycp 60274 2010-01-07 14:27:42Z jsuchome $ + * $Id: firstboot_licenses.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_network_write.ycp new/yast2-firstboot-2.22.1/src/firstboot_network_write.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_network_write.ycp 2012-01-13 09:45:05.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_network_write.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -23,7 +23,7 @@ * Author : Jiri Suchomel <jsuchome(a)suse.cz> * Purpose : Save network configuration * (usable when network proposal was not run) - * $Id: firstboot_network_write.ycp 41480 2007-10-19 10:34:35Z jsuchome $ + * $Id: firstboot_network_write.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { // currently only restart the service, may be enhanced later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_ssh.ycp new/yast2-firstboot-2.22.1/src/firstboot_ssh.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_ssh.ycp 2012-01-13 09:45:12.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_ssh.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -31,7 +31,7 @@ * * * - * $Id: firstboot_ssh.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: firstboot_ssh.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_timezone.ycp new/yast2-firstboot-2.22.1/src/firstboot_timezone.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_timezone.ycp 2012-01-13 09:45:16.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_timezone.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -32,7 +32,7 @@ * Modify: * * - * $Id: firstboot_timezone.ycp 24841 2005-08-12 07:47:00Z jsrain $ + * $Id: firstboot_timezone.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_welcome.ycp new/yast2-firstboot-2.22.1/src/firstboot_welcome.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_welcome.ycp 2012-01-13 09:45:18.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_welcome.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -31,7 +31,7 @@ * * * - * $Id: firstboot_welcome.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: firstboot_welcome.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/firstboot_write.ycp new/yast2-firstboot-2.22.1/src/firstboot_write.ycp --- old/yast2-firstboot-2.22.0/src/firstboot_write.ycp 2012-01-13 09:45:21.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/firstboot_write.ycp 2012-03-29 14:46:51.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Finish Firstboot * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: firstboot_write.ycp 60303 2010-01-11 09:10:48Z jsuchome $ + * $Id: firstboot_write.ycp 67176 2012-01-13 10:16:38Z jsuchome $ */ { textdomain "firstboot"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.22.0/src/routines.ycp new/yast2-firstboot-2.22.1/src/routines.ycp --- old/yast2-firstboot-2.22.0/src/routines.ycp 2012-01-13 09:45:36.000000000 +0100 +++ new/yast2-firstboot-2.22.1/src/routines.ycp 2012-01-13 11:16:40.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Routines * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: routines.ycp 24841 2005-08-12 07:47:00Z jsrain $ + * $Id: routines.ycp 67176 2012-01-13 10:16:38Z jsuchome $ * */ -- 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-fingerprint-reader for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package yast2-fingerprint-reader for openSUSE:Factory checked in at 2012-03-30 14:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fingerprint-reader (Old) and /work/SRC/openSUSE:Factory/.yast2-fingerprint-reader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fingerprint-reader", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2012-03-20 17:48:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-fingerprint-reader.new/yast2-fingerprint-reader.changes 2012-03-30 14:21:03.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 14:40:12 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts +- 2.22.2 + +------------------------------------------------------------------- Old: ---- yast2-fingerprint-reader-2.22.1.tar.bz2 New: ---- yast2-fingerprint-reader-2.22.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fingerprint-reader.spec ++++++ --- /var/tmp/diff_new_pack.E3AXa6/_old 2012-03-30 14:21:04.000000000 +0200 +++ /var/tmp/diff_new_pack.E3AXa6/_new 2012-03-30 14:21:04.000000000 +0200 @@ -16,24 +16,34 @@ # - Name: yast2-fingerprint-reader -Version: 2.22.1 +Version: 2.22.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-fingerprint-reader-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0 -Requires: yast2-pam Requires: yast2 >= 2.21.22 -BuildRequires: libfprint-devel libfprint0 libtool libusb-devel -BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-pam yast2-testsuite +Requires: yast2-pam +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libfprint-devel +BuildRequires: libfprint0 +BuildRequires: libtool +BuildRequires: libusb-devel +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools +BuildRequires: yast2-pam +BuildRequires: yast2-testsuite Conflicts: yast2-hardware-detection < 2.15.7 Summary: YaST2 - Fingerprint Reader Configuration +License: GPL-2.0 +Group: System/YaST %description YaST module for configuration of fingerprint authentication using the ++++++ yast2-fingerprint-reader-2.22.1.tar.bz2 -> yast2-fingerprint-reader-2.22.2.tar.bz2 ++++++ ++++ 16827 lines of diff (skipped) -- 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-dhcp-server for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2012-03-30 14:20:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-dhcp-server", Maintainer is "jsrain(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2011-10-04 18:00:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes 2012-03-30 14:20:59.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 14:28:18 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-2.21.2.tar.bz2 New: ---- yast2-dhcp-server-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.uqr0P7/_old 2012-03-30 14:21:00.000000000 +0200 +++ /var/tmp/diff_new_pack.uqr0P7/_new 2012-03-30 14:21:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-dhcp-server # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,23 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-dhcp-server -Version: 2.21.2 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dhcp-server-2.21.2.tar.bz2 - -Prefix: /usr +Source0: yast2-dhcp-server-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite - -Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: libxslt +BuildRequires: perl-Digest-SHA1 +BuildRequires: perl-X500-DN +BuildRequires: perl-XML-Writer +BuildRequires: popt-devel +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-dns-server +BuildRequires: yast2-perl-bindings +BuildRequires: yast2-testsuite + +Requires: bind-utils +Requires: perl-Digest-SHA1 +Requires: perl-Parse-RecDescent +Requires: perl-X500-DN +Requires: perl-gettext +Requires: yast2-ldap +Requires: yast2-perl-bindings # Address::CheckMAC && Address::ValidMAC (2.13.73) # Punycode # Wizard::SetDesktopTitleAndIcon @@ -42,32 +55,33 @@ BuildArch: noarch Summary: YaST2 - DHCP Server Configuration +License: GPL-2.0 +Group: System/YaST %description This package contains the YaST2 component for DHCP server configuration. %prep -%setup -n yast2-dhcp-server-2.21.2 +%setup -n yast2-dhcp-server-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -82,11 +96,11 @@ /usr/share/YaST2/clients/dhcp-server.ycp /usr/share/YaST2/clients/dhcp-server_*.ycp /usr/share/YaST2/modules/* -%{prefix}/share/applications/YaST2/dhcp-server.desktop +%{_prefix}/share/applications/YaST2/dhcp-server.desktop /usr/share/YaST2/scrconf/cfg_dhcpd.scr /usr/share/YaST2/scrconf/etc_dhcpd_conf.scr /usr/lib/YaST2/servers_non_y2/ag_dhcpd_conf -%doc %{prefix}/share/doc/packages/yast2-dhcp-server +%doc %{_prefix}/share/doc/packages/yast2-dhcp-server /usr/share/YaST2/schema/autoyast/rnc/dhcp-server.rnc %changelog ++++++ yast2-dhcp-server-2.21.2.tar.bz2 -> yast2-dhcp-server-2.22.0.tar.bz2 ++++++ ++++ 5097 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-dhcp-server-2.21.2/Makefile.am new/yast2-dhcp-server-2.22.0/Makefile.am --- old/yast2-dhcp-server-2.21.2/Makefile.am 2011-09-26 13:09:45.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/Makefile.am 2012-03-29 14:29:53.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) 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) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(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-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) 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-dhcp-server-2.21.2/VERSION new/yast2-dhcp-server-2.22.0/VERSION --- old/yast2-dhcp-server-2.21.2/VERSION 2011-09-26 13:11:33.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/VERSION 2012-03-29 14:28:36.000000000 +0200 @@ -1 +1 @@ -2.21.2 +2.22.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-dhcp-server-2.21.2/configure.in new/yast2-dhcp-server-2.22.0/configure.in --- old/yast2-dhcp-server-2.21.2/configure.in 2011-09-26 13:09:45.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/configure.in 2012-03-29 14:29:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-dhcp-server dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dhcp-server, 2.21.1, http://bugs.opensuse.org/, yast2-dhcp-server) +AC_INIT(yast2-dhcp-server, 2.22.0, http://bugs.opensuse.org/, yast2-dhcp-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.21.1" +VERSION="2.22.0" RPMNAME="yast2-dhcp-server" MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" 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-dhcp-server-2.21.2/src/dialogs2.ycp new/yast2-dhcp-server-2.22.0/src/dialogs2.ycp --- old/yast2-dhcp-server-2.21.2/src/dialogs2.ycp 2011-09-26 13:08:49.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dialogs2.ycp 2012-03-29 14:28:13.000000000 +0200 @@ -274,7 +274,7 @@ if (size(configured_interfaces) <= 0) { // TRANSLATORS: popup error, DHCP Server requires selected interface to have // at least minimal configuration - return Popup::ContinueCancel(_("The selected network interface has currently no configuration (no assigned IP address + return Popup::ContinueCancel(_("The selected network interface is not configured (no assigned IP address and netmask). Using it in the DHCP server configuration may not work. Really use this interface? ")); @@ -1663,9 +1663,9 @@ UI::SetFocus(`id("other_opts")); correct = (Popup::ContinueCancel(sformat(_("You have specified an alternate configuration file for the DHCP server. -This is not supported by YaST, as the DHCP server module can only read and write -/etc/dhcpd.conf. The new configuration from %1 will not be imported and all changes -will be saved to the default configuration file. +YaST does not supported this. The DHCP server module can only read and write +/etc/dhcpd.conf. The new configuration from %1 will not be imported. All +changes will be saved to the default configuration file. Really continue? "), v))); @@ -1880,7 +1880,7 @@ ], "other_options" : $[ "widget" : `custom, - "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-Up Arguments")), + "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-up Arguments")), "init" : OtherOptionsInit, "validate_type" : `function, "validate_function" : OtherOptionsValidate, 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-dhcp-server-2.21.2/src/dns-helps.ycp new/yast2-dhcp-server-2.22.0/src/dns-helps.ycp --- old/yast2-dhcp-server-2.21.2/src/dns-helps.ycp 2011-09-26 13:08:49.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-helps.ycp 2012-03-29 14:28:13.000000000 +0200 @@ -19,7 +19,7 @@ First IP Address defines the starting address of the range and Last IP Address defines the last one. Hostname Base is a string that determines how hostnames -should be created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>). +are created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>). <tt>%i</tt> is replaced with the number of the host in the range. If no <tt>%i</tt> is defined, the number is added at the end of the string. <tt>%i</tt> can be used only once in Hostname Base. @@ -30,15 +30,16 @@ map <string, string> DNS_HELPS = $[ // TRANSLATORS: DNS Wizard - step 1 (part 1) "wizard-zones" : _("<big>DNS Wizard</big> -This wizard helps you create a new DNS zone +In this wizard, create a new DNS zone directly from the DHCP server configuration. This DNS zone is important -if you also want to identify your DHCP clients by hostname. The DNS zone -translates names to the IP addresses assigned to them. You can also -create a reverse zone that translates IP addresses to names.\n") + +if you want to identify your DHCP clients by hostname. The DNS zone +translates names to the assigned IP addresses. You can also +create a reverse zone that translates IP addresses to names. +") + // TRANSLATORS: DNS Wizard - step 1 (part 2) _("New Zone Name or Reverse Zone Name -are taken from your current DHCP server and network settings and, therefore, cannot be changed. +are taken from your current DHCP server and network settings and cannot be changed. ") + // TRANSLATORS: DNS Wizard - step 1 (part 3) @@ -54,12 +55,12 @@ // TRANSLATORS: DNS Wizard - step 2 (part 2) _("<big>DNS Queries</big> -Every DNS query that must find out, for example, an IP address for a -hostname in a DNS zone, first asks the parent zone +Every DNS query (for example searching an IP address for a +hostname in a DNS zone) first asks the parent zone (<tt>com</tt> for <tt>example.com</tt>) for the current zone -name servers, and then sends a DNS query to these name servers to get -a reply containing the desired IP address. -This is why you should mention the current DNS server hostname as one of +name servers. Then it sends a DNS query to these name servers requesting +the desired IP address. +Therefore, always specify the current DNS server hostname as one of the zone name servers. ") + @@ -77,10 +78,10 @@ // TRANSLATORS: DNS Wizard - step 3 (part 1) "wizard-ranges" : _("<big>DNS Records</big> -Here, define DNS hostnames for all DHCP clients. You do not need to define -all hostnames one by one. Only set one or more simple rules for how +Define DNS hostnames for all DHCP clients. You do not need to define +all hostnames one by one. Set simple rules for how the hostnames are created. These rules define the ranges of IP addresses to use -and the string that is used to generate hostnames for a range. +and the string from which hostnames are generated for a range. ") + // TRANSLATORS: DNS Wizard - step 3 (part 2) @@ -125,7 +126,7 @@ // TRANSLATORS: DNS for Experts (editing current settings) (part 2) _("Current Subnet and Netmask show the current network settings. Domain is taken from the current DHCP configuration. -First IP Address and Second ID Address match the current +First IP Address and Second IP Address match the current Dynamic DHCP range. ") + 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-dhcp-server-2.21.2/src/dns-server-dialogs.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp --- old/yast2-dhcp-server-2.21.2/src/dns-server-dialogs.ycp 2011-09-26 13:08:49.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp 2012-03-29 14:28:13.000000000 +0200 @@ -158,7 +158,7 @@ if (last_ip_mask != network_bits) { Report::Error ( sformat (_("IP address %1 does not match -the current network %2/%3 +the current network %2/%3. "), last_ip, current_d_settings["network"]:"", current_d_settings["netmask"]:"" )); @@ -190,7 +190,8 @@ Report::Error (sformat ( // TRANSLATORS: popup error, %1 an IP address // %2 is the first IP address of the range, %3 is the last one - _("The IP address %1 is out of the current + _("The IP address %1 is +outside the current dynamic DHCP range %2-%3. "), first_ip, current_d_settings["from_ip"]:"", current_d_settings["to_ip"]:"" @@ -204,7 +205,7 @@ // TRANSLATORS: popup error, %1 an IP address // %2 is the first IP address of the range, %3 is the last one _("The IP address %1 is -out of the current +outside the current dynamic DHCP range %2-%3. "), last_ip, current_d_settings["from_ip"]:"", current_d_settings["to_ip"]:"" 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-dhcp-server-2.21.2/src/dns-server-management.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp --- old/yast2-dhcp-server-2.21.2/src/dns-server-management.ycp 2011-09-26 13:12:18.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp 2012-03-29 14:28:13.000000000 +0200 @@ -737,7 +737,7 @@ } // TRANSLATORS: popup question - canceling dns synchronization with dhcp - if (Popup::YesNo(_("If you cancel, all changes made in the DNS server will be lost. + if (Popup::YesNo(_("If you cancel, all changes made to the DNS server will be lost. Really cancel this operation? "))) { // Changes currently made will be reverted 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-dhcp-server-2.21.2/src/dns-server-wizard.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp --- old/yast2-dhcp-server-2.21.2/src/dns-server-wizard.ycp 2011-09-26 13:12:18.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp 2012-03-29 14:28:13.000000000 +0200 @@ -195,8 +195,7 @@ UI::SetFocus (`id("ip")); // TRANSLATORS: popup question if (! Popup::YesNo(_("No IP address has been provided for a name server in the current DNS zone. -This might not work because each zone needs its name server name and IP -defined. +This may not work because each zone needs the name and IP of its name server defined. Really use the current settings? "))) continue; } 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-dhcp-server-2.21.2/src/helps.ycp new/yast2-dhcp-server-2.22.0/src/helps.ycp --- old/yast2-dhcp-server-2.21.2/src/helps.ycp 2011-09-26 13:08:49.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/helps.ycp 2012-03-29 14:28:13.000000000 +0200 @@ -181,16 +181,16 @@ // Wizard Installation - Step 3 1/4 "dynamic_dhcp" :_("<big>Subnet Information</big> -Here you can view the information about the current subnet, such as its address, -netmask and minimum and maximum IP addresses available for the clients. +View information about the current subnet, such as its address, +netmask, minimum and maximum IP addresses available for the clients. ") + // Wizard Installation - Step 3 2/4 _("<big>IP Address Range</big> Set the First IP Address and the Last IP Address -to lease to the clients. These addresses must have the same netmask. -For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check +of the address range to be leased to clients. These addresses must have the same netmask. +For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check the Allow Dynamic BOOTP flag if the specified range may be dynamically assigned to BOOTP clients as well as DHCP clients. ") + -- 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-backup for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package yast2-backup for openSUSE:Factory checked in at 2012-03-30 14:20:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-backup (Old) and /work/SRC/openSUSE:Factory/.yast2-backup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-backup", Maintainer is "locilka(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-backup/yast2-backup.changes 2012-01-17 16:17:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-backup.new/yast2-backup.changes 2012-03-30 14:20:57.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 13:57:41 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts +- confirmed license +- 2.22.1 + +------------------------------------------------------------------- Old: ---- yast2-backup-2.22.0.tar.bz2 New: ---- yast2-backup-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-backup.spec ++++++ --- /var/tmp/diff_new_pack.YKvJRe/_old 2012-03-30 14:20:58.000000000 +0200 +++ /var/tmp/diff_new_pack.YKvJRe/_new 2012-03-30 14:20:58.000000000 +0200 @@ -15,31 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-backup -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-backup-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ - Summary: YaST2 - System Backup +License: GPL-2.0 +Group: System/YaST BuildArch: noarch BuildRequires: autoyast2-installation BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 +BuildRequires: yast2-core >= 2.17.22 BuildRequires: yast2-devtools BuildRequires: yast2-nfs-client -BuildRequires: yast2-testsuite -BuildRequires: yast2-core >= 2.17.22 BuildRequires: yast2-slp +BuildRequires: yast2-testsuite Requires: autoyast2-installation Requires: bzip2 @@ -84,7 +81,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-backup-2.22.0.tar.bz2 -> yast2-backup-2.22.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-backup-2.22.0/VERSION new/yast2-backup-2.22.1/VERSION --- old/yast2-backup-2.22.0/VERSION 2012-01-13 15:53:30.000000000 +0100 +++ new/yast2-backup-2.22.1/VERSION 2012-03-29 13:57:52.000000000 +0200 @@ -1 +1 @@ -2.22.0 +2.22.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-backup-2.22.0/backup.pot new/yast2-backup-2.22.1/backup.pot --- old/yast2-backup-2.22.0/backup.pot 2011-10-18 17:02:41.000000000 +0200 +++ new/yast2-backup-2.22.1/backup.pot 2011-10-05 10:04:56.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-01 14:53+0200\n" +"POT-Creation-Date: 2011-10-05 10:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-backup-2.22.0/configure new/yast2-backup-2.22.1/configure --- old/yast2-backup-2.22.0/configure 2012-01-13 15:57:28.000000000 +0100 +++ new/yast2-backup-2.22.1/configure 2012-03-29 13:58:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-backup 2.22.0. +# Generated by GNU Autoconf 2.68 for yast2-backup 2.22.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-backup' PACKAGE_TARNAME='yast2-backup' -PACKAGE_VERSION='2.22.0' -PACKAGE_STRING='yast2-backup 2.22.0' +PACKAGE_VERSION='2.22.1' +PACKAGE_STRING='yast2-backup 2.22.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-backup 2.22.0 to adapt to many kinds of systems. +\`configure' configures yast2-backup 2.22.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-backup 2.22.0:";; + short | recursive ) echo "Configuration of yast2-backup 2.22.1:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-backup configure 2.22.0 +yast2-backup configure 2.22.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-backup $as_me 2.22.0, which was +It was created by yast2-backup $as_me 2.22.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-backup' - VERSION='2.22.0' + VERSION='2.22.1' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.22.0" +VERSION="2.22.1" RPMNAME="yast2-backup" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-backup $as_me 2.22.0, which was +This file was extended by yast2-backup $as_me 2.22.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-backup config.status 2.22.0 +yast2-backup config.status 2.22.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-backup-2.22.0/configure.in new/yast2-backup-2.22.1/configure.in --- old/yast2-backup-2.22.0/configure.in 2012-01-13 15:57:26.000000000 +0100 +++ new/yast2-backup-2.22.1/configure.in 2012-03-29 13:57:57.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-backup dnl -dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-backup, 2.22.0, http://bugs.opensuse.org/, yast2-backup) +AC_INIT(yast2-backup, 2.22.1, http://bugs.opensuse.org/, yast2-backup) 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.22.0" +VERSION="2.22.1" RPMNAME="yast2-backup" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-backup-2.22.0/src/ui.ycp new/yast2-backup-2.22.1/src/ui.ycp --- old/yast2-backup-2.22.0/src/ui.ycp 2011-10-18 17:02:35.000000000 +0200 +++ new/yast2-backup-2.22.1/src/ui.ycp 2012-03-29 13:57:03.000000000 +0200 @@ -1241,7 +1241,7 @@ // check box label `Left(`CheckBox(`id(`search), `opt(`notify), _("&Back Up Files Not Belonging to Any Package"), Backup::do_search)), // check box label - `Left(`CheckBox(`id(`all_rpms_content), `opt(`notify), _("Back Up Content of &All Packages"), Backup::backup_all_rpms_content)), + `Left(`CheckBox(`id(`all_rpms_content), `opt(`notify), _("Back up Content of &All Packages"), Backup::backup_all_rpms_content)), `VSpacing(0.3), // check box label `Left(`CheckBox(`id(`display), _("Display List of Files Before &Creating Archive"), Backup::display)), -- 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-autofs for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package yast2-autofs for openSUSE:Factory checked in at 2012-03-30 14:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-autofs (Old) and /work/SRC/openSUSE:Factory/.yast2-autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-autofs", Maintainer is "varkoly(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-autofs/yast2-autofs.changes 2011-10-04 17:04:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-autofs.new/yast2-autofs.changes 2012-03-30 14:20:56.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 13:51:43 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-autofs-2.21.1.tar.bz2 New: ---- yast2-autofs-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-autofs.spec ++++++ --- /var/tmp/diff_new_pack.jxowFN/_old 2012-03-30 14:20:57.000000000 +0200 +++ /var/tmp/diff_new_pack.jxowFN/_new 2012-03-30 14:20:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-autofs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,27 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-autofs -Version: 2.21.1 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-autofs-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite BuildArch: noarch Summary: YaST2 - Module to Create and Manage autofs Entries in LDAP +License: GPL-2.0 +Group: System/YaST %description This makes possible to create and manage autofs entries in an LDAP @@ -47,23 +47,22 @@ %setup -n yast2-autofs-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -78,7 +77,7 @@ /usr/share/YaST2/clients/autofs.ycp #/usr/share/YaST2/clients/autofs_*.ycp /usr/share/YaST2/modules/Autofs* -%{prefix}/share/applications/YaST2/autofs.desktop -%doc %{prefix}/share/doc/packages/yast2-autofs +%{_prefix}/share/applications/YaST2/autofs.desktop +%doc %{_prefix}/share/doc/packages/yast2-autofs %changelog ++++++ yast2-autofs-2.21.1.tar.bz2 -> yast2-autofs-2.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/VERSION new/yast2-autofs-2.22.0/VERSION --- old/yast2-autofs-2.21.1/VERSION 2011-09-29 09:57:31.000000000 +0200 +++ new/yast2-autofs-2.22.0/VERSION 2012-03-29 13:52:40.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/configure new/yast2-autofs-2.22.0/configure --- old/yast2-autofs-2.21.1/configure 2011-09-29 10:01:06.000000000 +0200 +++ new/yast2-autofs-2.22.0/configure 2012-03-29 13:52:45.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-autofs 2.21.1. +# Generated by GNU Autoconf 2.68 for yast2-autofs 2.22.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-autofs' PACKAGE_TARNAME='yast2-autofs' -PACKAGE_VERSION='2.21.1' -PACKAGE_STRING='yast2-autofs 2.21.1' +PACKAGE_VERSION='2.22.0' +PACKAGE_STRING='yast2-autofs 2.22.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-autofs 2.21.1 to adapt to many kinds of systems. +\`configure' configures yast2-autofs 2.22.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-autofs 2.21.1:";; + short | recursive ) echo "Configuration of yast2-autofs 2.22.0:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-autofs configure 2.21.1 +yast2-autofs configure 2.22.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-autofs $as_me 2.21.1, which was +It was created by yast2-autofs $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-autofs' - VERSION='2.21.1' + VERSION='2.22.0' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.1" +VERSION="2.22.0" RPMNAME="yast2-autofs" MAINTAINER="Peter Varkoly <varkoly(a)novell.com>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-autofs $as_me 2.21.1, which was +This file was extended by yast2-autofs $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-autofs config.status 2.21.1 +yast2-autofs config.status 2.22.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/configure.in new/yast2-autofs-2.22.0/configure.in --- old/yast2-autofs-2.21.1/configure.in 2011-09-29 10:01:04.000000000 +0200 +++ new/yast2-autofs-2.22.0/configure.in 2012-03-29 13:52:43.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-autofs dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-autofs, 2.21.1, http://bugs.opensuse.org/, yast2-autofs) +AC_INIT(yast2-autofs, 2.22.0, http://bugs.opensuse.org/, yast2-autofs) 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.21.1" +VERSION="2.22.0" RPMNAME="yast2-autofs" MAINTAINER="Peter Varkoly <varkoly(a)novell.com>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/src/Autofs.pm new/yast2-autofs-2.22.0/src/Autofs.pm --- old/yast2-autofs-2.21.1/src/Autofs.pm 2011-09-29 09:56:45.000000000 +0200 +++ new/yast2-autofs-2.22.0/src/Autofs.pm 2012-03-29 13:51:28.000000000 +0200 @@ -210,7 +210,7 @@ y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST ldap module."), + __("Use the YaST LDAP module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.21.1/src/helps.ycp new/yast2-autofs-2.22.0/src/helps.ycp --- old/yast2-autofs-2.21.1/src/helps.ycp 2011-09-29 09:56:45.000000000 +0200 +++ new/yast2-autofs-2.22.0/src/helps.ycp 2012-03-29 13:51:28.000000000 +0200 @@ -38,7 +38,7 @@ /* Read dialog help 1/2 */ "read" : _("Initializing autofs configuration -Please wait... + ") + /* Read dialog help 2/2 */ @@ -48,7 +48,7 @@ /* Write dialog help 1/2 */ "write" : _("Saving autofs configuration -Please wait... + ") + /* Write dialog help 2/2 */ @@ -103,18 +103,19 @@ /* EntryDialog for Other entry */ "EntryDialogOther" : _("<big>Other Entry</big> -The options are comma separated, as customary for the mount(8) command. +The options are comma-separated, which is customary for the mount(8) command. The location specifies from where the file system is to be mounted. -Please consult the autofs(5) manual page for more information. - \n"), +Consult the autofs(5) manual page for more information. + +"), /* GetLDAPServer dialog if the ldapserver is localhost */ - "GetLDAPServer" : _("<big>Warning</big> -In your system localhost is configured as the LDAP server. -However, the clients cannot reach the localhost and therefore, it cannot be the LDAP server for autofs. -Please insert an IP address or DNS name for the LDAP server that is suitable for the clients, or choose the suggested hostname of your server -and press Ok. - "), + "GetLDAPServer" : _("<big>Warning</big> In your system localhost is configured +as the LDAP server. Since clients cannot reach localhost, it +cannot act as LDAP server for autofs. Specify an IP address or DNS name of a +suitable LDAP server or choose the suggested hostname of your server and press +Ok. +"), ]; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2012-03-30 14:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager", Maintainer is "CARNOLD(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2012-03-29 11:42:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2012-03-30 14:20:54.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 22:19:44 UTC 2012 - berendt(a)b1-systems.de + +- added missing requirements python-gobject, python-gtk, + python-gconf and xorg-x11-fonts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.jRksi1/_old 2012-03-30 14:20:56.000000000 +0200 +++ /var/tmp/diff_new_pack.jRksi1/_new 2012-03-30 14:20:56.000000000 +0200 @@ -76,6 +76,10 @@ Requires: vm-install #Requires: spice-gtk Requires: python-virtinst == %{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} +Requires: python-gobject2 +Requires: python-gtk +Requires: python-gconf +Requires: xorg-x11-fonts %description Virtual Machine Manager provides a graphical tool for administering virtual -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-salut for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package telepathy-salut for openSUSE:Factory checked in at 2012-03-30 14:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-salut (Old) and /work/SRC/openSUSE:Factory/.telepathy-salut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-salut", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-salut/telepathy-salut.changes 2012-03-06 13:42:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-salut.new/telepathy-salut.changes 2012-03-30 14:20:52.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Mar 29 12:31:20 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.7.2: + + Enhancements: + - fdo#18530: Support for IPv4 and IPv6 types for the local + socket for file transfer + - Several improvements on Windows (fdo#45716, fdo#46345, + fdo#47072, fdo#47429, fdo#47729) + + Fixes: + - fdo#31729: The ContactList interface is now actually + advertised as supported +- Pass --disable-static to configure to avoid shipping a .a file. + +------------------------------------------------------------------- Old: ---- telepathy-salut-0.7.1.tar.gz New: ---- telepathy-salut-0.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-salut.spec ++++++ --- /var/tmp/diff_new_pack.4B8LiR/_old 2012-03-30 14:20:53.000000000 +0200 +++ /var/tmp/diff_new_pack.4B8LiR/_new 2012-03-30 14:20:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: telepathy-salut -Version: 0.7.1 +Version: 0.7.2 Release: 0 # FIXME: check if libgcrypt-devel BuildRequires is really needed (see fdo#43992). Last checked: 0.7.0. Summary: Link-local XMPP connection manager for Telepathy @@ -56,7 +56,7 @@ %setup -q %build -%configure --docdir=%{_docdir}/%{name} +%configure --disable-static --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %install @@ -78,7 +78,6 @@ %dir %{_datadir}/telepathy/managers %dir %{_libdir}/telepathy %{_libdir}/telepathy/salut-0/ -%{_libdir}/libsalut-plugins.so %{_libexecdir}/telepathy-salut %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service %{_datadir}/telepathy/managers/salut.manager ++++++ telepathy-salut-0.7.1.tar.gz -> telepathy-salut-0.7.2.tar.gz ++++++ ++++ 11917 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shotwell for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2012-03-30 14:20:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotwell (Old) and /work/SRC/openSUSE:Factory/.shotwell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shotwell", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/shotwell/shotwell.changes 2012-03-22 12:40:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2012-03-30 14:20:28.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 28 12:26:34 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.12.0: + + Several bug fixes and stability enhancements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- shotwell-0.11.93.tar.bz2 New: ---- shotwell-0.12.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.Pt1jIf/_old 2012-03-30 14:20:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Pt1jIf/_new 2012-03-30 14:20:30.000000000 +0200 @@ -17,13 +17,13 @@ Name: shotwell -Version: 0.11.93 +Version: 0.12.0 Release: 0 Summary: Photo Manager for GNOME License: LGPL-2.1+ Group: Productivity/Graphics/Viewers Url: http://yorba.org/shotwell/ -Source: http://yorba.org/download/shotwell/0.11/%{name}-%{version}.tar.bz2 +Source: http://yorba.org/download/shotwell/0.12/%{name}-%{version}.tar.bz2 BuildRequires: libraw-devel-static BuildRequires: update-desktop-files BuildRequires: vala >= 0.15.2 ++++++ shotwell-0.11.93.tar.bz2 -> shotwell-0.12.0.tar.bz2 ++++++ ++++ 339496 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sash for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package sash for openSUSE:Factory checked in at 2012-03-30 14:20:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sash (Old) and /work/SRC/openSUSE:Factory/.sash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sash", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sash/sash.changes 2011-10-04 18:14:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sash.new/sash.changes 2012-03-30 14:20:27.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Mar 28 13:23:17 UTC 2012 - aj(a)suse.de + +- Provide declaration of umode_t to fix build with Linux 3.3 + kernel headers. + +------------------------------------------------------------------- +Wed Mar 28 08:02:14 UTC 2012 - cfarrell(a)suse.com + +- license update: ISC + sash license most akin to SPDX recognised ISC license (you are free to + use, modify, distribute - only requirement is retention of attribution) + +------------------------------------------------------------------- New: ---- sash-headers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sash.spec ++++++ --- /var/tmp/diff_new_pack.mcdIF0/_old 2012-03-30 14:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mcdIF0/_new 2012-03-30 14:20:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,17 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sash -BuildRequires: ncurses-devel zlib-devel-static -License: PERMISSIVE-OSI-COMPLIANT -Group: System/Shells -AutoReqProv: on +BuildRequires: ncurses-devel +BuildRequires: zlib-devel-static Version: 3.7 -Release: 171 +Release: 0 Summary: A stand-alone shell with built-in commands +License: ISC +Group: System/Shells Source: sash-%{version}.tar.bz2 Url: http://www.tip.net.au/~dbell Patch0: sash-%{version}-install.diff @@ -36,6 +34,7 @@ Patch5: sash-3.7-shared_libc.patch Patch6: sash-%{version}-ed-line-marking.diff Patch7: sash-plus-patches-%{version}.diff +Patch8: sash-headers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +60,7 @@ %patch5 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build export RPM_OPT_FLAGS ++++++ sash-headers.patch ++++++ Index: sash-3.7/cmd_chattr.c =================================================================== --- sash-3.7.orig/cmd_chattr.c +++ sash-3.7/cmd_chattr.c @@ -12,6 +12,7 @@ #include <sys/ioctl.h> #include <sys/types.h> +typedef unsigned int umode_t; #include <linux/fs.h> #include <linux/ext2_fs.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0