Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at Thu Jul 30 23:04:20 CEST 2009.
--------
--- yast2-country/yast2-country.changes 2009-07-20 16:56:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2009-07-30 15:44:23.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 30 15:34:27 CEST 2009 - jsuchome@suse.cz
+
+- removed functions working with xorg.conf (bnc#441404)
+- 2.18.14
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.2D5HCu/_old 2009-07-30 23:02:56.000000000 +0200
+++ /var/tmp/diff_new_pack.2D5HCu/_new 2009-07-30 23:02:56.000000000 +0200
@@ -20,7 +20,7 @@
Name: yast2-country
Version: 2.18.13
-Release: 1
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-country-2.18.13.tar.bz2
Prefix: /usr
@@ -112,7 +112,6 @@
/usr/share/YaST2/modules/Console.y*
/usr/share/YaST2/modules/Keyboard.y*
/usr/share/YaST2/modules/Timezone.y*
-/usr/share/YaST2/modules/XLibAPI.pm
%dir /usr/share/YaST2/modules/YaPI
/usr/share/YaST2/modules/YaPI/TIME.pm
/usr/share/YaST2/modules/YaPI/LANGUAGE.pm
++++++ yast2-country-2.18.13.tar.bz2 ++++++
++++ 4096 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-country-2.18.13/keyboard/src/keyboard.ycp new/yast2-country-2.18.13/keyboard/src/keyboard.ycp
--- old/yast2-country-2.18.13/keyboard/src/keyboard.ycp 2008-08-21 08:49:17.000000000 +0200
+++ new/yast2-country-2.18.13/keyboard/src/keyboard.ycp 2009-07-30 15:20:53.000000000 +0200
@@ -54,7 +54,7 @@
*/
define boolean KeyboardWrite () {
- Keyboard::Save (false);
+ Keyboard::Save ();
Service::Restart ("kbd");
return true;
}
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-country-2.18.13/keyboard/src/keyboard_auto.ycp new/yast2-country-2.18.13/keyboard/src/keyboard_auto.ycp
--- old/yast2-country-2.18.13/keyboard/src/keyboard_auto.ycp 2009-06-02 09:19:05.000000000 +0200
+++ new/yast2-country-2.18.13/keyboard/src/keyboard_auto.ycp 2009-07-30 15:20:48.000000000 +0200
@@ -57,7 +57,7 @@
ret = Keyboard::Export ();
}
else if (func == "Write") {
- ret = Keyboard::Save (true);
+ ret = Keyboard::Save ();
}
/**
* Return if configuration was changed
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-country-2.18.13/keyboard/src/modules/Keyboard.ycp new/yast2-country-2.18.13/keyboard/src/modules/Keyboard.ycp
--- old/yast2-country-2.18.13/keyboard/src/modules/Keyboard.ycp 2009-06-02 09:19:05.000000000 +0200
+++ new/yast2-country-2.18.13/keyboard/src/modules/Keyboard.ycp 2009-07-30 15:38:34.000000000 +0200
@@ -87,7 +87,6 @@
import "Package";
import "ProductFeatures";
import "Stage";
- import "XLibAPI";
import "XVersion";
// ------------------------------------------------------------------------
@@ -479,9 +478,8 @@
return
Arch::x11_setup_needed () &&
- ! (Linuxrc::serial_console() || Linuxrc::vnc() || Linuxrc::usessh()) &&
- ((Stage::initial () && !Linuxrc::text ()) ||
- Package::Installed ("yast2-x11"));
+ (Stage::initial () || Stage::firstboot ()) &&
+ ! (Linuxrc::serial_console() || Linuxrc::vnc() || Linuxrc::usessh() || Linuxrc::text ());
}
/**
@@ -611,7 +609,9 @@
y2milestone ("current_kbd %1 model %2", current_kbd, kb_model);
if (current_kbd == "")
{
- y2milestone("Restoring data failed");
+ y2milestone("Restoring data failed, returning defaults");
+ current_kbd = "english-us";
+ kb_model = "pc104";
ret = false;
}
else
@@ -816,41 +816,19 @@
if (Mode::config ())
return;
- // We have three possible sources of information:
+ // We have these possible sources of information:
//
// probed data: - installation initial mode --> probing
// sysconfig: - installation continue mode or normal mode
- // XF86Config: - restoring from sysconfig failed and running system
//
- y2milestone ("Keyboard::Keyboard init:%1 update:%2", Stage::initial (),
- Mode::update () );
+ y2milestone ("initial :%1, update:%2", Stage::initial (), Mode::update ());
+
boolean success = false;
// If not in initial mode try to restore from sysconfig.
if (!Stage::initial () || Mode::live_installation ())
{
success = Restore();
-
- // If this failed and we are in a running system try to restore from
- // X11 Config.
- if (!success && Mode::normal () && x11_setup_needed ())
- {
- // Get the current layout from XF86Config and
- // set keyboard module accordingly.
-
- string current_layout = XLibAPI::getXkbLayout ();
-
- y2milestone("keyboard layout YaST2: %1", current_layout );
-
- // Set the keyboard variables to this value if possible.
- if ( current_layout != "" )
- {
- SetKeyboard (current_layout);
- y2milestone ("Restored data (XF86Config) for keyboard: <%1>",
- current_kbd);
- success = true;
- }
- }
}
else
{
@@ -858,11 +836,10 @@
}
// In initial mode or if restoring failed do probe.
- if(!success || (Stage::initial () && !Mode::live_installation ()))
+ if (!success)
{
// On module entry probe the hardware and set all those data
// needed for public access.
- //
Probe();
}
@@ -890,44 +867,10 @@
/**
- * Updates the X11 keyboard settings (using SaX library)
- * @return boolean - success
- */
-
-global define boolean xf86_update() {
-
- y2milestone ("Storing current keyboard settings into X11 config file...");
-
- map xkbctrl2SaX = $[
- "ModeShift" : "SaX::XKB_MAP_MODESHIFT",
- "Compose" : "SaX::XKB_MAP_COMPOSE",
- "ModeLock" : "SaX::XKB_MAP_MODELOCK",
- "ScrollLock" : "SaX::XKB_MAP_SCROLLLOCK",
- "Meta" : "SaX::XKB_MAP_META",
- "Control" : "SaX::XKB_MAP_CONTROL"
- ];
-
- XLibAPI::setXkbLayout (XkbLayout);
- XLibAPI::setXkbModel (XkbModel);
- XLibAPI::setXkbVariant (XkbLayout, XkbVariant);
- XLibAPI::setXkbMappings ($[
- "SaX::XKB_LEFT_ALT" : xkbctrl2SaX[LeftAlt]:LeftAlt,
- "SaX::XKB_RIGHT_ALT" : xkbctrl2SaX[RightAlt]:RightAlt,
- "SaX::XKB_SCROLL_LOCK" : xkbctrl2SaX[ScrollLock]:ScrollLock,
- "SaX::XKB_RIGHT_CTL" : xkbctrl2SaX[RightCtl]:RightCtl
- ]);
- if (XkbOptions != "")
- XLibAPI::setXkbOptions (splitstring (XkbOptions, ","));
- return XLibAPI::Write ();
-}
-
-
-/**
* Save the current data into a file to be read after a reboot.
*
- * @param boolean update_x11: true if X11 config should be updated
*/
-global define void Save (boolean update_x11) {
+global define void Save () {
if (Mode::update ())
{
@@ -1057,12 +1000,6 @@
y2milestone("NOT marking keyboard as configured (no unique_key)");
}
- // Adapt the X11 config file content to match the current settings
- if (x11_setup_needed() && update_x11 &&(Mode::normal() || Stage::reprobe()))
- {
- xf86_update();
- }
-
y2milestone("Saved data for keyboard: <%1>", current_kbd );
return;
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-country-2.18.13/keyboard/src/modules/Makefile.am new/yast2-country-2.18.13/keyboard/src/modules/Makefile.am
--- old/yast2-country-2.18.13/keyboard/src/modules/Makefile.am 2007-05-18 10:06:19.000000000 +0200
+++ new/yast2-country-2.18.13/keyboard/src/modules/Makefile.am 2009-07-30 15:04:34.000000000 +0200
@@ -1,8 +1,7 @@
# Makefile.am for country/keyboard/src/modules
module_DATA = \
- Keyboard.ycp \
- XLibAPI.pm
+ Keyboard.ycp
EXTRA_DIST = $(module_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-country-2.18.13/keyboard/src/modules/XLibAPI.pm new/yast2-country-2.18.13/keyboard/src/modules/XLibAPI.pm
--- old/yast2-country-2.18.13/keyboard/src/modules/XLibAPI.pm 2007-05-18 10:06:19.000000000 +0200
+++ new/yast2-country-2.18.13/keyboard/src/modules/XLibAPI.pm 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-#
-# XLibAPI.pm
-# wrapper for XLib.pm functions, accessing libsax
-#
-
-package XLibAPI;
-
-use strict;
-use YaST::YCP qw(:LOGGING Boolean sformat);;
-use YaPI;
-use Data::Dumper;
-
-YaST::YCP::Import ("XLib");
-
-our %TYPEINFO;
-
-use strict;
-use Errno qw(ENOENT);
-
-
-# initialize libsax library
-sub initialize {
-
- if (! XLib->isInitialized()) {
- XLib->loadApplication();
- }
-}
-
-# return current X Keyboard Layout
-BEGIN{ $TYPEINFO{getXkbLayout} = ["function", "string"]; }
-sub getXkbLayout {
-
- initialize ();
- return XLib->getXkbLayout ();
-}
-
-# set new X Keyboard Layout
-BEGIN{ $TYPEINFO{setXkbLayout} = ["function", "void", "string"]; }
-sub setXkbLayout {
-
- my ($self, $layout) = @_;
- initialize ();
- XLib->setXkbLayout ($layout);
-}
-
-# set new Xkb model
-BEGIN{ $TYPEINFO{setXkbModel} = ["function", "void", "string"]; }
-sub setXkbModel {
-
- my ($self, $model) = @_;
- initialize ();
- XLib->setXkbModel ($model);
-}
-
-# set new Xkb Variant
-# parameters: layout, variant_for_layout
-BEGIN{ $TYPEINFO{setXkbVariant} = ["function", "void", "string", "string"]; }
-sub setXkbVariant {
-
- my ($self, $layout, $variant) = @_;
- initialize ();
- XLib->setXkbVariant ($layout, $variant);
-}
-
-# set mapping for the special keys (Left/Right-Alt Scroll-Lock and Right Ctrl)
-# parameter: map of type [ special_key_id : mapping_id ]
-BEGIN{ $TYPEINFO{setXkbMappings} = ["function", "void", ["map", "string", "string"]]; }
-sub setXkbMappings {
-
- my ($self, $mappings) = @_;
- initialize ();
- XLib->setXkbMappings ($mappings);
-}
-
-# set Xkb options
-# parameter: list of options
-BEGIN{ $TYPEINFO{setXkbOptions} = ["function", "void", ["list", "string"]]; }
-sub setXkbOptions {
-
- my ($self, $options) = @_;
- initialize ();
- XLib->setXkbOptions ($options);
-}
-
-# write the changes, return true for success
-BEGIN{ $TYPEINFO{Write} = ["function", "boolean"];}
-sub Write {
-
- if (XLib->isInitialized()) {
- return XLib->writeConfiguration ();
- }
- else {
- return 0;
- }
-}
-
-42
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-country-2.18.13/language/src/modules/Language.ycp new/yast2-country-2.18.13/language/src/modules/Language.ycp
--- old/yast2-country-2.18.13/language/src/modules/Language.ycp 2009-07-20 12:29:25.000000000 +0200
+++ new/yast2-country-2.18.13/language/src/modules/Language.ycp 2009-07-27 07:40:29.000000000 +0200
@@ -6,7 +6,7 @@
* Thomas Roelz