Hello community, here is the log from the commit of package yast2-runlevel checked in at Fri Jan 19 19:24:05 CET 2007. -------- --- yast2-runlevel/yast2-runlevel.changes 2006-10-27 09:33:11.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-runlevel/yast2-runlevel.changes 2007-01-18 17:25:36.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 18 17:22:10 CET 2007 - locilka@suse.cz + +- Consistent button labels vs. help text (#235792). +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-runlevel-2.14.1.tar.bz2 New: ---- yast2-runlevel-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-runlevel.spec ++++++ --- /var/tmp/diff_new_pack.d25205/_old 2007-01-19 19:23:58.000000000 +0100 +++ /var/tmp/diff_new_pack.d25205/_new 2007-01-19 19:23:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-runlevel (Version 2.14.1) +# spec file for package yast2-runlevel (Version 2.15.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-runlevel -Version: 2.14.1 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-runlevel-2.14.1.tar.bz2 +Source0: yast2-runlevel-2.15.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-runlevel-2.14.1 +%setup -n yast2-runlevel-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -84,6 +84,9 @@ %doc %{prefix}/share/doc/packages/yast2-runlevel %changelog -n yast2-runlevel +* Thu Jan 18 2007 - locilka@suse.cz +- Consistent button labels vs. help text (#235792). +- 2.15.0 * Fri Oct 27 2006 - locilka@suse.cz - Added runlevels.rnc for AutoYaST profile validation (#215248). - 2.14.1 ++++++ yast2-runlevel-2.14.1.tar.bz2 -> yast2-runlevel-2.15.0.tar.bz2 ++++++ ++++ 5242 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-runlevel-2.14.1/configure.in new/yast2-runlevel-2.15.0/configure.in --- old/yast2-runlevel-2.14.1/configure.in 2006-10-27 09:41:38.000000000 +0200 +++ new/yast2-runlevel-2.15.0/configure.in 2007-01-18 17:28:32.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-runlevel dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-runlevel, 2.14.1, http://bugs.opensuse.org/, yast2-runlevel) +AC_INIT(yast2-runlevel, 2.15.0, http://bugs.opensuse.org/, yast2-runlevel) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.1" +VERSION="2.15.0" RPMNAME="yast2-runlevel" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) dnl Check packages expect and dejagnu AC_PATH_PROG(MYEXPECT, expect, 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-runlevel-2.14.1/Makefile.am new/yast2-runlevel-2.15.0/Makefile.am --- old/yast2-runlevel-2.14.1/Makefile.am 2006-10-27 09:41:39.000000000 +0200 +++ new/yast2-runlevel-2.15.0/Makefile.am 2007-01-18 17:28:32.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +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) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common 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-runlevel-2.14.1/Makefile.am.common new/yast2-runlevel-2.15.0/Makefile.am.common --- old/yast2-runlevel-2.14.1/Makefile.am.common 2006-10-27 09:41:39.000000000 +0200 +++ new/yast2-runlevel-2.15.0/Makefile.am.common 2007-01-18 17:28:32.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-runlevel-2.14.1/src/ui.ycp new/yast2-runlevel-2.15.0/src/ui.ycp --- old/yast2-runlevel-2.14.1/src/ui.ycp 2006-10-10 11:39:26.000000000 +0200 +++ new/yast2-runlevel-2.15.0/src/ui.ycp 2007-01-18 17:25:54.000000000 +0100 @@ -13,7 +13,7 @@ * Petr Blahos <pblahos@suse.cz> * Martin Lazar <mlazar@suse.cz> * - * $Id: ui.ycp 33299 2006-10-10 09:39:23Z locilka $ + * $Id: ui.ycp 35511 2007-01-18 16:25:52Z locilka $ * * Runlevel editor user interface functions. */ @@ -1292,10 +1292,10 @@ ") + // help text - // Activate is a button - _("<p><b>Activate</b> starts the selected service and services + // 'Enable' is a button, 'Disable' is a button + _("<p><b>Enable</b> starts the selected service and services that it depends on and enables them to start at system boot time. -Likewise, <b>Deactivate</b> stops services that depend on a given service +Likewise, <b>Disable</b> stops services that depend on a given service and the service itself and disables their start at system boot time.</p>") + // help text @@ -1312,20 +1312,22 @@ `Table (`id (`table), `opt (`notify, `immediate), `header (_("Service"), _("Enabled"), _("Description")), servicesToTable (`simple) - ), + ), `VSquash ( `HBox ( `VSpacing (4.3), // 3+borders in qt, 3 in curses `RichText (`id (`description), `opt (`shrinkable, `vstretch), "") ) - ), - `HBox ( - // Button label - `PushButton (`id (`enable), `opt (`key_F3), _("Ena&ble")), - // Button label - `PushButton (`id (`disable), `opt (`key_F5), _("&Disable")) + ), + `Left ( + `HBox ( + // Button label + `PushButton (`id (`enable), `opt (`key_F3), _("&Enable")), + // Button label + `PushButton (`id (`disable), `opt (`key_F5), _("&Disable")) ) - ); + ) + ); // dialog caption. Wizard::SetContentsButtons (_("System Services (Runlevel): Services"), contents, help_text, Label::BackButton(), Label::FinishButton()); Wizard::DisableBackButton (); 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-runlevel-2.14.1/VERSION new/yast2-runlevel-2.15.0/VERSION --- old/yast2-runlevel-2.14.1/VERSION 2006-10-27 09:29:57.000000000 +0200 +++ new/yast2-runlevel-2.15.0/VERSION 2007-01-18 17:25:43.000000000 +0100 @@ -1 +1 @@ -2.14.1 +2.15.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org