Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-01-08 15:21:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "jsuch...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2012-12-22 22:18:53.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-01-08 15:21:46.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 7 13:06:32 CET 2013 - jsuch...@suse.cz
+
+- set new keyboard layout right after selecting (bnc#796589)
+- added SYSTEMCTL_OPTIONS to Firstboot/Second Stage services
+ (bnc#791076)
+- 2.23.7
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.23.6.tar.bz2
New:
----
yast2-installation-2.23.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.OWfMDV/_old 2013-01-08 15:21:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OWfMDV/_new 2013-01-08 15:21:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-installation
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 2.23.6
+Version: 2.23.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ YaST2-Firstboot.service ++++++
--- /var/tmp/diff_new_pack.OWfMDV/_old 2013-01-08 15:21:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OWfMDV/_new 2013-01-08 15:21:47.000000000 +0100
@@ -6,7 +6,7 @@
[Service]
Type=oneshot
-Environment=SYSTEMD_NO_WRAP=1 TERM=linux
+Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.OWfMDV/_old 2013-01-08 15:21:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OWfMDV/_new 2013-01-08 15:21:47.000000000 +0100
@@ -6,7 +6,7 @@
[Service]
Type=oneshot
-Environment=SYSTEMD_NO_WRAP=1 TERM=linux
+Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
++++++ yast2-installation-2.23.6.tar.bz2 -> yast2-installation-2.23.7.tar.bz2
++++++
++++ 5951 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.23.6/VERSION new/yast2-installation-2.23.7/VERSION
--- old/yast2-installation-2.23.6/VERSION 2012-12-21 08:57:42.000000000
+0100
+++ new/yast2-installation-2.23.7/VERSION 2013-01-07 13:10:08.000000000
+0100
@@ -1 +1 @@
-2.23.6
+2.23.7
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.23.6/configure.in
new/yast2-installation-2.23.7/configure.in
--- old/yast2-installation-2.23.6/configure.in 2012-12-21 15:35:31.000000000
+0100
+++ new/yast2-installation-2.23.7/configure.in 2013-01-07 13:44:16.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.23.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.23.6, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 2.23.7, http://bugs.opensuse.org/,
yast2-installation)
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.23.6"
+VERSION="2.23.7"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <jsuch...@suse.cz>"
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.23.6/doc/features/examples/Makefile.am
new/yast2-installation-2.23.7/doc/features/examples/Makefile.am
--- old/yast2-installation-2.23.6/doc/features/examples/Makefile.am
2012-12-21 08:56:34.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/features/examples/Makefile.am
2013-01-07 13:49:23.000000000 +0100
@@ -1,6 +1,6 @@
# Makefile.am for installation/general
#
-EXTRA_DIST = $(wildcard *.xml)
+EXTRA_DIST = $(wildcard *.xml) add_on_products
include $(top_srcdir)/Makefile.am.common
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.23.6/doc/features/examples/add_on_products
new/yast2-installation-2.23.7/doc/features/examples/add_on_products
--- old/yast2-installation-2.23.6/doc/features/examples/add_on_products
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/features/examples/add_on_products
2012-12-21 08:56:34.000000000 +0100
@@ -0,0 +1,3 @@
+http://some.product.repository/url1/
+http://some/product.repository/url2/ /relative/product/path
+http://some.product.repository/url3/ / Product-1 Product-2
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.23.6/doc/inst_images/Makefile.am
new/yast2-installation-2.23.7/doc/inst_images/Makefile.am
--- old/yast2-installation-2.23.6/doc/inst_images/Makefile.am 2012-12-21
08:56:34.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/inst_images/Makefile.am 2013-01-07
13:57:21.000000000 +0100
@@ -1,6 +1,6 @@
SUBDIRS =
-xml_files = $(wildcard *.xml)
+xml_files = $(wildcard *.xml) $(wildcard examples/*.xml)
html_DATA = $(wildcard html/*.html) \
html/yast2docs.css
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.23.6/doc/inst_images/examples/details.xml
new/yast2-installation-2.23.7/doc/inst_images/examples/details.xml
--- old/yast2-installation-2.23.6/doc/inst_images/examples/details.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/inst_images/examples/details.xml
2012-12-21 08:56:34.000000000 +0100
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE details>
+<image_installation_details
+ xmlns="http://www.suse.com/1.0/yast2ns";
+ xmlns:config="http://www.suse.com/1.0/configns";>
+ <details config:type="list">
+ <image>
+ <file>common-base-root.tar.lzma</file>
+ <!-- optional: number of files in archive -->
+ <files>28004</files>
+ <!-- optional: list of RPMs in archive -->
+ <rpms config:type="list">
+ <rpm>ConsoleKit</rpm>
+ <rpm>DirectFB</rpm>
+ <rpm>DirectFB</rpm>
+ <rpm>PolicyKit</rpm>
+ <rpm>...</rpm>
+ </rpms>
+ <size>509624320</size>
+ </image>
+ <image>
+ <file>common-xorg-root.tar.lzma</file>
+ <size>220549120</size>
+ </image>
+ <image>
+ <file>common-qt.tar.lzma</file>
+ <size>10240</size>
+ </image>
+ <!-- one description for one image -->
+ </details>
+</image_installation_details>
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.23.6/doc/inst_images/examples/images.xml
new/yast2-installation-2.23.7/doc/inst_images/examples/images.xml
--- old/yast2-installation-2.23.6/doc/inst_images/examples/images.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/inst_images/examples/images.xml
2012-12-21 08:56:34.000000000 +0100
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!DOCTYPE images>
+<image_installation xmlns="http://www.suse.com/1.0/yast2ns";
xmlns:config="http://www.suse.com/1.0/configns";>
+ <image_sets config:type="list" >
+
+ <image_set>
+ <!--
+ Comma-separated list of patterns included in
+ a particular imageset
+ -->
+ <patterns>kde,x11,enhanced_base</patterns>
+ <archs>i386,ixxx,iyyy</archs>
+ <!--
+ Matches the image->file of image that contains
+ a particular imageset metadata
+ -->
+ <pkg_image>kde-meta.tar.lzma</pkg_image>
+
+ <!--
+ Each imageset can contain one or more images that
+ can be combined among all imagesets...
+ -->
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-root.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-root.tar.bzip2</file>
+ </image>
+
+ <!-- More 'image' items can be added here -->
+
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta.tar.lzma</file>
+ </image>
+ </images>
+ </image_set>
+
+ <!-- More 'image_set' items are usually added here -->
+
+ </image_sets>
+</image_installation>
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.23.6/doc/proposal/Makefile.am
new/yast2-installation-2.23.7/doc/proposal/Makefile.am
--- old/yast2-installation-2.23.6/doc/proposal/Makefile.am 2012-12-21
08:56:34.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/proposal/Makefile.am 2013-01-07
13:43:41.000000000 +0100
@@ -15,7 +15,7 @@
cp @STYLESHEET_CSS@ html
cp -a `pkg-config --variable=yast2dir
yast2-devtools`/data/docbook/images html
-EXTRA_DIST = $(xml_files)
+EXTRA_DIST = $(xml_files) dummy_proposal.ycp
CLEANFILES = $(html_DATA)
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.23.6/doc/proposal/dummy_proposal.ycp
new/yast2-installation-2.23.7/doc/proposal/dummy_proposal.ycp
--- old/yast2-installation-2.23.6/doc/proposal/dummy_proposal.ycp
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.23.7/doc/proposal/dummy_proposal.ycp
2013-01-07 13:33:57.000000000 +0100
@@ -0,0 +1,87 @@
+/**
+ * Module: proposal_dummy.ycp
+ *
+ * $Id$
+ *
+ * Author: Stefan Hundhammer <s...@suse.de>
+ *
+ * Purpose: Proposal function dispatcher - dummy version.
+ * Use this as a template for other proposal dispatchers.
+ * Don't forget to replace all fixed values with real
values!
+ *
+ * See also file proposal-API.txt for details.
+ */
+{
+ textdomain "installation";
+
+ string func = (string) WFM::Args(0);
+ map param = (map) WFM::Args(1);
+ map ret = $[];
+
+ if ( func == "MakeProposal" )
+ {
+ boolean force_reset = param["force_reset" ]:false;
+ boolean language_changed = param["language_changed"]:false;
+
+ // call some function that makes a proposal here:
+ //
+ // DummyMod::MakeProposal( force_reset );
+
+ // Fill return map
+
+ ret =
+ $[
+ "raw_proposal" : [
+ "proposal item #1",
+ "proposal item #2",
+ "proposal item #3"
+ ],
+ "warning" : "This is just a dummy proposal!",
+ "warning_level" : `blocker
+ ];
+ }
+ else if ( func == "AskUser" )
+ {
+ boolean has_next = param["has_next"]:false;
+
+ // call some function that displays a user dialog
+ // or a sequence of dialogs here:
+ //
+ // sequence = DummyMod::AskUser( has_next );
+
+
+ // Fill return map
+
+ ret =
+ $[
+ "workflow_sequence": `next
+ ];
+ }
+ else if ( func == "Description" )
+ {
+ // Fill return map.
+ //
+ // Static values do just nicely here, no need to call a function.
+
+ ret =
+ $[
+ // this is a heading
+ "rich_text_title" : _("Dummy"),
+ // this is a menu entry
+ "menu_title" : _("&Dummy"),
+ "id" : "dummy_stuff"
+ ];
+ }
+ else if ( func == "Write" )
+ {
+ // Fill return map.
+ //
+
+ ret =
+ $[
+ "success" : true
+ ];
+ }
+
+ return ret;
+}
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.23.6/src/clients/inst_complex_welcome.ycp
new/yast2-installation-2.23.7/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.23.6/src/clients/inst_complex_welcome.ycp
2012-12-21 08:56:34.000000000 +0100
+++ new/yast2-installation-2.23.7/src/clients/inst_complex_welcome.ycp
2013-01-07 11:00:55.000000000 +0100
@@ -342,6 +342,8 @@
break;
} else if (ret == `keyboard) {
+ ReadCurrentUIState();
+ Keyboard::Set (keyboard);
Keyboard::user_decision = true;
} else if (ret == `license_agreement) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
