Hello community,
here is the log from the commit of package yast2-installation
checked in at Sun May 7 17:09:46 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-05-03 10:28:42.000000000 +0200
+++ NOARCH/yast2-installation/yast2-installation.changes 2006-05-05 12:55:24.000000000 +0200
@@ -1,0 +2,17 @@
+Thu May 4 14:31:29 CEST 2006 - jsrain@suse.cz
+
+- added congratulate text to the control file (#170881)
+- 2.13.99
+
+-------------------------------------------------------------------
+Thu May 4 13:10:48 CEST 2006 - jsrain@suse.cz
+
+- disable timeout in popup before installation reboot in case
+ of SSH installation (#160301)
+
+-------------------------------------------------------------------
+Thu May 4 11:21:32 CEST 2006 - locilka@suse.cz
+
+- include proofread message texts
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.97.tar.bz2
New:
----
yast2-installation-2.13.99.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.NjaVks/_old 2006-05-07 17:09:37.000000000 +0200
+++ /var/tmp/diff_new_pack.NjaVks/_new 2006-05-07 17:09:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.97)
+# spec file for package yast2-installation (Version 2.13.99)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.97
+Version: 2.13.99
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.97.tar.bz2
+Source0: yast2-installation-2.13.99.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
@@ -48,7 +48,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.97
+%setup -n yast2-installation-2.13.99
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,14 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Thu May 04 2006 - jsrain@suse.cz
+- added congratulate text to the control file (#170881)
+- 2.13.99
+* Thu May 04 2006 - jsrain@suse.cz
+- disable timeout in popup before installation reboot in case
+ of SSH installation (#160301)
+* Thu May 04 2006 - locilka@suse.cz
+- include proofread message texts
* Wed May 03 2006 - locilka@suse.cz
- Busy cursor when "Contacting server" in suse_register (#171061).
- 2.13.97
++++++ yast2-installation-2.13.97.tar.bz2 -> yast2-installation-2.13.99.tar.bz2 ++++++
++++ 4584 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/VERSION new/yast2-installation-2.13.99/VERSION
--- old/yast2-installation-2.13.97/VERSION 2006-05-03 10:30:21.000000000 +0200
+++ new/yast2-installation-2.13.99/VERSION 2006-05-04 14:35:44.000000000 +0200
@@ -1 +1 @@
-2.13.97
+2.13.99
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/configure.in new/yast2-installation-2.13.99/configure.in
--- old/yast2-installation-2.13.97/configure.in 2006-05-03 10:29:15.000000000 +0200
+++ new/yast2-installation-2.13.99/configure.in 2006-05-05 12:52:42.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+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.96, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.99, 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.96"
+VERSION="2.13.99"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/control/control.xml new/yast2-installation-2.13.99/control/control.xml
--- old/yast2-installation-2.13.97/control/control.xml 2006-04-21 10:48:41.000000000 +0200
+++ new/yast2-installation-2.13.99/control/control.xml 2006-05-04 13:44:25.000000000 +0200
@@ -58,6 +58,17 @@
ldap
printer
+ <texts>
+ <congratulate>
+ <label>
+<p><b>Congratulations!</b></p>
+<p>The installation of &product; on your machine is complete.
+After clicking <b>Finish</b>, you can log in to the system.</p>
+<p>Visit us at %1.</p>
+<p>Have a lot of fun!<br>Your SUSE Development Team</p>
+ </label>
+ </congratulate>
+ </texts>
<proposals config:type="list">
<proposal>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/src/clients/add-on_auto.ycp new/yast2-installation-2.13.99/src/clients/add-on_auto.ycp
--- old/yast2-installation-2.13.97/src/clients/add-on_auto.ycp 2006-03-20 09:19:51.000000000 +0100
+++ new/yast2-installation-2.13.99/src/clients/add-on_auto.ycp 2006-05-04 13:05:28.000000000 +0200
@@ -120,7 +120,7 @@
integer srcid = Pkg::SourceCreate (media, pth);
if (srcid == -1 || srcid == nil)
// error report
- Report::Error (_("Failed to add Add-On Product."));
+ Report::Error (_("Failed to add add-on product."));
sources[media, pth] = srcid;
}
prod["media"] = sources[media, pth]:-1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/src/clients/add-on_proposal.ycp new/yast2-installation-2.13.99/src/clients/add-on_proposal.ycp
--- old/yast2-installation-2.13.97/src/clients/add-on_proposal.ycp 2006-04-18 09:37:11.000000000 +0200
+++ new/yast2-installation-2.13.99/src/clients/add-on_proposal.ycp 2006-05-04 13:05:28.000000000 +0200
@@ -58,9 +58,9 @@
ret = $[
// this is a heading
- "rich_text_title" : _( "Add-on Products" ),
+ "rich_text_title" : _( "Add-On Products" ),
// this is a menu entry
- "menu_title" : _( "Add-on &Products" ),
+ "menu_title" : _( "Add-On &Products" ),
"id" : "add_on"
];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/src/clients/inst_congratulate.ycp new/yast2-installation-2.13.99/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.13.97/src/clients/inst_congratulate.ycp 2006-05-02 15:28:56.000000000 +0200
+++ new/yast2-installation-2.13.99/src/clients/inst_congratulate.ycp 2006-05-04 14:34:04.000000000 +0200
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 30610 2006-05-02 13:28:53Z locilka $
+ * $Id: inst_congratulate.ycp 30695 2006-05-04 12:34:01Z jsrain $
*/
{
@@ -74,19 +74,24 @@
// caption for dialog "Congratulation Dialog"
string caption = _("Installation Completed");
- // congratulation text 1/4
- string text = _("<p><b>Congratulations!</b></p>") +
+ string text = ProductControl::texts["congratulate"]:"";
- // congratulation text 2/4
+ if (text == "") {
+ // congratulation text 1/4
+ text = _("<p><b>Congratulations!</b></p>") +
+
+ // congratulation text 2/4
_("<p>The installation of &product; on your machine is complete.
After clicking <b>Finish</b>, you can log in to the system.</p>
") +
- // congratulation text 3/4
+ // congratulation text 3/4
sformat(_("<p>Visit us at %1.</p>"), vendor_url ) +
- // congratulation text 4/4
+ // congratulation text 4/4
_("<p>Have a lot of fun!<br>Your SUSE Development Team</p>");
+ }
+
term contents = `VBox (
`VSpacing (space),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/src/clients/inst_finish.ycp new/yast2-installation-2.13.99/src/clients/inst_finish.ycp
--- old/yast2-installation-2.13.97/src/clients/inst_finish.ycp 2006-04-18 09:37:11.000000000 +0200
+++ new/yast2-installation-2.13.99/src/clients/inst_finish.ycp 2006-05-04 13:11:41.000000000 +0200
@@ -6,7 +6,7 @@
* Arvin Schnell
* Jiri Srain
*
- * $Id: inst_finish.ycp 30137 2006-04-14 11:25:00Z lslezak $
+ * $Id: inst_finish.ycp 30681 2006-05-04 11:11:37Z jsrain $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -18,6 +18,7 @@
import "AddOnProduct";
import "Installation";
+ import "Linuxrc";
import "Misc";
import "Mode";
import "Stage";
@@ -198,7 +199,10 @@
if (size (Misc::boot_msg) > 0 && !Mode::autoinst ())
{
- Report::DisplayMessages (true, 10);
+ if (Linuxrc::usessh ())
+ Report::DisplayMessages (true, 0);
+ else
+ Report::DisplayMessages (true, 10);
Report::Message (Misc::boot_msg);
Misc::boot_msg = "";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.97/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.99/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.97/src/clients/inst_suse_register.ycp 2006-04-28 09:02:50.000000000 +0200
+++ new/yast2-installation-2.13.99/src/clients/inst_suse_register.ycp 2006-05-04 13:05:28.000000000 +0200
@@ -126,10 +126,10 @@
/* error messages */
- string data_invalid = _("Error: Recieved data is invalid.");
+ string data_invalid = _("Error: Data received is invalid.");
string retrieve_error = _("Error: Could not retrieve data.");
string no_browser_msg = _(
-"No Web browser available
+"No Web browser available.
Run the suse_register command manually."
);
string no_w3m_msg = _(
@@ -185,8 +185,8 @@
string error = _("Error");
string server_error = _("An error occurred while connecting to the server.");
string details = _("Details...");
- string error_msg = _("Error Message");
- string starting_browser = _("Starting Browser...");
+ string error_msg = _("Error");
+ string starting_browser = _("Starting browser...");
/* other string variables */
map information_data = nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...