Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Jul 18 23:53:25 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-07-14 15:21:31.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-07-18 16:25:33.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Jul 18 16:14:17 CEST 2006 - jsrain@suse.cz
+
+- fixed vendor URL in congratulate dialog (#187358)
+- 2.13.138
+
+-------------------------------------------------------------------
+Mon Jul 17 10:12:58 CEST 2006 - jsrain@suse.cz
+
+- check if there are any patches available before offering online
+ update (jsuchome)
+- merged inst_default_desktop.ycp to desktop_finish.ycp
+
+-------------------------------------------------------------------
+Sun Jul 16 08:54:55 CEST 2006 - olh@suse.de
+
+- introduce a Linuxrc::display_ip and use it instead of Arch::s390
+- 2.13.137
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.136.tar.bz2
New:
----
yast2-installation-2.13.138.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.fEshfq/_old 2006-07-18 23:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.fEshfq/_new 2006-07-18 23:52:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.136)
+# spec file for package yast2-installation (Version 2.13.138)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,22 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.136
+Version: 2.13.138
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.136.tar.bz2
+Source0: yast2-installation-2.13.138.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
-Requires: yast2 yast2-update
+Requires: yast2-update
Requires: yast2-storage yast2-mouse yast2-country yast2-bootloader
# SignatureCheckDialogs::CheckSignaturesInYaST
Requires: yast2-packager >= 2.13.135
+# Pkg::ResolvableCountPatches
+Requires: yast2-pkg-bindings >= 2.13.89
+# Linuxrc::display_ip
+Requires: yast2 >= 2.13.67
Requires: yast2-network yast2-users
Requires: curl release-notes
Requires: suseRegister
@@ -51,7 +55,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.136
+%setup -n yast2-installation-2.13.138
%build
%{prefix}/bin/y2tool y2autoconf
@@ -119,6 +123,16 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Tue Jul 18 2006 - jsrain@suse.cz
+- fixed vendor URL in congratulate dialog (#187358)
+- 2.13.138
+* Mon Jul 17 2006 - jsrain@suse.cz
+- check if there are any patches available before offering online
+ update (jsuchome)
+- merged inst_default_desktop.ycp to desktop_finish.ycp
+* Sun Jul 16 2006 - olh@suse.de
+- introduce a Linuxrc::display_ip and use it instead of Arch::s390
+- 2.13.137
* Fri Jul 14 2006 - jsrain@suse.cz
- adapted to changes in yast2-packager
- use only one implementation of product license handling (#191523)
++++++ yast2-installation-2.13.136.tar.bz2 -> yast2-installation-2.13.138.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.136/VERSION new/yast2-installation-2.13.138/VERSION
--- old/yast2-installation-2.13.136/VERSION 2006-07-14 15:18:52.000000000 +0200
+++ new/yast2-installation-2.13.138/VERSION 2006-07-18 16:17:43.000000000 +0200
@@ -1 +1 @@
-2.13.136
+2.13.138
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.136/configure new/yast2-installation-2.13.138/configure
--- old/yast2-installation-2.13.136/configure 2006-07-14 15:20:29.000000000 +0200
+++ new/yast2-installation-2.13.138/configure 2006-07-18 16:24:00.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.136.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.138.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.13.136'
-PACKAGE_STRING='yast2-installation 2.13.136'
+PACKAGE_VERSION='2.13.138'
+PACKAGE_STRING='yast2-installation 2.13.138'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-installation 2.13.136 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.138 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.13.136:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.138:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.13.136
+yast2-installation configure 2.13.138
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-installation $as_me 2.13.136, which was
+It was created by yast2-installation $as_me 2.13.138, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.13.136'
+ VERSION='2.13.138'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.136"
+VERSION="2.13.138"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
@@ -2906,7 +2906,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.13.136, which was
+This file was extended by yast2-installation $as_me 2.13.138, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2961,7 +2961,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.13.136
+yast2-installation config.status 2.13.138
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.136/configure.in new/yast2-installation-2.13.138/configure.in
--- old/yast2-installation-2.13.136/configure.in 2006-07-14 15:20:21.000000000 +0200
+++ new/yast2-installation-2.13.138/configure.in 2006-07-18 16:23:52.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.136, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.138, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.136"
+VERSION="2.13.138"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.136/src/clients/desktop_finish.ycp new/yast2-installation-2.13.138/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.13.136/src/clients/desktop_finish.ycp 2006-06-26 08:43:43.000000000 +0200
+++ new/yast2-installation-2.13.138/src/clients/desktop_finish.ycp 2006-07-17 10:13:30.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: desktop_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: desktop_finish.ycp 31885 2006-07-17 08:14:59Z jsrain $
*
*/
@@ -16,8 +16,10 @@
textdomain "installation";
+import "DefaultDesktop";
import "Directory";
import "Mode";
+import "ProductFeatures";
any ret = nil;
string func = "";
@@ -56,9 +58,145 @@
{
doc_server = true;
}
- // this detects WM and DM according to the base slection or
+ // this detects WM and DM according to selected patterns and
// installed packages
- WFM::CallFunction ("inst_default_desktop");
+ if ( !Mode::update () )
+ {
+ map > desktop_data = $[
+ "gnome" : $[
+ "package" : "gdm",
+ "wm" : "gnome",
+ "dm" : "gdm",
+ "cursor" : "Industrial",
+ ],
+ "kde" : $[
+ "package" : "kdebase3-kdm",
+ "wm" : "kde",
+ "dm" : "kdm",
+ "cursor" : "crystalwhite",
+ ],
+ "twm" : $[
+ "package" : "xorg-x11",
+ "wm" : "",
+ "dm" : "xdm",
+ "cursor" : "crystalwhite",
+ ],
+ ];
+
+ string default_wm = "gnome";
+ string default_dm = "gdm";
+ string default_cursor = "Industrial";
+
+ string selected_desktop = DefaultDesktop::Desktop ();
+ if (selected_desktop != "" && selected_desktop != nil)
+ {
+ y2milestone ("Desktop was set to %1", selected_desktop);
+ default_wm = desktop_data[selected_desktop, "wm"]:"";
+ default_dm = desktop_data[selected_desktop, "dm"]:"";
+ default_cursor = desktop_data[selected_desktop, "cursor"]:"";
+ }
+ else
+ {
+ list