Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-08-22 10:54:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-08-12 11:04:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-08-22 10:54:17.000000000 +0200
@@ -1,0 +2,22 @@
+Thu Aug 22 08:17:06 CEST 2013 - jsuchome@suse.cz
+
+- replace SuSERelease with OSRelease, which uses /etc/os-release
+ (bnc#833955,fate#316268)
+- 3.0.4
+
+-------------------------------------------------------------------
+Tue Aug 13 16:45:59 CEST 2013 - locilka@suse.com
+
+- Changed some y2milestone into y2debug in GetTypeFrom* in
+ NetworkInterfaces to decrease overfilling Yast log
+- 3.0.3
+
+-------------------------------------------------------------------
+Fri Aug 9 07:02:01 UTC 2013 - mfilka@suse.com
+
+- bnc#798620
+ - disabled starting firewall during second stage. It could
+ cause deadlock in systemd initialization sequence.
+- 3.0.2
+
+-------------------------------------------------------------------
Old:
----
yast2-3.0.1.tar.bz2
New:
----
yast2-3.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.bgQ9lZ/_old 2013-08-22 10:54:18.000000000 +0200
+++ /var/tmp/diff_new_pack.bgQ9lZ/_new 2013-08-22 10:54:18.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.0.1
+Version: 3.0.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-3.0.1.tar.bz2 -> yast2-3.0.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/Makefile.am.common new/yast2-3.0.4/Makefile.am.common
--- old/yast2-3.0.1/Makefile.am.common 2013-08-08 14:02:27.000000000 +0200
+++ new/yast2-3.0.4/Makefile.am.common 2013-08-22 08:47:33.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,6 +27,8 @@
${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
cat ${NEWDEP} > .dep
rm ${NEWDEP}
+-include .dep
+endif
dist-hook: check-syntax
@@ -58,4 +61,3 @@
fi; \
fi
--include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/VERSION new/yast2-3.0.4/VERSION
--- old/yast2-3.0.1/VERSION 2013-08-05 12:22:00.000000000 +0200
+++ new/yast2-3.0.4/VERSION 2013-08-22 08:47:26.000000000 +0200
@@ -1 +1 @@
-3.0.1
+3.0.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/autodocs-ycp.ami new/yast2-3.0.4/autodocs-ycp.ami
--- old/yast2-3.0.1/autodocs-ycp.ami 2013-08-08 14:02:27.000000000 +0200
+++ new/yast2-3.0.4/autodocs-ycp.ami 2013-08-22 08:47:33.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-3.0.1/configure new/yast2-3.0.4/configure
--- old/yast2-3.0.1/configure 2013-08-08 14:02:31.000000000 +0200
+++ new/yast2-3.0.4/configure 2013-08-22 08:47:36.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 3.0.1.
+# Generated by GNU Autoconf 2.69 for yast2 3.0.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='3.0.1'
-PACKAGE_STRING='yast2 3.0.1'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='yast2 3.0.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -591,6 +591,8 @@
IFCFG_DIR
MYRUNTEST
MYEXPECT
+HAS_YCP_MODULES_FALSE
+HAS_YCP_MODULES_TRUE
YCPC
YCPMAKEDEP
YCPDOC
@@ -1250,7 +1252,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 3.0.1 to adapt to many kinds of systems.
+\`configure' configures yast2 3.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1321,7 +1323,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 3.0.1:";;
+ short | recursive ) echo "Configuration of yast2 3.0.4:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1403,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 3.0.1
+yast2 configure 3.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1418,7 +1420,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 $as_me 3.0.1, which was
+It was created by yast2 $as_me 3.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2357,7 +2359,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='3.0.1'
+ VERSION='3.0.4'
cat >>confdefs.h <<_ACEOF
@@ -2480,7 +2482,7 @@
-VERSION="3.0.1"
+VERSION="3.0.4"
RPMNAME="yast2"
MAINTAINER="YaST2 Maintainers "
@@ -2854,6 +2856,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
+
# Extract the first word of "expect", so it can be a program name with args.
set dummy expect; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -3125,6 +3150,10 @@
as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" 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
@@ -3522,7 +3551,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 3.0.1, which was
+This file was extended by yast2 $as_me 3.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3575,7 +3604,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 config.status 3.0.1
+yast2 config.status 3.0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/configure.ac new/yast2-3.0.4/configure.ac
--- old/yast2-3.0.1/configure.ac 2013-08-08 14:02:27.000000000 +0200
+++ new/yast2-3.0.4/configure.ac 2013-08-22 08:47:33.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2
dnl
-dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2, 3.0.1, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 3.0.4, http://bugs.opensuse.org/, yast2)
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.1"
+VERSION="3.0.4"
RPMNAME="yast2"
MAINTAINER="YaST2 Maintainers "
@@ -159,6 +159,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
+
dnl Check packages expect and dejagnu
AC_PATH_PROG(MYEXPECT, expect, false)
if test "$MYEXPECT" = "false"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/data/Makefile.in new/yast2-3.0.4/data/Makefile.in
--- old/yast2-3.0.1/data/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/data/Makefile.in 2013-08-22 08:47:37.000000000 +0200
@@ -242,7 +242,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
@@ -489,10 +489,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -523,8 +524,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/doc/autodocs/Makefile.in new/yast2-3.0.4/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/doc/autodocs/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/doc/autodocs/Makefile.in 2013-08-22 08:47:37.000000000 +0200
@@ -240,8 +240,11 @@
AUTODOCS_PM = $(wildcard $(srcdir)/../../library/general/src/modules/*.pm)
AUTODOCS_RB = $(wildcard $(srcdir)/../../library/general/src/modules/*.rb)
+# 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-3.0.1/library/commandline/doc/autodocs/Makefile.in new/yast2-3.0.4/library/commandline/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/commandline/doc/autodocs/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/library/commandline/doc/autodocs/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = commandline
+# 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-3.0.1/library/commandline/src/Makefile.in new/yast2-3.0.4/library/commandline/src/Makefile.in
--- old/yast2-3.0.1/library/commandline/src/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/library/commandline/src/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -247,7 +247,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
@@ -554,10 +554,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -588,8 +589,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/control/doc/autodocs/Makefile.in new/yast2-3.0.4/library/control/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/control/doc/autodocs/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/library/control/doc/autodocs/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = control
+# 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-3.0.1/library/control/src/Makefile.in new/yast2-3.0.4/library/control/src/Makefile.in
--- old/yast2-3.0.1/library/control/src/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/library/control/src/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -247,7 +247,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
@@ -494,10 +494,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -528,8 +529,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/cron/doc/autodocs/Makefile.in new/yast2-3.0.4/library/cron/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/cron/doc/autodocs/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/library/cron/doc/autodocs/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = cron
+# 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-3.0.1/library/cron/src/Makefile.in new/yast2-3.0.4/library/cron/src/Makefile.in
--- old/yast2-3.0.1/library/cron/src/Makefile.in 2013-08-08 14:02:32.000000000 +0200
+++ new/yast2-3.0.4/library/cron/src/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -247,7 +247,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
@@ -554,10 +554,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -588,8 +589,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/cwm/doc/autodocs/Makefile.in new/yast2-3.0.4/library/cwm/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/cwm/doc/autodocs/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/cwm/doc/autodocs/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = cwm
+# 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-3.0.1/library/cwm/src/Makefile.in new/yast2-3.0.4/library/cwm/src/Makefile.in
--- old/yast2-3.0.1/library/cwm/src/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/cwm/src/Makefile.in 2013-08-22 08:47:38.000000000 +0200
@@ -245,7 +245,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
@@ -492,10 +492,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -526,8 +527,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/desktop/doc/autodocs/Makefile.in new/yast2-3.0.4/library/desktop/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/desktop/doc/autodocs/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/desktop/doc/autodocs/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = desktop
+# 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-3.0.1/library/desktop/src/Makefile.in new/yast2-3.0.4/library/desktop/src/Makefile.in
--- old/yast2-3.0.1/library/desktop/src/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/desktop/src/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -242,7 +242,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
@@ -513,10 +513,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -547,8 +548,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/general/src/Makefile.am new/yast2-3.0.4/library/general/src/Makefile.am
--- old/yast2-3.0.1/library/general/src/Makefile.am 2013-07-31 10:41:13.000000000 +0200
+++ new/yast2-3.0.4/library/general/src/Makefile.am 2013-08-22 08:47:26.000000000 +0200
@@ -27,7 +27,7 @@
modules/Event.rb \
modules/Label.rb \
modules/Assert.rb \
- modules/SuSERelease.rb \
+ modules/OSRelease.rb \
modules/PackagesProposal.rb \
modules/Popup.rb \
modules/MailAliases.rb \
@@ -88,4 +88,4 @@
EXTRA_DIST = $(module_DATA) $(client_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(ydata_DATA) $(fillup_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-3.0.1/library/general/src/Makefile.in new/yast2-3.0.4/library/general/src/Makefile.in
--- old/yast2-3.0.1/library/general/src/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/general/src/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -256,7 +256,7 @@
modules/Event.rb \
modules/Label.rb \
modules/Assert.rb \
- modules/SuSERelease.rb \
+ modules/OSRelease.rb \
modules/PackagesProposal.rb \
modules/Popup.rb \
modules/MailAliases.rb \
@@ -327,7 +327,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
@@ -702,10 +702,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -736,8 +737,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/general/src/modules/OSRelease.rb new/yast2-3.0.4/library/general/src/modules/OSRelease.rb
--- old/yast2-3.0.1/library/general/src/modules/OSRelease.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.0.4/library/general/src/modules/OSRelease.rb 2013-08-21 17:46:53.000000000 +0200
@@ -0,0 +1,85 @@
+# encoding: utf-8
+
+# ***************************************************************************
+#
+# Copyright (c) 2002 - 2013 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
+#
+# ***************************************************************************
+#
+# Purpose: Responsible for getting information from the /etc/os-release file
+#
+require "yast"
+
+module Yast
+
+ import "Misc"
+ import "Stage"
+
+ class OSReleaseClass < Module
+ def initialize
+ @file_path = "/etc/os-release"
+ end
+
+ # Get information about the OS release
+ # @param [String] directory containing the installed system (/ in installed system)
+ # @return [String] the release information
+ def ReleaseInformation(directory)
+ MakeNiceName(Misc.CustomSysconfigRead("PRETTY_NAME", "?", directory + @file_path))
+ end
+
+ # Get information about the OS name
+ # Is limited for the currently running product
+ # @return [String] the release information
+ def ReleaseName
+ if Stage.initial
+ return SCR.Read(path(".content.PRODUCT"))
+ end
+ directory = "/" # TODO make this optional argument
+ Misc.CustomSysconfigRead("NAME", "SUSE LINUX", directory + @file_path)
+ end
+
+ # Get information about the OS version
+ # Is limited for the currently running product
+ # @return [String] the release information
+ def ReleaseVersion
+ if Stage.initial
+ return SCR.Read(path(".content.VERSION"))
+ end
+ directory = "/"
+ Misc.CustomSysconfigRead("VERSION_ID", "", directory + @file_path)
+ end
+
+
+ publish :function => :ReleaseInformation, :type => "string (string)"
+ publish :function => :ReleaseName, :type => "string ()"
+ publish :function => :ReleaseVersion, :type => "string ()"
+
+ private
+
+ # Make a nice name for a system out of the long name
+ # @param [String] longname string the long product name
+ # @return [String] nice product name (to be displayed)
+ def MakeNiceName(longname)
+ # remove everything after first left parenthesis and spaces leading to it
+ longname.gsub(/[ ]*\(.*/, "")
+ end
+ end
+
+ OSRelease = OSReleaseClass.new
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/library/general/src/modules/SuSERelease.rb new/yast2-3.0.4/library/general/src/modules/SuSERelease.rb
--- old/yast2-3.0.1/library/general/src/modules/SuSERelease.rb 2013-07-30 14:09:40.000000000 +0200
+++ new/yast2-3.0.4/library/general/src/modules/SuSERelease.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,149 +0,0 @@
-# encoding: utf-8
-
-# ***************************************************************************
-#
-# Copyright (c) 2002 - 2012 Novell, Inc.
-# All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, contact Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail,
-# you may find current contact information at www.novell.com
-#
-# ***************************************************************************
-# Module: SuSERelease.ycp
-#
-# Authors: Jiri Srain
-#
-# Purpose: Responsible for getting information from the /etc/SuSE-release
-# (and similar for other system) file
-#
-# $Id$
-require "yast"
-
-module Yast
- class SuSEReleaseClass < Module
- def main
-
- textdomain "base"
-
- Yast.import "Stage"
- end
-
- # Make a nice name for a system out of the long name
- # @param [String] longname string the long product name
- # @return [String] nice product name (to be displayed)
- def MakeNiceName(longname)
- p1 = Builtins.find(longname, "(")
- return longname if p1 == -1
- while Ops.greater_than(p1, 1) &&
- Builtins.substring(longname, Ops.subtract(p1, 1), 1) == " "
- p1 = Ops.subtract(p1, 1)
- end
- Builtins.substring(longname, 0, p1)
- end
-
- # Find and get the contents of the release file
- # @param [String] directory containing the installed system (/ in installed system)
- # @return [String] contents of the release file
- def ReleaseFileContents(directory)
- ret = "?"
- Builtins.foreach(
- ["/etc/SuSE-release", "/etc/UnitedLinux-release", "/etc/redhat-release"]
- ) do |filename|
- contents = Convert.to_string(
- SCR.Read(path(".target.string"), [Ops.add(directory, filename), "?"])
- )
- if contents != "?"
- Builtins.y2milestone("File with release information: %1", filename)
- ret = contents
- raise Break
- end
- end
- ret
- end
-
- # Get information about the release for displaying in the selection list
- # of found systems
- # @param [String] directory containing the installed system (/ in installed system)
- # @return [String] the release information
- def ReleaseInformation(directory)
- contents = ReleaseFileContents(directory)
- if contents != nil && contents != "?"
- lines = Builtins.splitstring(contents, "\n")
- return MakeNiceName(Ops.get_string(lines, 0, "?"))
- else
- return "?"
- end
- end
-
- # Get information about the release for using in the help text
- # Is limited for the currently running product
- # @param directory containing the installed system (/ in installed system)
- # @return [String] the release information
- def ReleaseName
- if Stage.initial
- return Convert.to_string(SCR.Read(path(".content.PRODUCT")))
- end
- contents = ReleaseFileContents("/")
- if contents != "?"
- lines = Builtins.splitstring(contents, "\n")
- lines = Builtins.filter(lines) { |l| l != "" }
- components = Builtins.splitstring(Ops.get(lines, 0, ""), " ")
- after_version = false
- components = Builtins.maplist(components) do |c|
- after_version = true if Builtins.regexpmatch(c, "^[0-9\\.]+$")
- c = nil if after_version
- c
- end
- components = Builtins.filter(components) { |c| c != nil }
- return Builtins.mergestring(components, " ")
- else
- return "SUSE LINUX"
- end
- end
-
- # Get information about the release
- # Is limited for the currently running product
- # @param directory containing the installed system (/ in installed system)
- # @return [String] the release information
- def ReleaseVersion
- if Stage.initial
- return Convert.to_string(SCR.Read(path(".content.VERSION")))
- end
-
- contents = ReleaseFileContents("/")
- version = ""
-
- if contents != "?"
- lines = Builtins.splitstring(contents, "\n")
- lines = Builtins.filter(lines) { |l| l != "" }
-
- components = Builtins.splitstring(Ops.get(lines, 0, ""), " ")
-
- Builtins.foreach(components) do |c|
- version = c if version == "" && Builtins.regexpmatch(c, "^[0-9\\.]+$")
- end
- end
-
- version
- end
-
- publish :function => :ReleaseInformation, :type => "string (string)"
- publish :function => :ReleaseName, :type => "string ()"
- publish :function => :ReleaseVersion, :type => "string ()"
- end
-
- SuSERelease = SuSEReleaseClass.new
- SuSERelease.main
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/library/gpg/doc/autodocs/Makefile.in new/yast2-3.0.4/library/gpg/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/gpg/doc/autodocs/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/gpg/doc/autodocs/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = gpg
+# 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-3.0.1/library/gpg/src/Makefile.in new/yast2-3.0.4/library/gpg/src/Makefile.in
--- old/yast2-3.0.1/library/gpg/src/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/gpg/src/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -239,7 +239,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
@@ -486,10 +486,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -520,8 +521,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/log/doc/autodocs/Makefile.in new/yast2-3.0.4/library/log/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/log/doc/autodocs/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/log/doc/autodocs/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = log
+# 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-3.0.1/library/log/src/Makefile.in new/yast2-3.0.4/library/log/src/Makefile.in
--- old/yast2-3.0.1/library/log/src/Makefile.in 2013-08-08 14:02:33.000000000 +0200
+++ new/yast2-3.0.4/library/log/src/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -240,7 +240,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
@@ -487,10 +487,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -521,8 +522,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/network/doc/autodocs/Makefile.in new/yast2-3.0.4/library/network/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/network/doc/autodocs/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/network/doc/autodocs/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = network
+# 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-3.0.1/library/network/src/Makefile.in new/yast2-3.0.4/library/network/src/Makefile.in
--- old/yast2-3.0.1/library/network/src/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/network/src/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -262,7 +262,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
@@ -569,10 +569,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -603,8 +604,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/network/src/modules/NetworkInterfaces.rb new/yast2-3.0.4/library/network/src/modules/NetworkInterfaces.rb
--- old/yast2-3.0.1/library/network/src/modules/NetworkInterfaces.rb 2013-07-30 14:09:40.000000000 +0200
+++ new/yast2-3.0.4/library/network/src/modules/NetworkInterfaces.rb 2013-08-14 09:16:53.000000000 +0200
@@ -347,7 +347,7 @@
type = Ops.get(@TypeBySysfs, sys_type)
end
- Builtins.y2milestone(
+ Builtins.y2debug(
"GetTypeFromSysFs: device='%1', sysfs type='%2', type='%3'",
dev,
sys_type,
@@ -404,7 +404,7 @@
type = device_type(dev) if type == nil
- Builtins.y2milestone(
+ Builtins.y2debug(
"GetTypeFromIfcfgOrName: device='%1', type='%2'",
dev,
type
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/library/network/src/modules/SuSEFirewall.rb new/yast2-3.0.4/library/network/src/modules/SuSEFirewall.rb
--- old/yast2-3.0.1/library/network/src/modules/SuSEFirewall.rb 2013-07-30 14:09:40.000000000 +0200
+++ new/yast2-3.0.4/library/network/src/modules/SuSEFirewall.rb 2013-08-12 13:01:54.000000000 +0200
@@ -2528,7 +2528,7 @@
# Always call NI::Read, bnc #396646
NetworkInterfaces.Read
- if Mode.installation || Mode.autoinst
+ if Mode.installation
# Allways modified for installation, allways save the final state
# fixing bug #67355
# SetModified();
@@ -2613,6 +2613,15 @@
# just disabled
return true if !SuSEFirewallIsInstalled()
+ # starting firewall during second stage can cause deadlock in systemd - bnc#798620
+ # Moreover, it is not needed. Firewall gets started via dependency on multi-user.target
+ # when second stage is over.
+ if Mode.installation
+ Builtins.y2milestone( "Do not touch firewall services during installation")
+
+ return true
+ end
+
# Firewall should start after Write()
if GetStartService()
# Not started - start it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/library/packages/doc/autodocs/Makefile.in new/yast2-3.0.4/library/packages/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/packages/doc/autodocs/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/packages/doc/autodocs/Makefile.in 2013-08-22 08:47:39.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = packages
+# 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-3.0.1/library/packages/src/Makefile.in new/yast2-3.0.4/library/packages/src/Makefile.in
--- old/yast2-3.0.1/library/packages/src/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/packages/src/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -254,7 +254,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
@@ -525,10 +525,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -559,8 +560,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/packages/src/modules/Product.rb new/yast2-3.0.4/library/packages/src/modules/Product.rb
--- old/yast2-3.0.1/library/packages/src/modules/Product.rb 2013-07-30 14:09:40.000000000 +0200
+++ new/yast2-3.0.4/library/packages/src/modules/Product.rb 2013-08-22 08:47:26.000000000 +0200
@@ -37,7 +37,7 @@
Yast.import "Mode"
Yast.import "Stage"
- Yast.import "SuSERelease"
+ Yast.import "OSRelease"
Yast.import "PackageLock"
Yast.import "PackageSystem"
@@ -203,8 +203,8 @@
Builtins.y2milestone("PATTERNS: %1", @patterns)
end
elsif !Mode.config
- @short_name = SuSERelease.ReleaseName
- @version = SuSERelease.ReleaseVersion
+ @short_name = OSRelease.ReleaseName
+ @version = OSRelease.ReleaseVersion
@name = Ops.add(Ops.add(@short_name, " "), @version)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/library/runlevel/doc/autodocs/Makefile.in new/yast2-3.0.4/library/runlevel/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/runlevel/doc/autodocs/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/runlevel/doc/autodocs/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = runlevel
+# 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-3.0.1/library/runlevel/src/Makefile.in new/yast2-3.0.4/library/runlevel/src/Makefile.in
--- old/yast2-3.0.1/library/runlevel/src/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/runlevel/src/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -248,7 +248,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
@@ -555,10 +555,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -589,8 +590,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/sequencer/doc/autodocs/Makefile.in new/yast2-3.0.4/library/sequencer/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/sequencer/doc/autodocs/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/sequencer/doc/autodocs/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = sequencer
+# 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-3.0.1/library/sequencer/src/Makefile.in new/yast2-3.0.4/library/sequencer/src/Makefile.in
--- old/yast2-3.0.1/library/sequencer/src/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/sequencer/src/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -242,7 +242,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
@@ -513,10 +513,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -547,8 +548,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/system/doc/autodocs/Makefile.in new/yast2-3.0.4/library/system/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/system/doc/autodocs/Makefile.in 2013-08-08 14:02:34.000000000 +0200
+++ new/yast2-3.0.4/library/system/doc/autodocs/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = system
+# 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-3.0.1/library/system/src/Makefile.in new/yast2-3.0.4/library/system/src/Makefile.in
--- old/yast2-3.0.1/library/system/src/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/system/src/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -264,7 +264,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
@@ -602,10 +602,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -636,8 +637,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/types/doc/autodocs/Makefile.in new/yast2-3.0.4/library/types/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/types/doc/autodocs/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/types/doc/autodocs/Makefile.in 2013-08-22 08:47:40.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = types
+# 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-3.0.1/library/types/src/Makefile.in new/yast2-3.0.4/library/types/src/Makefile.in
--- old/yast2-3.0.1/library/types/src/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/types/src/Makefile.in 2013-08-22 08:47:41.000000000 +0200
@@ -249,7 +249,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
@@ -496,10 +496,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -530,8 +531,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/wizard/doc/autodocs/Makefile.in new/yast2-3.0.4/library/wizard/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/wizard/doc/autodocs/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/wizard/doc/autodocs/Makefile.in 2013-08-22 08:47:41.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = wizard
+# 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-3.0.1/library/wizard/src/Makefile.in new/yast2-3.0.4/library/wizard/src/Makefile.in
--- old/yast2-3.0.1/library/wizard/src/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/wizard/src/Makefile.in 2013-08-22 08:47:41.000000000 +0200
@@ -241,7 +241,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
@@ -488,10 +488,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -522,8 +523,6 @@
fi; \
fi
--include .dep
-
# 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-3.0.1/library/wizard/src/modules/Wizard.rb new/yast2-3.0.4/library/wizard/src/modules/Wizard.rb
--- old/yast2-3.0.1/library/wizard/src/modules/Wizard.rb 2013-07-30 14:09:40.000000000 +0200
+++ new/yast2-3.0.4/library/wizard/src/modules/Wizard.rb 2013-08-22 08:47:26.000000000 +0200
@@ -40,7 +40,7 @@
Yast.import "Label"
Yast.import "Popup"
Yast.import "Directory"
- Yast.import "SuSERelease"
+ Yast.import "OSRelease"
# keep trailing "/" !!
@theme_path = Ops.add(Directory.themedir, "/current")
@@ -813,7 +813,7 @@
#
def CreateDialog
# Set productname for help text
- @product_name = SuSERelease.ReleaseName if @product_name == ""
+ @product_name = OSRelease.ReleaseName if @product_name == ""
UI.SetProductName(@product_name)
OpenNextBackDialog()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.0.1/library/xml/doc/autodocs/Makefile.in new/yast2-3.0.4/library/xml/doc/autodocs/Makefile.in
--- old/yast2-3.0.1/library/xml/doc/autodocs/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/xml/doc/autodocs/Makefile.in 2013-08-22 08:47:41.000000000 +0200
@@ -239,8 +239,11 @@
ystartupdir = @ystartupdir@
AUTODOCS_SUBDIR = xml
+# 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-3.0.1/library/xml/src/Makefile.in new/yast2-3.0.4/library/xml/src/Makefile.in
--- old/yast2-3.0.1/library/xml/src/Makefile.in 2013-08-08 14:02:35.000000000 +0200
+++ new/yast2-3.0.4/library/xml/src/Makefile.in 2013-08-22 08:47:41.000000000 +0200
@@ -238,7 +238,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
@@ -485,10 +485,11 @@
# 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}
+@HAS_YCP_MODULES_TRUE@.dep: $(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) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -519,8 +520,6 @@
fi; \
fi
--include .dep
-
# 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:
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org