Hello community,
here is the log from the commit of package yast2-live-installer
checked in at Tue May 6 18:05:03 CEST 2008.
--------
--- yast2-live-installer/yast2-live-installer.changes 2008-05-01 13:43:48.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-live-installer/yast2-live-installer.changes 2008-05-06 17:38:32.568141000 +0200
@@ -2 +2 @@
-Thu May 1 13:43:43 CEST 2008 - coolo@suse.de
+Tue May 6 17:23:25 CEST 2008 - jsrain@suse.cz
@@ -4 +4,8 @@
-- temprary work around for bnc#382703
+- do not handle automatic/manual configuration, since live
+ installation has now separate workflow (bnc #385558)
+- 2.16.4
+
+-------------------------------------------------------------------
+Tue Apr 15 15:45:15 CEST 2008 - jsrain@suse.cz
+
+- merged texts from proofread
Old:
----
work-around-sax-crash.diff
yast2-live-installer-2.16.3.tar.bz2
New:
----
yast2-live-installer-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.p13216/_old 2008-05-06 18:04:31.000000000 +0200
+++ /var/tmp/diff_new_pack.p13216/_new 2008-05-06 18:04:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-live-installer (Version 2.16.3)
+# spec file for package yast2-live-installer (Version 2.16.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-live-installer
-Version: 2.16.3
-Release: 15
+Version: 2.16.4
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-live-installer-2.16.3.tar.bz2
+Source0: yast2-live-installer-2.16.4.tar.bz2
Prefix: /usr
# Internet and InternetDevices
Requires: yast2 >= 2.16.6
@@ -26,7 +26,6 @@
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildArch: noarch
Summary: YaST2 - Installation from Live Media
-Patch0: work-around-sax-crash.diff
%description
This package contains the YaST component to deploy a live media to the
@@ -39,8 +38,7 @@
Jiri Srain
%prep
-%setup -n yast2-live-installer-2.16.3
-%patch0
+%setup -n yast2-live-installer-2.16.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,10 +67,13 @@
/usr/share/YaST2/modules/LiveInstaller.*
%{prefix}/share/applications/YaST2/live-installer.desktop
%doc %{prefix}/share/doc/packages/yast2-live-installer
-
%changelog
-* Thu May 01 2008 coolo@suse.de
-- temprary work around for bnc#382703
+* Tue May 06 2008 jsrain@suse.cz
+- do not handle automatic/manual configuration, since live
+ installation has now separate workflow (bnc #385558)
+- 2.16.4
+* Tue Apr 15 2008 jsrain@suse.cz
+- merged texts from proofread
* Thu Apr 03 2008 jsrain@suse.cz
- save time zone during installation
- use proper 2nd stage workflow
++++++ yast2-live-installer-2.16.3.tar.bz2 -> yast2-live-installer-2.16.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/configure new/yast2-live-installer-2.16.4/configure
--- old/yast2-live-installer-2.16.3/configure 2008-04-04 13:45:52.000000000 +0200
+++ new/yast2-live-installer-2.16.4/configure 2008-05-06 17:35:55.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-live-installer 2.16.3.
+# Generated by GNU Autoconf 2.61 for yast2-live-installer 2.16.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-live-installer'
PACKAGE_TARNAME='yast2-live-installer'
-PACKAGE_VERSION='2.16.3'
-PACKAGE_STRING='yast2-live-installer 2.16.3'
+PACKAGE_VERSION='2.16.4'
+PACKAGE_STRING='yast2-live-installer 2.16.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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-live-installer 2.16.3 to adapt to many kinds of systems.
+\`configure' configures yast2-live-installer 2.16.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-live-installer 2.16.3:";;
+ short | recursive ) echo "Configuration of yast2-live-installer 2.16.4:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-live-installer configure 2.16.3
+yast2-live-installer configure 2.16.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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-live-installer $as_me 2.16.3, which was
+It was created by yast2-live-installer $as_me 2.16.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2-live-installer'
- VERSION='2.16.3'
+ VERSION='2.16.4'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.16.3"
+VERSION="2.16.4"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
@@ -3402,7 +3402,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-live-installer $as_me 2.16.3, which was
+This file was extended by yast2-live-installer $as_me 2.16.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3445,7 +3445,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-live-installer config.status 2.16.3
+yast2-live-installer config.status 2.16.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/configure.in new/yast2-live-installer-2.16.4/configure.in
--- old/yast2-live-installer-2.16.3/configure.in 2008-04-04 13:45:49.000000000 +0200
+++ new/yast2-live-installer-2.16.4/configure.in 2008-05-06 17:35:48.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-live-installer, 2.16.3, http://bugs.opensuse.org/, yast2-live-installer)
+AC_INIT(yast2-live-installer, 2.16.4, http://bugs.opensuse.org/, yast2-live-installer)
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="2.16.3"
+VERSION="2.16.4"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/live-installer.pot new/yast2-live-installer-2.16.4/live-installer.pot
--- old/yast2-live-installer-2.16.3/live-installer.pot 2008-04-01 10:48:24.000000000 +0200
+++ new/yast2-live-installer-2.16.4/live-installer.pot 2008-04-29 17:15:08.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 10:48+0200\n"
+"POT-Creation-Date: 2008-04-29 17:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,81 +16,6 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/control/live-install.glade:74
-msgid ""
-"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-"\t"
-msgstr ""
-
-#: src/control/live-install.glade:86
-msgid "Copy files to installed system"
-msgstr ""
-
-#: src/control/live-install.glade:93
-msgid "Save configuration"
-msgstr ""
-
-#: src/control/live-install.glade:100
-msgid "Install boot manager"
-msgstr ""
-
-#: src/control/live-install.glade:106
-msgid "Prepare system for initial boot"
-msgstr ""
-
-#: src/control/live-install.glade:121
-msgid "Live Installation Settings"
-msgstr ""
-
-#: src/control/live-install.glade:144
-msgid "Installation"
-msgstr ""
-
-#: src/control/live-install.glade:149
-msgid "Welcome"
-msgstr ""
-
-#: src/control/live-install.glade:153
-msgid "License Agreement"
-msgstr ""
-
-#: src/control/live-install.glade:169 src/control/live-install.glade:173
-msgid "Installation Settings"
-msgstr ""
-
-#: src/control/live-install.glade:178 src/control/live-install.glade:184
-#: src/control/live-install.glade:188 src/control/live-install.glade:192
-#: src/control/live-install.glade:198
-msgid "Perform Installation"
-msgstr ""
-
-#: src/control/live-install.glade:210
-msgid "Configuration"
-msgstr ""
-
-#: src/control/live-install.glade:215
-msgid "root Password"
-msgstr ""
-
-#: src/control/live-install.glade:219
-msgid "Users"
-msgstr ""
-
-#: src/control/live-install.glade:223 src/control/live-install.glade:227
-#: src/control/live-install.glade:237
-msgid "Registration"
-msgstr ""
-
-#: src/control/live-install.glade:241 src/control/live-install.glade:247
-#: src/control/live-install.glade:251
-msgid "Online Update"
-msgstr ""
-
#: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:16
msgid "Software Installation"
msgstr ""
@@ -193,15 +118,15 @@
#: src/inst_live_simple_proposal.ycp:144
msgid ""
"<p>\n"
-"Change the values by clicking on the respective headline\n"
-"or by using the <b>Change Installation Settings</b> button.</p>"
+"To change the values click the respective headline\n"
+"or by press the <b>Change Installation Settings</b> button.</p>"
msgstr ""
#. help text 3/3
#: src/inst_live_simple_proposal.ycp:148
msgid ""
"<p>\n"
-"Your hard disk has not been modified in any way, so you can still safely abort.\n"
+"Your hard disk has not been modified, you can still safely abort.\n"
"</p>"
msgstr ""
@@ -209,7 +134,7 @@
#: src/inst_live_welcome.ycp:14
msgid ""
"<p>Welcome to the &product; installation.\n"
-"Push <b>Next</p> to run the installation wizard.</p>"
+"Press <b>Next</p> to run the installation wizard.</p>"
msgstr ""
#. dialog caption, %1 is product name (typically openSUSE)
@@ -257,16 +182,21 @@
"to continue the installation.\n"
"\n"
"Note that the CD cannot be ejected now. You can eject\n"
-"it after the Live system shuts down or select\n"
+"it after the Live system shuts down or by selecting\n"
"\"Hard Disk\" in the boot menu of the Live CD."
msgstr ""
#. progress step title
-#: src/live_save_config_finish.ycp:49
+#: src/live_save_config_finish.ycp:50
+msgid "Saving language..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:55
msgid "Saving keyboard configuration..."
msgstr ""
#. progress step title
-#: src/live_save_config_finish.ycp:57
+#: src/live_save_config_finish.ycp:64
msgid "Saving time zone..."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/src/inst_live_simple_proposal.ycp new/yast2-live-installer-2.16.4/src/inst_live_simple_proposal.ycp
--- old/yast2-live-installer-2.16.3/src/inst_live_simple_proposal.ycp 2007-08-09 16:20:00.000000000 +0200
+++ new/yast2-live-installer-2.16.4/src/inst_live_simple_proposal.ycp 2008-04-15 15:45:05.000000000 +0200
@@ -109,7 +109,7 @@
contents = add (contents, `Left (`Heading (_("System start-up"))));
contents = add (contents, `Left (`Label (other
? _("Ask whether to boot Linux or existing system")
- : _("Boot only Linux" ))));
+ : _("Boot only Linux"))));
contents = add (contents, `Left (`Label (sformat (_("System start time-out: %1 seconds"), timeout))));
// end of bootloader summary
@@ -142,11 +142,11 @@
Use <b>Accept</b> to perform a new installation with the values displayed.</p>")
// help text 2/3
+ _("<p>
-Change the values by clicking on the respective headline
-or by using the <b>Change Installation Settings</b> button.</p>")
+To change the values click the respective headline
+or by press the <b>Change Installation Settings</b> button.</p>")
// help text 3/3
+ _("<p>
-Your hard disk has not been modified in any way, so you can still safely abort.
+Your hard disk has not been modified, you can still safely abort.
</p>");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/src/inst_live_welcome.ycp new/yast2-live-installer-2.16.4/src/inst_live_welcome.ycp
--- old/yast2-live-installer-2.16.3/src/inst_live_welcome.ycp 2007-08-08 15:21:19.000000000 +0200
+++ new/yast2-live-installer-2.16.4/src/inst_live_welcome.ycp 2008-04-15 15:44:51.000000000 +0200
@@ -12,7 +12,7 @@
// help text 1/1
string help = _("<p>Welcome to the &product; installation.
-Push <b>Next</p> to run the installation wizard.</p>");
+Press <b>Next</p> to run the installation wizard.</p>");
Wizard::SetContents (
// dialog caption, %1 is product name (typically openSUSE)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/src/live-installer.ycp new/yast2-live-installer-2.16.4/src/live-installer.ycp
--- old/yast2-live-installer-2.16.3/src/live-installer.ycp 2008-04-03 14:53:04.000000000 +0200
+++ new/yast2-live-installer-2.16.4/src/live-installer.ycp 2008-05-06 16:55:58.000000000 +0200
@@ -69,10 +69,6 @@
Stage::Set ("initial");
Storage::InitLibstorage ();
- ProductControl::DisableAllModulesAndProposals ("live_installation", "continue");
- ProductControl::EnableModule ("automatic_configuration");
-
-// ProductControl::custom_control_file = LiveInstaller::live_control_file;
if (!ProductControl::Init())
y2error("control file %1 not found", ProductControl::custom_control_file );
ProductControl::AddWizardSteps(stage_mode);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/src/live_runme_at_boot_finish.ycp new/yast2-live-installer-2.16.4/src/live_runme_at_boot_finish.ycp
--- old/yast2-live-installer-2.16.3/src/live_runme_at_boot_finish.ycp 2008-04-01 12:01:56.000000000 +0200
+++ new/yast2-live-installer-2.16.4/src/live_runme_at_boot_finish.ycp 2008-04-15 15:43:27.000000000 +0200
@@ -67,7 +67,7 @@
to continue the installation.
Note that the CD cannot be ejected now. You can eject
-it after the Live system shuts down or select
+it after the Live system shuts down or by selecting
\"Hard Disk\" in the boot menu of the Live CD.");
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.3/VERSION new/yast2-live-installer-2.16.4/VERSION
--- old/yast2-live-installer-2.16.3/VERSION 2008-04-03 14:57:12.000000000 +0200
+++ new/yast2-live-installer-2.16.4/VERSION 2008-05-06 17:35:31.000000000 +0200
@@ -1 +1 @@
-2.16.3
+2.16.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org