Hello community, here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2011-11-16 17:22:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2011-09-23 12:53:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2011-11-16 17:23:31.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 16 11:55:12 CET 2011 - [email protected] + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-2.21.3.tar.bz2 New: ---- yast2-dns-server-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.rqMFoa/_old 2011-11-16 17:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.rqMFoa/_new 2011-11-16 17:23:34.000000000 +0100 @@ -19,16 +19,14 @@ Name: yast2-dns-server -Version: 2.21.3 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dns-server-2.21.3.tar.bz2 - -Prefix: /usr +Source0: yast2-dns-server-%{version}.tar.bz2 Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite # requires DnsServerAPI::GetReverseIPforIPv6 @@ -64,26 +62,26 @@ This package contains the YaST2 component for DNS server configuration. %prep -%setup -n yast2-dns-server-2.21.3 +%setup -n yast2-dns-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 @@ -98,7 +96,7 @@ /usr/share/YaST2/clients/dns-server.ycp /usr/share/YaST2/clients/dns-server_*.ycp /usr/share/YaST2/modules/* -%{prefix}/share/applications/YaST2/dns-server.desktop +%{_prefix}/share/applications/YaST2/dns-server.desktop /usr/share/YaST2/scrconf/dns_named.scr /usr/share/YaST2/scrconf/dns_zone.scr /usr/share/YaST2/scrconf/cfg_named.scr @@ -109,6 +107,6 @@ /usr/lib/YaST2/servers_non_y2/ag_named_forwarders /usr/lib/YaST2/servers_non_y2/ag_convert_named_conf /usr/share/YaST2/schema/autoyast/rnc/dns-server.rnc -%doc %{prefix}/share/doc/packages/yast2-dns-server +%doc %{_prefix}/share/doc/packages/yast2-dns-server %changelog ++++++ yast2-dns-server-2.21.3.tar.bz2 -> yast2-dns-server-2.22.0.tar.bz2 ++++++ ++++ 2854 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-dns-server-2.21.3/Makefile.am new/yast2-dns-server-2.22.0/Makefile.am --- old/yast2-dns-server-2.21.3/Makefile.am 2011-09-12 14:22:57.000000000 +0200 +++ new/yast2-dns-server-2.22.0/Makefile.am 2011-11-16 11:54:34.000000000 +0100 @@ -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-dns-server-2.21.3/VERSION new/yast2-dns-server-2.22.0/VERSION --- old/yast2-dns-server-2.21.3/VERSION 2011-09-12 14:21:18.000000000 +0200 +++ new/yast2-dns-server-2.22.0/VERSION 2011-11-16 11:55:21.000000000 +0100 @@ -1 +1 @@ -2.21.3 +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-dns-server-2.21.3/configure.in new/yast2-dns-server-2.22.0/configure.in --- old/yast2-dns-server-2.21.3/configure.in 2011-09-12 14:22:57.000000000 +0200 +++ new/yast2-dns-server-2.22.0/configure.in 2011-11-16 11:54:34.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-dns-server dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-dns-server, 2.21.3, http://bugs.opensuse.org/, yast2-dns-server) 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-dns-server-2.21.3/src/DnsServer.pm new/yast2-dns-server-2.22.0/src/DnsServer.pm --- old/yast2-dns-server-2.21.3/src/DnsServer.pm 2011-06-22 17:09:32.000000000 +0200 +++ new/yast2-dns-server-2.22.0/src/DnsServer.pm 2011-11-16 11:54:54.000000000 +0100 @@ -1543,13 +1543,13 @@ if ($start_service) { # summary string - push (@ret, __("The DNS server starts when booting the system")); + push (@ret, __("The DNS server starts when booting the system.")); } else { push (@ret, # summary string - __("The DNS server does not start when booting the system")); + __("The DNS server does not start when booting the system.")); } my @zones_descr = map { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dns-server-2.21.3/src/cmdline.ycp new/yast2-dns-server-2.22.0/src/cmdline.ycp --- old/yast2-dns-server-2.21.3/src/cmdline.ycp 2007-05-18 12:48:26.000000000 +0200 +++ new/yast2-dns-server-2.22.0/src/cmdline.ycp 2011-11-16 11:54:54.000000000 +0100 @@ -77,10 +77,10 @@ string content = ""; if (DnsServer::GetStartService()) { // TRANSLATORS: commandline DNS service status information - content = _("DNS server is enabled in the boot process"); + content = _("DNS server is enabled in the boot process."); } else { // TRANSLATORS: commandline DNS service status information - content = _("DNS server needs manual starting"); + content = _("DNS server needs manual starting."); } // TRANSLATORS: commandline section header ScreenWizard(_("Start-Up Settings:"), content); @@ -976,12 +976,12 @@ "retry" : $[ "type" : "string", // TRANSLATORS: commandline short help for command - "help" : _("An interval between retries of failed refresh"), + "help" : _("Interval between retries of failed refresh"), ], "expiry" : $[ "type" : "string", // TRANSLATORS: commandline short help for command - "help" : _("An interval after which zone records are no longer authoritative"), + "help" : _("Interval after which zone records are no longer authoritative"), ], "minimum" : $[ "type" : "string", 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-dns-server-2.21.3/src/dialog-installwizard.ycp new/yast2-dns-server-2.22.0/src/dialog-installwizard.ycp --- old/yast2-dns-server-2.21.3/src/dialog-installwizard.ycp 2009-02-09 12:16:18.000000000 +0100 +++ new/yast2-dns-server-2.22.0/src/dialog-installwizard.ycp 2011-11-16 11:54:54.000000000 +0100 @@ -185,7 +185,7 @@ firewall_layout, ldap_support, // Label for Radiobuttons - DNS starting - `Left ( `Label ( _("Start-Up Behavior") ) ), + `Left ( `Label ( _("Start-up Behavior") ) ), `Left ( `RadioButtonGroup( `id ( "dns_server_type" ), `opt( `shrinkable ), `VBox ( 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-dns-server-2.21.3/src/dialog-main.ycp new/yast2-dns-server-2.22.0/src/dialog-main.ycp --- old/yast2-dns-server-2.21.3/src/dialog-main.ycp 2011-06-22 17:09:32.000000000 +0200 +++ new/yast2-dns-server-2.22.0/src/dialog-main.ycp 2011-11-16 11:54:54.000000000 +0100 @@ -77,7 +77,7 @@ `Label (_("Current Status: ")), `ReplacePoint (`id ("service_status_rp"), // service status - label - `Label (_("DNS server is running")) + `Label (_("DNS server is running.")) ), `HStretch () ), @@ -109,9 +109,9 @@ UI::ReplaceWidget (`id ("service_status_rp"), `Label (status // service sttus - label - ? _("DNS server is running") + ? _("DNS server is running.") // service sttus - label - : _("DNS server is not running") + : _("DNS server is not running.") ) ); } @@ -476,7 +476,7 @@ if (ret == nil) { // An error message, %1 is replaced with a variable IP - Report::Error (sformat(_("Cannot find local equivalent for IP %1"), ret)); + Report::Error (sformat(_("Cannot find local equivalent for IP %1."), ret)); } else { // TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP Report::Warning (sformat(_("Forwarding DNS queries to itself would create an infinite loop. @@ -1773,9 +1773,9 @@ "start_stop" : CWMServiceStart::CreateStartStopWidget ($[ "service_id" : "named", // label - service status, informative text - "service_running_label" : _("DNS server is running"), + "service_running_label" : _("DNS server is running."), // label - service status, informative text - "service_not_running_label" : _("DNS server is not running"), + "service_not_running_label" : _("DNS server is not running."), // push button (DNS service handling) "start_now_button" : _("&Start DNS Server Now"), // push button (DNS service handling) 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-dns-server-2.21.3/src/helps.ycp new/yast2-dns-server-2.22.0/src/helps.ycp --- old/yast2-dns-server-2.21.3/src/helps.ycp 2011-07-08 10:53:11.000000000 +0200 +++ new/yast2-dns-server-2.22.0/src/helps.ycp 2011-11-16 11:54:54.000000000 +0100 @@ -106,21 +106,23 @@ "zone_direction" : _("<p><b><big>Zone Direction</big></b><br> DNS is used both for translating from domain names to IP addresses and back. Select if this zone will be used to translate from domain names to IP -addresses (select <b>Forward</b>) or from IP addresses to domain names -(select <b>Reverse</b>).</p>"), +addresses (<b>Forward</b>) or from IP addresses to domain names +(<b>Reverse</b>).</p> +"), // firewall dialog // help text 1/2 "iface_classes" : _("<p><b><big>Interface Classes</big></b><br> -Select through which interface classes access to the DNS server should be -allowed. The interface classes are defined in the -firewall configuration component.</p>"), +Select which interface classes should have access to the DNS server. The +interface classes are defined in the firewall configuration component.</p> +"), // help text 2/2 "adapt_firewall" : _("<p><b><big>Adapting Firewall Settings</big></b><br> -To adapt the firewall settings so the DNS server can be accessed -through all network interfaces to which it listens, check -<b>Adapt Firewall Settings</b>.</p>"), +To adapt the firewall settings so that the DNS server can be accessed +via all network interfaces to which it listens, check +<b>Adapt Firewall Settings</b>.</p> +"), // soa dialog // help text 1/9 @@ -137,12 +139,14 @@ // help text 4/9 - Administrator's mail + _("<p><b>Administrator's Mail</b> must contain the e-mail address of -administrator responsible for the zone.</p>") +the administrator responsible for the zone.</p> +") // help text 5/9 - Serial + _("<p><b>Serial</b> number is used for determining if the zone has changed on -master servers (so slave servers do not always need to synchronize the -entire zone).</p>") +the master servers (so that slave servers do not always need to synchronize the +entire zone).</p> +") // help text 6/9 - Refresh + _("<p><b>Refresh</b> sets how often the zone should be synchronized from @@ -254,7 +258,7 @@ /* Expert Mode Configuration - ACLs 2/2 */ _("<p>To add a new ACL entry, just enter the option's <b>Name</b> -and <b>Value</b> then click <b>Add</b>. To remove an already set +and <b>Value</b> then click <b>Add</b>. To remove an ACL entry, select it and click <b>Delete</b>.</p> "), @@ -342,8 +346,9 @@ /* Zone Editor - Help */ _("<p> Reverse zone records can be generated from another master zone. -If you want this, select the <b>Automatically Generate Records From</b> -check-box and choose the zone to generate the records from.</p>") + +Select the <b>Automatically Generate Records From</b> +check-box and choose the zone to generate the records from.</p> +") + /* Zone Editor - Help */ _("<p> @@ -372,8 +377,9 @@ /* Zone Editor - Help for tab - Zone (SOA) 2/7 */ + _("<p><b>Serial</b> is the number used for determining if the zone has changed on -master servers (so slave servers do not always need to synchronize the -entire zone).</p>") +the master servers (then slave servers do not always need to synchronize the +entire zone).</p> +") /* Zone Editor - Help for tab - Zone (SOA) 3/7 */ + _("<p><b>TTL</b> specifies the time to live for all records in the @@ -474,7 +480,8 @@ // Final step of the installation wizard - 3/5 _("<p> To start the DNS server every time your computer is booted, set the -start-up behavior to <b>On</b>. Otherwise set <b>Off</b>.</p> ") + +start-up behavior to <b>On</b>. Otherwise set it to <b>Off</b>.</p> +") + ((DnsServer::ExpertUI()) ? // Final step of the installation wizard - 4/5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
