Hello community,
here is the log from the commit of package yast2-live-installer
checked in at Fri Aug 10 17:00:40 CEST 2007.
--------
--- yast2-live-installer/yast2-live-installer.changes 2007-08-08 17:16:14.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-live-installer/yast2-live-installer.changes 2007-08-10 12:41:02.840938000 +0200
@@ -1,0 +2,19 @@
+Fri Aug 10 12:33:18 CEST 2007 - jsrain@suse.cz
+
+- fixed several textdomains
+- 2.15.5
+
+-------------------------------------------------------------------
+Thu Aug 9 19:34:13 CEST 2007 - jsrain@suse.cz
+
+- do inform about missing cmdline interface instead of starting
+ GUI (#269890)
+
+-------------------------------------------------------------------
+Thu Aug 9 16:20:48 CEST 2007 - jsrain@suse.cz
+
+- added timezone and keyboard configuration to the installatoin
+ proposal (#297620)
+- 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-live-installer-2.15.3.tar.bz2
New:
----
yast2-live-installer-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.xg3638/_old 2007-08-10 17:00:31.000000000 +0200
+++ /var/tmp/diff_new_pack.xg3638/_new 2007-08-10 17:00:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-live-installer (Version 2.15.3)
+# spec file for package yast2-live-installer (Version 2.15.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-live-installer
-Version: 2.15.3
+Version: 2.15.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-live-installer-2.15.3.tar.bz2
+Source0: yast2-live-installer-2.15.5.tar.bz2
prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -34,7 +34,7 @@
Jiri Srain
%prep
-%setup -n yast2-live-installer-2.15.3
+%setup -n yast2-live-installer-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,6 +66,16 @@
%doc %{prefix}/share/doc/packages/yast2-live-installer
%changelog
+* Fri Aug 10 2007 - jsrain@suse.cz
+- fixed several textdomains
+- 2.15.5
+* Thu Aug 09 2007 - jsrain@suse.cz
+- do inform about missing cmdline interface instead of starting
+ GUI (#269890)
+* Thu Aug 09 2007 - jsrain@suse.cz
+- added timezone and keyboard configuration to the installatoin
+ proposal (#297620)
+- 2.15.4
* Wed Aug 08 2007 - jsrain@suse.cz
- added missing help texts
- changed product name to openSUSE (#297609)
++++++ yast2-live-installer-2.15.3.tar.bz2 -> yast2-live-installer-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.3/configure new/yast2-live-installer-2.15.5/configure
--- old/yast2-live-installer-2.15.3/configure 2007-08-08 17:15:31.000000000 +0200
+++ new/yast2-live-installer-2.15.5/configure 2007-08-10 12:40:45.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-live-installer 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-live-installer 2.15.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-live-installer'
PACKAGE_TARNAME='yast2-live-installer'
-PACKAGE_VERSION='2.15.3'
-PACKAGE_STRING='yast2-live-installer 2.15.3'
+PACKAGE_VERSION='2.15.5'
+PACKAGE_STRING='yast2-live-installer 2.15.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,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.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-live-installer 2.15.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-live-installer 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-live-installer 2.15.5:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-live-installer configure 2.15.3
+yast2-live-installer configure 2.15.5
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,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.15.3, which was
+It was created by yast2-live-installer $as_me 2.15.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2-live-installer'
- VERSION='2.15.3'
+ VERSION='2.15.5'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.3"
+VERSION="2.15.5"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
@@ -3356,7 +3356,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.15.3, which was
+This file was extended by yast2-live-installer $as_me 2.15.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3399,7 +3399,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-live-installer config.status 2.15.3
+yast2-live-installer config.status 2.15.5
configured by $0, generated by GNU Autoconf 2.60,
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.15.3/configure.in new/yast2-live-installer-2.15.5/configure.in
--- old/yast2-live-installer-2.15.3/configure.in 2007-08-08 17:15:26.000000000 +0200
+++ new/yast2-live-installer-2.15.5/configure.in 2007-08-10 12:40:42.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.1 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-live-installer, 2.15.3, http://bugs.opensuse.org/, yast2-live-installer)
+AC_INIT(yast2-live-installer, 2.15.5, http://bugs.opensuse.org/, yast2-live-installer)
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.15.3"
+VERSION="2.15.5"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.3/live-installer.pot new/yast2-live-installer-2.15.5/live-installer.pot
--- old/yast2-live-installer-2.15.3/live-installer.pot 2007-07-19 15:01:20.000000000 +0200
+++ new/yast2-live-installer-2.15.5/live-installer.pot 2007-08-10 12:32:08.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-19 15:01+0200\n"
+"POT-Creation-Date: 2007-08-10 12:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -35,116 +35,196 @@
msgid "Save configuration"
msgstr ""
-#: src/control/live-install.glade:95
+#: src/control/live-install.glade:96
msgid "Install boot manager\""
msgstr ""
-#: src/control/live-install.glade:101
+#: src/control/live-install.glade:102
msgid "Prepare system for initial boot\""
msgstr ""
-#: src/control/live-install.glade:116
+#: src/control/live-install.glade:117
msgid "Live Installation Settings"
msgstr ""
-#: src/control/live-install.glade:128
-msgid "Network Configuration"
+#: src/control/live-install.glade:140
+msgid "Installation"
msgstr ""
-#: src/control/live-install.glade:172 src/control/live-install.glade:317
-#: src/control/live-install.glade:322
-msgid "Hardware Configuration"
+#: src/control/live-install.glade:145
+msgid "Welcome"
msgstr ""
-#: src/control/live-install.glade:194
-msgid "Installation"
+#: src/control/live-install.glade:149 src/control/live-install.glade:154
+msgid "Installation Settings"
msgstr ""
-#: src/control/live-install.glade:199
-msgid "Installation Summary"
-msgstr ""
-
-#: src/control/live-install.glade:204 src/control/live-install.glade:210
-#: src/control/live-install.glade:214 src/control/live-install.glade:218
-#: src/control/live-install.glade:224
+#: src/control/live-install.glade:159 src/control/live-install.glade:165
+#: src/control/live-install.glade:169 src/control/live-install.glade:173
+#: src/control/live-install.glade:179
msgid "Perform Installation"
msgstr ""
-#: src/control/live-install.glade:236
+#: src/control/live-install.glade:191
msgid "Configuration"
msgstr ""
-#: src/control/live-install.glade:241
+#: src/control/live-install.glade:196
msgid "root Password"
msgstr ""
-#: src/control/live-install.glade:245
-msgid "Hostname"
+#: src/control/live-install.glade:200
+msgid "Users"
msgstr ""
-#: src/control/live-install.glade:249 src/control/live-install.glade:254
-#: src/control/live-install.glade:258 src/control/live-install.glade:262
+#: src/control/live-install.glade:204
msgid "Network"
msgstr ""
-#: src/control/live-install.glade:266
-msgid "Configure Software Management"
-msgstr ""
-
-#: src/control/live-install.glade:270 src/control/live-install.glade:276
-#: src/control/live-install.glade:280
+#: src/control/live-install.glade:208 src/control/live-install.glade:218
+#: src/control/live-install.glade:224 src/control/live-install.glade:228
msgid "Online Update"
msgstr ""
-#: src/control/live-install.glade:290 src/control/live-install.glade:294
#: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:16
msgid "Software Installation"
msgstr ""
-#: src/control/live-install.glade:298 src/control/live-install.glade:303
-msgid "Users"
+#: src/inst_live_doit.ycp:140
+#, ycp-format
+msgid "Copying %1..."
+msgstr ""
+
+#. Headline for last dialog of base installation: Install LILO etc.
+#: src/inst_live_doit.ycp:175
+msgid "Copying the Live Image to Hard Disk"
msgstr ""
-#: src/control/live-install.glade:307
-msgid "Clean Up"
+#: src/inst_live_doit.ycp:178
+msgid "Evaluate filesystems to copy"
msgstr ""
-#: src/control/live-install.glade:313
-msgid "Release Notes"
+#: src/inst_live_doit.ycp:178
+msgid "Copy root filesystem"
+msgstr ""
+
+#: src/inst_live_doit.ycp:178
+msgid "Copy additional filesystems"
msgstr ""
-#: src/inst_live_doit.ycp:100
+#: src/inst_live_doit.ycp:186
+msgid "Evaluating filesystems to copy..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:189
+msgid "Copying root filesystem..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:198
+msgid "Finished."
+msgstr ""
+
+#. dialog caption
+#: src/inst_live_simple_proposal.ycp:22 src/inst_live_simple_proposal.ycp:155
+msgid "Installation settings"
+msgstr ""
+
+#. label
+#: src/inst_live_simple_proposal.ycp:24
+msgid "Analyzing the system..."
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:84
#, ycp-format
-msgid "Copying %1..."
+msgid "Use %1%% of disk %2 for Linux"
msgstr ""
-#. Headline for last dialog of base installation: Install LILO etc.
-#: src/inst_live_doit.ycp:133
-msgid "Copying the Live Image to Hard Disk"
+#: src/inst_live_simple_proposal.ycp:88
+#, ycp-format
+msgid "Do not use disk %1"
msgstr ""
-#: src/inst_live_doit.ycp:136
-msgid "Copy root filesystem"
+#: src/inst_live_simple_proposal.ycp:92
+msgid "Partitioning"
msgstr ""
-#: src/inst_live_doit.ycp:136
-msgid "Evaluate additional filesystems"
+#: src/inst_live_simple_proposal.ycp:109
+msgid "System start-up"
msgstr ""
-#: src/inst_live_doit.ycp:136
-msgid "Copy additional filesystems"
+#: src/inst_live_simple_proposal.ycp:111
+msgid "Ask whether to boot Linux or existing system"
msgstr ""
-#: src/inst_live_doit.ycp:144
-msgid "Copying root filesystem..."
+#: src/inst_live_simple_proposal.ycp:112
+msgid "Boot only Linux"
msgstr ""
-#: src/inst_live_doit.ycp:147
-msgid "Evaluating additional filesystems..."
+#: src/inst_live_simple_proposal.ycp:113
+#, ycp-format
+msgid "System start time-out: %1 seconds"
msgstr ""
-#: src/inst_live_doit.ycp:152
-msgid "Finished."
+#: src/inst_live_simple_proposal.ycp:119
+msgid "Keyboard"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:126
+msgid "Time Zone"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:136
+msgid "Change Installation Settings"
+msgstr ""
+
+#. help text 1/3
+#: src/inst_live_simple_proposal.ycp:141
+msgid ""
+"<p>\n"
+"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
+msgstr ""
+
+#. help text 2/3
+#: 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>"
+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"
+"</p>"
+msgstr ""
+
+#. help text 1/1
+#: src/inst_live_welcome.ycp:14
+msgid ""
+"<p>Welcome to the &product; installation.\n"
+"Push <b>Next</p> to run the installation wizard.</p>"
+msgstr ""
+
+#. dialog caption, %1 is product name (typically openSUSE)
+#: src/inst_live_welcome.ycp:19
+#, ycp-format
+msgid "Welcome to %1 installation"
+msgstr ""
+
+#. wellcome label, %1 is product name
+#: src/inst_live_welcome.ycp:21
+#, ycp-format
+msgid ""
+"Your %1 will be installed quickly\n"
+"and easily in a few steps.\n"
+"You will only have to answer some questions."
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line interface
+#: src/live-installer.ycp:27
+msgid "There is no user interface available for this module."
msgstr ""
#. progress step title
@@ -163,3 +243,13 @@
"Reboot the computer without the Live CD in the drive\n"
"to continue the installation."
msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:48
+msgid "Saving keyboard configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:52
+msgid "Saving time zone..."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.3/src/control/live-install.xml new/yast2-live-installer-2.15.5/src/control/live-install.xml
--- old/yast2-live-installer-2.15.3/src/control/live-install.xml 2007-08-02 10:53:43.000000000 +0200
+++ new/yast2-live-installer-2.15.5/src/control/live-install.xml 2007-08-09 14:08:41.000000000 +0200
@@ -89,6 +89,7 @@
<label>Save configuration</label>
<steps config:type="list">
<step>ldconfig</step>
+ <step>live_save_config</step>
</steps>
@@ -122,6 +123,8 @@
hwinfo
partitions
bootloader
+ keyboard
+ timezone
</proposal>
</proposals>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.3/src/inst_live_simple_proposal.ycp new/yast2-live-installer-2.15.5/src/inst_live_simple_proposal.ycp
--- old/yast2-live-installer-2.15.3/src/inst_live_simple_proposal.ycp 2007-08-08 15:22:13.000000000 +0200
+++ new/yast2-live-installer-2.15.5/src/inst_live_simple_proposal.ycp 2007-08-09 16:20:00.000000000 +0200
@@ -12,6 +12,8 @@
import "Storage";
import "HTML";
import "Label";
+import "Keyboard";
+import "Timezone";
textdomain "live-installer";
@@ -39,6 +41,20 @@
]
);
+WFM::CallFunction ( "timezone_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
+WFM::CallFunction ( "keyboard_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
term contents = `VBox ();
// partitioning summary
@@ -89,7 +105,7 @@
other = true;
});
-contents = add (contents, `VSpacing (2));
+contents = add (contents, `VSpacing (1));
contents = add (contents, `Left (`Heading (_("System start-up"))));
contents = add (contents, `Left (`Label (other
? _("Ask whether to boot Linux or existing system")
@@ -97,6 +113,20 @@
contents = add (contents, `Left (`Label (sformat (_("System start time-out: %1 seconds"), timeout))));
// end of bootloader summary
+// keyboard entry
+
+contents = add (contents, `VSpacing (1));
+contents = add (contents, `Left (`Heading (_("Keyboard"))));
+contents = add (contents, `Left (`Label (Keyboard::MakeProposal (false, false))));
+
+// end of keyboard entry
+// timezone entry
+
+contents = add (contents, `VSpacing (1));
+contents = add (contents, `Left (`Heading (_("Time Zone"))));
+contents = add (contents, `Left (`Label (Timezone::timezone)));
+
+// end of timezone entry
contents = `HBox (`HSpacing (2), contents, `HSpacing (2));
contents = `VBox (
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.3/src/live-installer.ycp new/yast2-live-installer-2.15.5/src/live-installer.ycp
--- old/yast2-live-installer-2.15.3/src/live-installer.ycp 2007-08-08 12:55:11.000000000 +0200
+++ new/yast2-live-installer-2.15.5/src/live-installer.ycp 2007-08-10 12:32:04.000000000 +0200
@@ -4,7 +4,7 @@
* $Id: firstboot.ycp 36560 2007-02-28 12:40:38Z lslezak $
*/
{
- textdomain "firstboot";
+ textdomain "live-installer";
import "Mode";
import "Stage";
@@ -16,7 +16,17 @@
import "Installation";
import "Storage";
import "Product";
+ import "CommandLine";
+ // Bugzilla #269890, CommanLine "support"
+ // argmap is only a map, CommandLine uses string parameters
+ if (size (WFM::Args()) > 0) {
+ Mode::SetUI ("commandline");
+ y2milestone ("Mode CommandLine not supported, exiting...");
+ // TRANSLATORS: error message - the module does not provide command line interface
+ CommandLine::Print(_("There is no user interface available for this module."));
+ return nil;
+ }
Wizard::OpenNextBackStepsDialog();
Installation::destdir = "/mnt";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.3/VERSION new/yast2-live-installer-2.15.5/VERSION
--- old/yast2-live-installer-2.15.3/VERSION 2007-08-08 16:24:05.000000000 +0200
+++ new/yast2-live-installer-2.15.5/VERSION 2007-08-10 12:34:52.000000000 +0200
@@ -1 +1 @@
-2.15.3
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org