Hello community,
here is the log from the commit of package sax2
checked in at Sun Mar 30 12:09:09 CEST 2008.
--------
--- sax2/sax2.changes 2008-03-21 21:46:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-03-29 13:32:18.400019000 +0100
@@ -1,0 +2,6 @@
+Sat Mar 29 13:29:39 CET 2008 - ms@suse.de
+
+- yet another gt3 to qt4 porting bug, fixed importing
+ keyboard configuration information (bnc #373700)
+
+-------------------------------------------------------------------
Old:
----
disable-vmmouse.diff
enable-zapwarning.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.rK2282/_old 2008-03-30 12:08:37.000000000 +0200
+++ /var/tmp/diff_new_pack.rK2282/_new 2008-03-30 12:08:37.000000000 +0200
@@ -40,7 +40,7 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 381
+Release: 386
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -50,10 +50,6 @@
%if %{suse_version} > 1020
Patch: sax2.dif
%endif
-%if %{suse_version} > 1030
-Patch1: enable-zapwarning.diff
-%endif
-Patch2: disable-vmmouse.diff
%description
This package contains the SuSE Advanced X-Configuration
@@ -65,6 +61,7 @@
Marcus Sch�fer
%package -n sax2-tools
+License: GPL v2 or later
Summary: X Window System tools for SaX2
Group: System/X11/Utilities
Requires: coreutils
@@ -94,6 +91,7 @@
Marcus Sch�fer
%package -n sax2-ident
+License: LGPL v2.1 or later
Summary: SaX2 identity and profile information
Group: System/X11/Utilities
Provides: sax2:/usr/share/sax/sysp/maps/Identity.map
@@ -114,6 +112,7 @@
Marcus Sch�fer
%package -n sax2-gui
+License: GPL v2 or later
Requires: netpbm sax2-tools icewm-bin sax2
Summary: SuSE advanced X Window System-configuration GUI
Group: System/X11/Utilities
@@ -129,6 +128,7 @@
Marcus Sch�fer
%package -n sax2-libsax
+License: GPL v2 or later
Requires: perl = %{perl_version}
Requires: sax2-tools sax2-libsax-perl icewm-bin
%if %{suse_version} <= 1020
@@ -150,6 +150,7 @@
Marcus Sch�fer
%package -n sax2-libsax-devel
+License: GPL v2 or later
Requires: sax2-libsax = %version
Summary: SaX header files for X Window System-configuration
Group: Development/Libraries/X11
@@ -165,6 +166,7 @@
Marcus Sch�fer
%package -n sax2-libsax-perl
+License: GPL v2 or later
Requires: perl = %{perl_version}
Summary: Language binding to use libsax with perl
Group: Development/Libraries/X11
@@ -180,6 +182,7 @@
Marcus Sch�fer
%package -n sax2-libsax-python
+License: GPL v2 or later
Requires: sax2-libsax
Summary: Language binding to use libsax with python
Group: Development/Libraries/X11
@@ -198,6 +201,7 @@
%if %{build_java}
%package -n sax2-libsax-java
+License: GPL v2 or later
Requires: sax2-libsax jre1.2.x
Summary: Language binding to use libsax with java
Group: Development/Libraries/X11
@@ -219,10 +223,6 @@
%if %{suse_version} > 1020
%patch
%endif
-%if %{suse_version} > 1030
-%patch1
-%endif
-%patch2
%build
test -e /.buildenv && . /.buildenv
@@ -462,6 +462,9 @@
%endif
%changelog
+* Sat Mar 29 2008 ms@suse.de
+- yet another gt3 to qt4 porting bug, fixed importing
+ keyboard configuration information (bnc #373700)
* Fri Mar 21 2008 sndirsch@suse.de
- disable-vmmouse.diff
* no longer use vmmouse driver by default (bnc #372189)
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/keyboard/keyboardlayout.cpp new/sax/api/keyboard/keyboardlayout.cpp
--- old/sax/api/keyboard/keyboardlayout.cpp 2008-01-24 13:01:16.000000000 +0100
+++ new/sax/api/keyboard/keyboardlayout.cpp 2008-03-28 12:26:40.000000000 +0100
@@ -218,11 +218,15 @@
QString baseLayout;
QString baseVariant;
if (! XKBLayouts.isEmpty()) {
- baseLayout = *XKBLayouts.front();
+ foreach (baseLayout,XKBLayouts) {
+ break;
+ }
XKBLayouts.removeFirst();
}
if (! XKBVariants.isEmpty()) {
- baseVariant = XKBVariants.front();
+ foreach (baseVariant,XKBVariants) {
+ break;
+ }
XKBVariants.removeFirst();
}
int varCount = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/init.pl new/sax/init.pl
--- old/sax/init.pl 2007-09-04 16:51:22.000000000 +0200
+++ new/sax/init.pl 2008-03-27 15:52:34.000000000 +0100
@@ -183,7 +183,7 @@
# ServerFlags specification
#------------------------------------------
$var{ServerFlags}{0}{AllowMouseOpenFail} = "on";
- #$var{ServerFlags}{0}{DontZap} = "yes";
+ $var{ServerFlags}{0}{ZapWarning} = "on";
$var{ServerFlags}{0}{"blank time"} = "";
$var{ServerFlags}{0}{"standby time"} = "";
$var{ServerFlags}{0}{"suspend time"} = "";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/profile/automatic/input/hp-mouse new/sax/profile/automatic/input/hp-mouse
--- old/sax/profile/automatic/input/hp-mouse 2008-02-15 14:44:22.000000000 +0100
+++ new/sax/profile/automatic/input/hp-mouse 2008-03-27 15:52:33.000000000 +0100
@@ -1,5 +1,3 @@
-!remove InputDevice -> [X] -> Option -> Device
-
InputDevice -> [X] -> Identifier = Mouse[[X]]
InputDevice -> [X] -> Driver = evdev
InputDevice -> [X] -> Option -> InputFashion = Mouse
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild 2008-03-19 19:45:39.000000000 +0100
+++ new/sax/svnbuild 2008-03-29 13:34:48.000000000 +0100
@@ -1 +1 @@
-1556
+1562
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/Input.map new/sax/sysp/maps/Input.map
--- old/sax/sysp/maps/Input.map 2008-03-14 13:05:54.000000000 +0100
+++ new/sax/sysp/maps/Input.map 2008-03-29 13:07:58.000000000 +0100
@@ -25,7 +25,8 @@
0x0210 : 0x0018 : xen-mouse
0x03f0 : 0x1126 : hp-mouse
0x80ee : 0x0100 : vbox-mouse
-0x15ad : 0x0100 : vmware-mouse
+# Bug 372189
+#0x15ad : 0x0100 : vmware-mouse
# Keyboards
# Microsoft Natural Ergonomic Keyboard 4000
# ---> is profile: microsoft-natural
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org