Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2013-09-27 19:42:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2013-08-01 11:10:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2013-09-27 19:42:21.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 11 16:52:57 CEST 2013 - [email protected] + +- revert part of previous change: drop only UI parts, not Ruby API +- 3.0.2 + +------------------------------------------------------------------- +Wed Sep 4 13:04:15 CEST 2013 - [email protected] + +- drop YCP UI parts (fate#316195) +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.0.0.tar.bz2 New: ---- yast2-slp-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.77SZrQ/_old 2013-09-27 19:42:23.000000000 +0200 +++ /var/tmp/diff_new_pack.77SZrQ/_new 2013-09-27 19:42:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.0.0 +Version: 3.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,9 +35,7 @@ BuildRequires: libxcrypt-devel %endif Requires: openslp -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 - +Requires: yast2 Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - SLP Agent and Browser @@ -81,7 +79,6 @@ %{_libdir}/YaST2/plugin/libpy2ag_slp.so.* %{_libdir}/YaST2/plugin/libpy2ag_slp.so %{_libdir}/YaST2/plugin/libpy2ag_slp.la -/usr/share/YaST2/clients/slp.rb /usr/share/YaST2/modules/SLP.rb %doc %{_prefix}/share/doc/packages/yast2-slp ++++++ yast2-slp-3.0.0.tar.bz2 -> yast2-slp-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/Makefile.am new/yast2-slp-3.0.2/Makefile.am --- old/yast2-slp-3.0.0/Makefile.am 2013-07-31 10:47:28.000000000 +0200 +++ new/yast2-slp-3.0.2/Makefile.am 2013-09-11 17:42:07.000000000 +0200 @@ -193,4 +193,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agent-slp doc src testsuite +SUBDIRS = agent-slp doc src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/Makefile.am.common new/yast2-slp-3.0.2/Makefile.am.common --- old/yast2-slp-3.0.0/Makefile.am.common 2013-07-31 10:47:28.000000000 +0200 +++ new/yast2-slp-3.0.2/Makefile.am.common 2013-09-11 17:42:07.000000000 +0200 @@ -15,6 +15,7 @@ CLEANFILES = ${ybcfiles} DISTCLEANFILES = .dep +if HAS_YCP_MODULES # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. @@ -26,14 +27,16 @@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} cat ${NEWDEP} > .dep rm ${NEWDEP} +-include .dep +endif dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ 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"; \ @@ -43,5 +46,18 @@ echo "Syntax check disabled"; \ fi; \ fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi --include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/Makefile.in new/yast2-slp-3.0.2/Makefile.in --- old/yast2-slp-3.0.0/Makefile.in 2013-07-31 10:47:40.000000000 +0200 +++ new/yast2-slp-3.0.2/Makefile.in 2013-09-11 17:42:23.000000000 +0200 @@ -377,7 +377,7 @@ TAGVERSION = $(Y2TOOL) tagversion # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agent-slp doc src testsuite +SUBDIRS = agent-slp doc src all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/VERSION new/yast2-slp-3.0.2/VERSION --- old/yast2-slp-3.0.0/VERSION 2013-07-30 13:41:05.000000000 +0200 +++ new/yast2-slp-3.0.2/VERSION 2013-09-11 17:26:58.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/agent-slp/doc/Makefile.am new/yast2-slp-3.0.2/agent-slp/doc/Makefile.am --- old/yast2-slp-3.0.0/agent-slp/doc/Makefile.am 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/agent-slp/doc/Makefile.am 2013-09-11 17:41:57.000000000 +0200 @@ -6,5 +6,5 @@ htmldir = $(docdir) -html_DATA = slp.html TODO.txt +html_DATA = slp.html EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/agent-slp/doc/Makefile.in new/yast2-slp-3.0.2/agent-slp/doc/Makefile.in --- old/yast2-slp-3.0.0/agent-slp/doc/Makefile.in 2013-07-31 10:47:40.000000000 +0200 +++ new/yast2-slp-3.0.2/agent-slp/doc/Makefile.in 2013-09-11 17:42:23.000000000 +0200 @@ -314,7 +314,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ SUBDIRS = autodocs -html_DATA = slp.html TODO.txt +html_DATA = slp.html EXTRA_DIST = $(html_DATA) all: all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/agent-slp/doc/TODO.txt new/yast2-slp-3.0.2/agent-slp/doc/TODO.txt --- old/yast2-slp-3.0.0/agent-slp/doc/TODO.txt 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/agent-slp/doc/TODO.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -This is a TODO file for the Slp SCR agent. ----------------------------------------------- -$Id$ - -TODO: ------ - -- Something -- Something else -- ... - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/agent-slp/doc/slp.html new/yast2-slp-3.0.2/agent-slp/doc/slp.html --- old/yast2-slp-3.0.0/agent-slp/doc/slp.html 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/agent-slp/doc/slp.html 2013-09-11 17:41:57.000000000 +0200 @@ -35,10 +35,6 @@ <TT>...</TT> <P> -See the <A HREF="TODO.txt">TODO.txt</A> file for the current status of support -and also for the list of possible future enhancements. - -<P> <H2>Complete Read paths table</H2> The complete <TT>Write()</TT> paths table is similar to this except for the paths to which YCPList is returned. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/autodocs-ycp.ami new/yast2-slp-3.0.2/autodocs-ycp.ami --- old/yast2-slp-3.0.0/autodocs-ycp.ami 2013-07-31 10:47:28.000000000 +0200 +++ new/yast2-slp-3.0.2/autodocs-ycp.ami 2013-09-11 17:42:07.000000000 +0200 @@ -17,8 +17,11 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/configure new/yast2-slp-3.0.2/configure --- old/yast2-slp-3.0.0/configure 2013-07-31 10:47:38.000000000 +0200 +++ new/yast2-slp-3.0.2/configure 2013-09-11 17:42:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-slp 3.0.0. +# Generated by GNU Autoconf 2.69 for yast2-slp 3.0.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-slp' PACKAGE_TARNAME='yast2-slp' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='yast2-slp 3.0.0' +PACKAGE_VERSION='3.0.2' +PACKAGE_STRING='yast2-slp 3.0.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -637,6 +637,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +HAS_YCP_MODULES_FALSE +HAS_YCP_MODULES_TRUE YCPC YCPMAKEDEP YCPDOC @@ -1375,7 +1377,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-slp 3.0.0 to adapt to many kinds of systems. +\`configure' configures yast2-slp 3.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1446,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-slp 3.0.0:";; + short | recursive ) echo "Configuration of yast2-slp 3.0.2:";; esac cat <<\_ACEOF @@ -1564,7 +1566,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-slp configure 3.0.0 +yast2-slp configure 3.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2108,7 +2110,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-slp $as_me 3.0.0, which was +It was created by yast2-slp $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3047,7 +3049,7 @@ # Define the identity of the package. PACKAGE='yast2-slp' - VERSION='3.0.0' + VERSION='3.0.2' cat >>confdefs.h <<_ACEOF @@ -3170,7 +3172,7 @@ -VERSION="3.0.0" +VERSION="3.0.2" RPMNAME="yast2-slp" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -16267,6 +16269,29 @@ fi +# handle .dep files in Makefile.am.common if any YCP module is present +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5 +$as_echo_n "checking for YCP modules... " >&6; } + +# YCP module file name starts with an upper case letter +find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1 + if test -n "$has_ycp_modules"; then + HAS_YCP_MODULES_TRUE= + HAS_YCP_MODULES_FALSE='#' +else + HAS_YCP_MODULES_TRUE='#' + HAS_YCP_MODULES_FALSE= +fi + + +if test -n "$has_ycp_modules"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } +fi + # check slp.h yast_found_slp=no @@ -16280,7 +16305,7 @@ as_fn_error $? "Header file slp.h is missing. Please install openslp-devel." "$LINENO" 5 fi -ac_config_files="$ac_config_files Makefile agent-slp/conf/Makefile agent-slp/src/Makefile agent-slp/doc/autodocs/Makefile agent-slp/doc/Makefile agent-slp/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" +ac_config_files="$ac_config_files Makefile agent-slp/conf/Makefile agent-slp/src/Makefile agent-slp/doc/autodocs/Makefile agent-slp/doc/Makefile agent-slp/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16427,6 +16452,10 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then + as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -16824,7 +16853,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-slp $as_me 3.0.0, which was +This file was extended by yast2-slp $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16890,7 +16919,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-slp config.status 3.0.0 +yast2-slp config.status 3.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17406,7 +17435,6 @@ "doc/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/autodocs/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/configure.ac new/yast2-slp-3.0.2/configure.ac --- old/yast2-slp-3.0.0/configure.ac 2013-07-31 10:47:28.000000000 +0200 +++ new/yast2-slp-3.0.2/configure.ac 2013-09-11 17:42:07.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-slp dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-slp, 3.0.0, http://bugs.opensuse.org/, yast2-slp) +AC_INIT(yast2-slp, 3.0.2, http://bugs.opensuse.org/, yast2-slp) 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="3.0.0" +VERSION="3.0.2" RPMNAME="yast2-slp" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -185,6 +185,19 @@ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) +# handle .dep files in Makefile.am.common if any YCP module is present +AC_MSG_CHECKING([for YCP modules]) + +# YCP module file name starts with an upper case letter +[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1] +AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"]) + +if test -n "$has_ycp_modules"; then + AC_MSG_RESULT([found]) +else + AC_MSG_RESULT([not found]) +fi + # check slp.h yast_found_slp=no @@ -200,7 +213,6 @@ agent-slp/Makefile doc/autodocs/Makefile doc/Makefile -src/Makefile -testsuite/Makefile) +src/Makefile) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/doc/Makefile.am new/yast2-slp-3.0.2/doc/Makefile.am --- old/yast2-slp-3.0.0/doc/Makefile.am 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/doc/Makefile.am 2013-09-11 17:41:57.000000000 +0200 @@ -5,6 +5,3 @@ SUBDIRS = autodocs htmldir = $(docdir) - -html_DATA = slp.html TODO.txt -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/doc/Makefile.in new/yast2-slp-3.0.2/doc/Makefile.in --- old/yast2-slp-3.0.0/doc/Makefile.in 2013-07-31 10:47:40.000000000 +0200 +++ new/yast2-slp-3.0.2/doc/Makefile.in 2013-09-11 17:42:23.000000000 +0200 @@ -17,7 +17,6 @@ # # Makefile.am for .../agent-slp/doc # - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -88,35 +87,6 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(htmldir)" -DATA = $(html_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -314,8 +284,6 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ SUBDIRS = autodocs -html_DATA = slp.html TODO.txt -EXTRA_DIST = $(html_DATA) all: all-recursive .SUFFIXES: @@ -355,27 +323,6 @@ clean-libtool: -rm -rf .libs _libs -install-htmlDATA: $(html_DATA) - @$(NORMAL_INSTALL) - @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ - done - -uninstall-htmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -587,12 +534,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(htmldir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -643,7 +587,7 @@ info-am: -install-data-am: install-htmlDATA +install-data-am: install-dvi: install-dvi-recursive @@ -687,7 +631,7 @@ ps-am: -uninstall-am: uninstall-htmlDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ cscopelist-recursive ctags-recursive install-am install-strip \ @@ -700,13 +644,12 @@ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-htmlDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-htmlDATA + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/doc/TODO.txt new/yast2-slp-3.0.2/doc/TODO.txt --- old/yast2-slp-3.0.0/doc/TODO.txt 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/doc/TODO.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -This is a TODO file for the Slp SCR agent. ----------------------------------------------- -$Id$ - -TODO: ------ - -- Something -- Something else -- ... - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/doc/autodocs/Makefile.in new/yast2-slp-3.0.2/doc/autodocs/Makefile.in --- old/yast2-slp-3.0.0/doc/autodocs/Makefile.in 2013-07-31 10:47:40.000000000 +0200 +++ new/yast2-slp-3.0.2/doc/autodocs/Makefile.in 2013-09-11 17:42:23.000000000 +0200 @@ -290,8 +290,11 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/doc/slp.html new/yast2-slp-3.0.2/doc/slp.html --- old/yast2-slp-3.0.0/doc/slp.html 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/doc/slp.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -<HTML> -<HEAD> -<TITLE>Slp agent description</TITLE> -<!-- $Id$ --> -</HEAD> -<BODY> -<H1>Slp agent description</H1> -<HR> - -<H2>Purpose</H2> -The Slp agent (<TT>ag_slp</TT>) is used to access <TT>...</TT>. -It is part of YaST2 SCR, the system configuration repository, -used to access configuration data on the target system. The general -SCR API allows <TT>Read()</TT> and <TT>Write()</TT> access to get and -change data. - -<P> -<H2>Implementation</H2> -<TT>...</TT> - -<P> -<I><B>Note:</B> The complete development documentation is available in the -<A HREF="autodocs/index.html"><TT>autodocs/</TT></A> directory.</I> - -<P> -<H2>Interface for slp-agent</H2> -The interface is implemented as a SCR agent with the usual <TT>Read()</TT>, -<TT>Write()</TT> and <TT>Dir()</TT> interface. The path prefix used is - -<UL><TT>.slp</TT></UL> -<TT>...</TT> - -<P> -<H2>Restrictions, limits and future enhancements</H2> -<TT>...</TT> - -<P> -See the <A HREF="TODO.txt">TODO.txt</A> file for the current status of support -and also for the list of possible future enhancements. - -<P> -<H2>Complete Read paths table</H2> -The complete <TT>Write()</TT> paths table is similar to this except for -the paths to which YCPList is returned. - -<TABLE> - <TR><TH WIDTH="30%" ALIGN="left">Path</TH><TH WIDTH="20%" ALIGN="left">Type</TH><TH ALIGN="left">Result</TH></TR> - <TR><TD><TT>.slp</TD><TD ALIGN="left">YCPList</TD> - <TD>list with all available directives (currently sublist of ["alias", "pre-install", "post-install", "options"]</TD></TR> - <TR>...</TR> -</TABLE> - -<P> -<H2>Complete Dir paths table</H2> -The return type of the <TT>Dir()</TT> is always YCPList. - -<TABLE> - <TR><TH WIDTH="40%" ALIGN="left">Path</TH><TH ALIGN="left">Result</TH></TR> - <TR><TD><TT>.slp</TD> - <TD>list with all available directives (currently sublist of ["alias", "pre-install", "post-install", "options"]</TD></TR> - <TR>...</TR> -</TABLE> - -<P> -<ADDRESS> -Anas Nashif <[email protected]><BR> -</ADDRESS> - - -</BODY> -</HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/src/Makefile.am new/yast2-slp-3.0.2/src/Makefile.am --- old/yast2-slp-3.0.0/src/Makefile.am 2013-07-30 13:41:05.000000000 +0200 +++ new/yast2-slp-3.0.2/src/Makefile.am 2013-09-11 17:26:58.000000000 +0200 @@ -3,9 +3,6 @@ module_DATA = \ modules/SLP.rb -client_DATA = \ - clients/slp.rb +EXTRA_DIST = $(module_DATA) -EXTRA_DIST = $(module_DATA) $(client_DATA) - -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/src/Makefile.in new/yast2-slp-3.0.2/src/Makefile.in --- old/yast2-slp-3.0.0/src/Makefile.in 2013-07-31 10:47:40.000000000 +0200 +++ new/yast2-slp-3.0.2/src/Makefile.in 2013-09-11 17:42:23.000000000 +0200 @@ -110,9 +110,8 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(moduledir)" \ - "$(DESTDIR)$(modulebindir)" -DATA = $(client_DATA) $(module_DATA) $(modulebin_DATA) +am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" +DATA = $(module_DATA) $(modulebin_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGENT_LIBADD = @AGENT_LIBADD@ @@ -279,10 +278,7 @@ module_DATA = \ modules/SLP.rb -client_DATA = \ - clients/slp.rb - -EXTRA_DIST = $(module_DATA) $(client_DATA) +EXTRA_DIST = $(module_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) @@ -294,7 +290,7 @@ # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. -NEWDEP = ${top_builddir}/.dep.new +@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new CHECK_SYNTAX = true all: all-am @@ -336,27 +332,6 @@ clean-libtool: -rm -rf .libs _libs -install-clientDATA: $(client_DATA) - @$(NORMAL_INSTALL) - @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(clientdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(clientdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(clientdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(clientdir)" || exit $$?; \ - done - -uninstall-clientDATA: - @$(NORMAL_UNINSTALL) - @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(clientdir)'; $(am__uninstall_files_from_dir) install-moduleDATA: $(module_DATA) @$(NORMAL_INSTALL) @list='$(module_DATA)'; test -n "$(moduledir)" || list=; \ @@ -445,7 +420,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"; do \ + for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -500,8 +475,7 @@ info-am: -install-data-am: install-clientDATA install-moduleDATA \ - install-modulebinDATA +install-data-am: install-moduleDATA install-modulebinDATA install-dvi: install-dvi-am @@ -545,23 +519,21 @@ ps-am: -uninstall-am: uninstall-clientDATA uninstall-moduleDATA \ - uninstall-modulebinDATA +uninstall-am: uninstall-moduleDATA uninstall-modulebinDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ dist-hook distclean distclean-generic distclean-libtool \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-clientDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-moduleDATA install-modulebinDATA \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-clientDATA \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-moduleDATA install-modulebinDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-moduleDATA uninstall-modulebinDATA @@ -572,16 +544,17 @@ # generate dependencies # two steps not to lose the file if the command fails # hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} +@[email protected]: $(wildcard *.ycp) ${ycpchook} +@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} +@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep +@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@-include .dep dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ 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"; \ @@ -591,8 +564,20 @@ echo "Syntax check disabled"; \ fi; \ fi - --include .dep + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/src/clients/slp.rb new/yast2-slp-3.0.2/src/clients/slp.rb --- old/yast2-slp-3.0.0/src/clients/slp.rb 2013-07-30 13:41:05.000000000 +0200 +++ new/yast2-slp-3.0.2/src/clients/slp.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,202 +0,0 @@ -# encoding: utf-8 - -# File: clients/slp.ycp -# Package: SLP -# Summary: SLP Browser -# Authors: Anas Nashif <[email protected]> -# -# $Id$ -# -# Browse SLP services -module Yast - class SlpClient < Client - def main - Yast.import "UI" - Yast.import "SLP" - textdomain "slp" - Yast.import "Wizard" - Yast.import "Label" - - - # list<map> response = SLP::FindSrvs("CIM-Object-Manager"); - @tableItems = [] - @treeItems = [] - - @contents = Top( - VBox( - Table( - Id(:table), - Opt(:notify, :immediate), - Header(_("Type"), _("URL"), _("Lifetime")), - @tableItems - ), - RichText(Id(:attr), "") - ) - ) - - @typeResponse = SLP.FindSrvTypes("*", "") - - @title = _("SLP Browser") - Wizard.CreateTreeDialog - Wizard.SetDesktopTitleAndIcon("slp") - @Tree = fillTree(@typeResponse) - Builtins.y2debug("Tree=%1", @Tree) - Wizard.CreateTree(@Tree, _("Service Types")) - - @help = Builtins.dgettext("base", "No help available") - Wizard.SetContentsButtons( - @title, - @contents, - @help, - Label.BackButton, - Label.FinishButton - ) - - Wizard.HideAbortButton - Wizard.DisableBackButton - - - - @input = nil - @cache = {} - @attrcache = {} - begin - @srvtype = "" - @srv = "" - @event = UI.WaitForEvent - @input = Ops.get(@event, "ID") - if @input == :wizardTree - @input = UI.QueryWidget(Id(:wizardTree), :CurrentItem) - end - - Builtins.y2debug("input: %1", @input) - if Ops.is_string?(@input) - @srvtype = Wizard.QueryTreeItem - elsif @input == :table - @srv = Convert.to_string(UI.QueryWidget(Id(:table), :CurrentItem)) - end - Builtins.y2debug("srvtype: %1", @srvtype) - Builtins.y2debug("srv: %1", @srv) - @srvsResponse = [] - if Builtins.haskey(@cache, @srvtype) - @srvsResponse = Ops.get_list(@cache, @srvtype, []) - else - @srvsResponse = SLP.FindSrvs(@srvtype, "") - Ops.set(@cache, @srvtype, @srvsResponse) - end - @tableItems = fillTable(@srvsResponse) - - @attr = [] - @sum = "" - - Builtins.foreach(@srvsResponse) do |s| - srvurl = Ops.get_string(s, "srvurl", "") - if Builtins.haskey(@attrcache, srvurl) - @attr = Ops.get_list(@attrcache, srvurl, []) - else - Builtins.y2debug("s: %1", s) - @attr = SLP.FindAttrs(srvurl) - Builtins.y2debug("attr: %1", @attr) - Ops.set(@attrcache, srvurl, @attr) - end - end - - if Ops.is_string?(@input) - UI.ChangeWidget(Id(:table), :Items, @tableItems) - @srv = Ops.get_string(@srvsResponse, [0, "srvurl"], "xxx") - @sum = SLP.AttrSummary(Ops.get_list(@attrcache, @srv, [])) - UI.ChangeWidget(Id(:attr), :Value, @sum) - elsif @input == :table - @sum = SLP.AttrSummary(Ops.get_list(@attrcache, @srv, [])) - UI.ChangeWidget(Id(:attr), :Value, @sum) - end - end until @input == :next || @input == :abort || @input == :cancel - - UI.CloseDialog - deep_copy(@input) - # EOF - end - - def createTableItem(srv) - srv = deep_copy(srv) - tabitem = Item() - - srvurl = Ops.get_string(srv, "srvurl", "") - - tabitem = Item( - Id(srvurl), - Builtins.substring(Ops.get_string(srv, "pcSrvType", ""), 8), - Builtins.substring(Ops.get_string(srv, "srvurl", ""), 8), - Ops.get_integer(srv, "lifetime", 0) - ) - deep_copy(tabitem) - end - - # Process Tree Items - def createTreeItem(_Tree, srvType, _Sub) - _Tree = deep_copy(_Tree) - _Sub = deep_copy(_Sub) - _Tree = Wizard.AddTreeItem( - _Tree, - "", - srvType, - Ops.add("service:", srvType) - ) - _Sub = Builtins.filter(_Sub) { |s| s != "" } - Builtins.foreach(_Sub) do |s| - si = Item() - _Id = Ops.add(Ops.add(Ops.add("service:", srvType), ":"), s) - _Tree = Wizard.AddTreeItem(_Tree, Ops.add("service:", srvType), s, _Id) - end - - deep_copy(_Tree) - end - - def fillTable(response) - response = deep_copy(response) - items = Builtins.maplist(response) { |srv| createTableItem(srv) } - - deep_copy(items) - end - - def processTree(typeResponse) - typeResponse = deep_copy(typeResponse) - treeData = {} - Builtins.foreach(typeResponse) do |t| - tok = Builtins.splitstring(t, ":") - s = [] - s = Builtins.add(s, Ops.get(tok, 2, "")) - t1 = Ops.get(tok, 1, "") - if !Builtins.haskey(treeData, t1) - Ops.set(treeData, t1, s) - else - old = Ops.get(treeData, t1, []) - Ops.set( - treeData, - t1, - Convert.convert( - Builtins.union(s, old), - :from => "list", - :to => "list <string>" - ) - ) - end - end - deep_copy(treeData) - end - - - def fillTree(typeResponse) - typeResponse = deep_copy(typeResponse) - _Tree = [] - data = processTree(typeResponse) - Builtins.foreach(data) do |type, sub| - _Tree = createTreeItem(_Tree, type, sub) - end - - deep_copy(_Tree) - end - end -end - -Yast::SlpClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/src/modules/SLP.rb new/yast2-slp-3.0.2/src/modules/SLP.rb --- old/yast2-slp-3.0.0/src/modules/SLP.rb 2013-07-30 13:41:05.000000000 +0200 +++ new/yast2-slp-3.0.2/src/modules/SLP.rb 2013-09-11 17:26:58.000000000 +0200 @@ -12,11 +12,6 @@ module Yast class SLPClass < Module def main - textdomain "slp" - Yast.import "Summary" - Yast.import "HTML" - - @Regd = "/etc/slp.reg.d" end @@ -130,31 +125,6 @@ deep_copy(att) end - # Attribute summary - # @param [Array<String>] Attrs attribute list - # @return [String] summary - def AttrSummary(_Attrs) - _Attrs = deep_copy(_Attrs) - summary = "" - summary = Summary.AddHeader(summary, _("Attributes")) - summary = Summary.OpenList(summary) - Builtins.foreach(_Attrs) do |a| - s = Builtins.substring(a, 1, Ops.subtract(Builtins.size(a), 2)) - aa = Builtins.splitstring(s, "=") - summary = Summary.AddListItem( - summary, - Builtins.sformat( - "%1: %2", - HTML.Bold(Ops.get_string(aa, 0, "")), - Ops.get_string(aa, 1, "") - ) - ) - end - - summary = Summary.CloseList(summary) - summary - end - # Register service with SLP # @param [String] service Service to be registered # @return [Boolean] True on success @@ -232,7 +202,6 @@ publish :function => :UnicastFindAttrs, :type => "list <string> (string, string)" publish :function => :GetUnicastAttrMap, :type => "map <string, string> (string, string)" publish :function => :GetAttrMap, :type => "map <string, string> (string)" - publish :function => :AttrSummary, :type => "string (list <string>)" publish :function => :Reg, :type => "boolean (string)" publish :function => :DeReg, :type => "boolean (string)" publish :function => :RegFile, :type => "boolean (string, map <string, string>, string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/testsuite/Makefile.am new/yast2-slp-3.0.2/testsuite/Makefile.am --- old/yast2-slp-3.0.0/testsuite/Makefile.am 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -# -# Makefile.am for .../agent-slp/testsuite -# - -AUTOMAKE_OPTIONS = dejagnu - -clean-local: - rm -f tmp.err.* tmp.out.* site.exp site.bak - -EXTRA_DIST = README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/testsuite/Makefile.in new/yast2-slp-3.0.2/testsuite/Makefile.in --- old/yast2-slp-3.0.0/testsuite/Makefile.in 2013-07-31 10:47:40.000000000 +0200 +++ new/yast2-slp-3.0.2/testsuite/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Makefile.am for .../agent-slp/testsuite -# -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = testsuite -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ - $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ - $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DEJATOOL = $(PACKAGE) -RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir -EXPECT = expect -RUNTEST = runtest -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AGENT_LIBADD = @AGENT_LIBADD@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINTAINER = @MAINTAINER@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RPMNAME = @RPMNAME@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -STYLESHEET_CSS = @STYLESHEET_CSS@ -STYLESHEET_HTML = @STYLESHEET_HTML@ -STYLESHEET_PDF = @STYLESHEET_PDF@ -STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ -STYLESHEET_YDOC = @STYLESHEET_YDOC@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ -Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ -YDOXYGEN = @YDOXYGEN@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -agentdir = @agentdir@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -clientdir = @clientdir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -desktopdir = @desktopdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -execcompdir = @execcompdir@ -fillupdir = @fillupdir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -imagedir = @imagedir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -moduledir = @moduledir@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgconfigdatadir = @pkgconfigdatadir@ -pkgconfigdir = @pkgconfigdir@ -plugindir = @plugindir@ -potdir = @potdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -schemadir = @schemadir@ -scrconfdir = @scrconfdir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -themedir = @themedir@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -yast2dir = @yast2dir@ -ybindir = @ybindir@ -ydatadir = @ydatadir@ -yncludedir = @yncludedir@ -ystartupdir = @ystartupdir@ -AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = README -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu testsuite/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -check-DEJAGNU: site.exp - srcdir='$(srcdir)'; export srcdir; \ - EXPECT=$(EXPECT); export EXPECT; \ - runtest=$(RUNTEST); \ - if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ - if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ - then :; else exit_status=1; fi; \ - done; \ - else echo "WARNING: could not find 'runtest'" 1>&2; :;\ - fi; \ - exit $$exit_status -site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) - @echo 'Making a new site.exp file ...' - @echo '## these variables are automatically generated by make ##' >site.tmp - @echo '# Do not edit here. If you wish to override these values' >>site.tmp - @echo '# edit the last section' >>site.tmp - @echo 'set srcdir "$(srcdir)"' >>site.tmp - @echo "set objdir `pwd`" >>site.tmp - @echo 'set build_alias "$(build_alias)"' >>site.tmp - @echo 'set build_triplet $(build_triplet)' >>site.tmp - @echo 'set host_alias "$(host_alias)"' >>site.tmp - @echo 'set host_triplet $(host_triplet)' >>site.tmp - @echo 'set target_alias "$(target_alias)"' >>site.tmp - @echo 'set target_triplet $(target_triplet)' >>site.tmp - @list='$(EXTRA_DEJAGNU_SITE_CONFIG)'; for f in $$list; do \ - echo "## Begin content included from file $$f. Do not modify. ##" \ - && cat `test -f "$$f" || echo '$(srcdir)/'`$$f \ - && echo "## End content included from file $$f. ##" \ - || exit 1; \ - done >> site.tmp - @echo "## End of auto-generated content; you can edit from here. ##" >> site.tmp - @if test -f site.exp; then \ - sed -e '1,/^## End of auto-generated content.*##/d' site.exp >> site.tmp; \ - fi - @-rm -f site.bak - @test ! -f site.exp || mv site.exp site.bak - @mv site.tmp site.exp - -distclean-DEJAGNU: - -rm -f site.exp site.bak - -l='$(DEJATOOL)'; for tool in $$l; do \ - rm -f $$tool.sum $$tool.log; \ - done - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-local mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-DEJAGNU distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: check-am install-am install-strip - -.PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ - clean-libtool clean-local distclean distclean-DEJAGNU \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -clean-local: - rm -f tmp.err.* tmp.out.* site.exp site.bak - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.0.0/testsuite/README new/yast2-slp-3.0.2/testsuite/README --- old/yast2-slp-3.0.0/testsuite/README 2013-01-22 12:09:50.000000000 +0100 +++ new/yast2-slp-3.0.2/testsuite/README 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Testsuite for agent-slp. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
