Hello community,
here is the log from the commit of package sax2 for openSUSE:Factory
checked in at Fri Jan 9 01:56:50 CET 2009.
--------
--- sax2/sax2.changes 2008-12-19 14:18:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2009-01-05 15:16:24.000000000 +0100
@@ -1,0 +2,32 @@
+Mon Jan 5 15:15:11 CET 2009 - sndirsch@suse.de
+
+- consider also variant when setting console keyboard; required
+ for cz/sk (bnc #458623)
+
+-------------------------------------------------------------------
+Mon Jan 5 11:01:55 CET 2009 - ms@suse.de
+
+- fixed tmp race problem in SaX2/sax.sh (bnc #460471)
+
+-------------------------------------------------------------------
+Fri Jan 2 23:50:51 CET 2009 - sndirsch@suse.de
+
+- always use '-br' option when starting the Xserver; workarounds
+ configuration of Intel 845G machines (bnc #463288)
+
+-------------------------------------------------------------------
+Fri Jan 2 23:25:42 CET 2009 - sndirsch@suse.de
+
+- added monitor entry for 'Samsung SyncMaster 206BW' (bnc #463320)
+
+-------------------------------------------------------------------
+Fri Jan 2 02:52:53 CET 2009 - sndirsch@suse.de
+
+- added monitor entry for 'ASUS VW246' (bnc #462668)
+
+-------------------------------------------------------------------
+Mon Dec 22 12:12:26 CET 2008 - sndirsch@suse.de
+
+- don't use broken geode driver (bnc #457182)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.I11234/_old 2009-01-09 01:56:29.000000000 +0100
+++ /var/tmp/diff_new_pack.I11234/_new 2009-01-09 01:56:29.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sax2 (Version 8.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -50,7 +50,7 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 546
+Release: 547
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -530,6 +530,20 @@
%endif
%changelog
+* Mon Jan 05 2009 sndirsch@suse.de
+- consider also variant when setting console keyboard; required
+ for cz/sk (bnc #458623)
+* Mon Jan 05 2009 ms@suse.de
+- fixed tmp race problem in SaX2/sax.sh (bnc #460471)
+* Fri Jan 02 2009 sndirsch@suse.de
+- always use '-br' option when starting the Xserver; workarounds
+ configuration of Intel 845G machines (bnc #463288)
+* Fri Jan 02 2009 sndirsch@suse.de
+- added monitor entry for 'Samsung SyncMaster 206BW' (bnc #463320)
+* Fri Jan 02 2009 sndirsch@suse.de
+- added monitor entry for 'ASUS VW246' (bnc #462668)
+* Mon Dec 22 2008 sndirsch@suse.de
+- don't use broken geode driver (bnc #457182)
* Fri Dec 19 2008 sndirsch@suse.de
- xapi.gtx: added missig XKB keys (bnc #450851)
* Fri Dec 19 2008 sndirsch@suse.de
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/data/cdb/Monitors new/sax/api/data/cdb/Monitors
--- old/sax/api/data/cdb/Monitors 2008-11-19 12:09:19.000000000 +0100
+++ new/sax/api/data/cdb/Monitors 2009-01-02 23:25:24.000000000 +0100
@@ -32030,6 +32030,16 @@
}
#==============================================
+# SyncMaster 206BW
+#----------------------------------------------
+SAMSUNG:SYNCMASTER 206BW {
+ Option=DPMS
+ Hsync=30-81
+ Resolution=1680x1050
+ Vsync=56-75
+}
+
+#==============================================
# SYNCMASTER 210T(A)210MP MAGICSYNCMASTER LXA210T(A)
#----------------------------------------------
SAMSUNG:SYNCMASTER 210T(A)210MP MAGICSYNCMASTER LXA210T(A) {
@@ -42344,3 +42354,12 @@
Vsync=50-120
}
+#==============================================
+# ASUS VW246
+#----------------------------------------------
+ASUS:VW246 {
+ DDC=ACI24F2
+ Hsync=30-83
+ Resolution=1920x1080
+ Vsync=56-76
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/keyboard.cpp new/sax/api/keyboard.cpp
--- old/sax/api/keyboard.cpp 2008-07-09 16:09:58.000000000 +0200
+++ new/sax/api/keyboard.cpp 2009-01-05 15:11:05.000000000 +0100
@@ -221,8 +221,9 @@
//------------------------------------
qApp->setOverrideCursor ( Qt::forbiddenCursor );
QString baseLayout = *layouts.begin();
+ QString baseVariant = *variants.begin();
QString complete = "/usr/share/sax/api/macros/setconsolekeyboard.sh "
- + baseLayout;
+ + baseLayout + " " + baseVariant;
log (L_INFO,"Run YaST keyboard module (console keyboard)\n");
Q3Process* proc = new Q3Process ();
proc -> addArgument ("/bin/bash");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/macros/setconsolekeyboard.sh new/sax/api/macros/setconsolekeyboard.sh
--- old/sax/api/macros/setconsolekeyboard.sh 2008-07-09 16:04:30.000000000 +0200
+++ new/sax/api/macros/setconsolekeyboard.sh 2009-01-05 14:45:35.000000000 +0100
@@ -1,18 +1,25 @@
#!/bin/sh
-if [ $# -ne 1 ]; then
- echo "Usage: $(basename $0) "
+if [ $# -ne 1 -a $# -ne 2 ]; then
+ echo "Usage: $(basename $0) [xkb_variant]"
exit 1
fi
+xkblayout="$1"
+if [ "$1" == "cz" -o "$1" == "sk" ]; then
+ if [ "$2" == "qwerty" ]; then
+ xkblayout="$1_qwerty"
+ fi
+fi
+
layout=""
-layout=$(grep -E \"${1}\" /usr/share/YaST2/data/xkblayout2keyboard.ycp | \
+layout=$(grep -E \"${xkblayout}\" /usr/share/YaST2/data/xkblayout2keyboard.ycp | \
cut -d ":" -f 2 | sed -e 's/\"//g' -e 's/,//g' -e 's/ //g')
if [ "$layout" == "" ]; then
- echo "No appropriate console keyboard layout found for $1"
+ echo "No appropriate console keyboard layout found for $1($2)"
exit 1
else
- echo "Setting console keyboard layout to $layout (xkb-layout: $1)"
+ echo "Setting console keyboard layout to $layout (xkb-layout: $1($2))"
yast keyboard set layout=${layout}
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/profile/script/Profile.pm new/sax/profile/script/Profile.pm
--- old/sax/profile/script/Profile.pm 2008-07-24 16:38:30.000000000 +0200
+++ new/sax/profile/script/Profile.pm 2009-01-02 23:45:13.000000000 +0100
@@ -103,7 +103,7 @@
my $xorglogname = "/var/log/Xorg.99.log";
if (($ENV{HW_UPDATE} == 1) || (! -f $xorglogname)) {
my $xc = ProfileCreatePreliminaryConfig();
- qx (Xorg -probeonly -logverbose 255 -xf86config $xc :99 >/dev/null 2>&1);
+ qx (Xorg -probeonly -logverbose 255 -xf86config $xc -br :99 >/dev/null 2>&1);
}
local $/;
open (FD, "<$xorglogname") ||
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/startup/SaX2 new/sax/startup/SaX2
--- old/sax/startup/SaX2 2008-09-23 17:09:32.000000000 +0200
+++ new/sax/startup/SaX2 2009-01-05 11:22:01.000000000 +0100
@@ -16,7 +16,6 @@
#----------------------------------------
function signal {
killall dots.pl 2>/dev/null >/dev/null
- test -n "$TMPFILE" && rm -f $TMPFILE
}
function isTTY {
case `tty` in
@@ -63,31 +62,15 @@
fi
#========================================
-# lookup tmp file for language info...
-#----------------------------------------
-if [ ! "$UID" = 0 ];then
- TMPFILE=`mktemp -q /tmp/sax_lenv.XXXXXX`
- if [ $? -ne 0 ]; then
- echo "SaX: Can't create tmp file, exiting..."
- exit 1
- fi
-fi
-
-#========================================
# test for root privileges...
#----------------------------------------
if [ ! "$UID" = 0 ];then
- #========================================
- # export LANG user environment...
- #----------------------------------------
- echo $LANG >> $TMPFILE
-
echo -n "SaX: root "
if [ -f "$SUX" ];then
$SUX -c "/usr/sbin/SaX2 $*"
else
xhost + localhost > /dev/null 2>/dev/null
- su - -c "/usr/sbin/SaX2 $*"
+ su -c "/usr/sbin/SaX2 $*"
fi
if [ ! "$?" = 0 ];then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/startup/sax.sh new/sax/startup/sax.sh
--- old/sax/startup/sax.sh 2008-09-23 17:39:26.000000000 +0200
+++ new/sax/startup/sax.sh 2009-01-05 11:22:01.000000000 +0100
@@ -347,16 +347,6 @@
fi
#==================================
-# export LANG from user environment
-#----------------------------------
-TMPFILE=`ls -1 /tmp/sax_lenv* 2>/dev/null`
-if [ -f "$TMPFILE" ];then
- export LANG=`cat $TMPFILE`
-else
- export LANG=$LANG
-fi
-
-#==================================
# run the dots...
#----------------------------------
nice -n 19 $DOTS &
@@ -365,7 +355,7 @@
#==================================
# clean sweep...
#----------------------------------
-rm -f $TMPFILE $REF
+rm -f $REF
rm -rf $XFT $ERR
if [ "$REINIT" = 1 ];then
rm -f /var/cache/sax/files/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild 2008-12-19 14:28:43.000000000 +0100
+++ new/sax/svnbuild 2009-01-05 15:27:09.000000000 +0100
@@ -1 +1 @@
-1790
+1796
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/cfg.c new/sax/sysp/cfg.c
--- old/sax/sysp/cfg.c 2008-07-09 03:30:41.000000000 +0200
+++ new/sax/sysp/cfg.c 2009-01-02 23:58:44.000000000 +0100
@@ -336,14 +336,15 @@
str scr ; sprintf(scr,":%d",disp);
str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,disp);
str lgv ; sprintf(lgv,"255");
+ str bground; sprintf(bground,"-br");
Display *dpy = NULL;
int spid = 0;
int hasRR12 = False;
int major, minor;
string result = "";
string proc = qx(
- XWRAPPER,STDOUT,7,"%s %s %s %s %s %s %s",
- XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,scr
+ XWRAPPER,STDOUT,8,"%s %s %s %s %s %s %s %s",
+ XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,bground,scr
);
spid = atoi(proc.c_str());
dpy = XOpenDisplay (scr);
@@ -454,6 +455,7 @@
str scr ; sprintf(scr,":%d",dpy);
str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,dpy);
str lgv ; sprintf(lgv,"255");
+ str bground; sprintf(bground,"-br");
MsgDetect *parse = NULL;
Display *disp = NULL;
int spid = 0;
@@ -461,8 +463,8 @@
if (access(log,R_OK) != 0) {
string proc = qx(
- XWRAPPER,STDOUT,7,"%s %s %s %s %s %s %s",
- XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,scr
+ XWRAPPER,STDOUT,8,"%s %s %s %s %s %s %s %s",
+ XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,bground,scr
);
disp = XOpenDisplay (scr);
if (disp) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.i386 new/sax/sysp/maps/arch/Identity.map.i386
--- old/sax/sysp/maps/arch/Identity.map.i386 2008-11-28 12:51:48.000000000 +0100
+++ new/sax/sysp/maps/arch/Identity.map.i386 2008-12-22 12:11:17.000000000 +0100
@@ -52,7 +52,6 @@
#-----------------------------------#
# Advanced Micro Devices [AMD] Cards
#-----------------------------------#
-NAME=Advanced Micro Devices [AMD]&DEVICE=Geode LX&VID=0x1022&DID=0x2081&SERVER=amd&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
#-----------------------------------#
# Alliance Semiconductor Corporation Cards
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/Identity.map new/sax/sysp/maps/Identity.map
--- old/sax/sysp/maps/Identity.map 2008-11-28 12:51:48.000000000 +0100
+++ new/sax/sysp/maps/Identity.map 2008-12-22 12:11:17.000000000 +0100
@@ -52,7 +52,6 @@
#-----------------------------------#
# Advanced Micro Devices [AMD] Cards
#-----------------------------------#
-NAME=Advanced Micro Devices [AMD]&DEVICE=Geode LX&VID=0x1022&DID=0x2081&SERVER=amd&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
#-----------------------------------#
# Alliance Semiconductor Corporation Cards
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/script/memory.pl new/sax/sysp/script/memory.pl
--- old/sax/sysp/script/memory.pl 2008-07-24 16:37:30.000000000 +0200
+++ new/sax/sysp/script/memory.pl 2009-01-02 23:46:08.000000000 +0100
@@ -17,7 +17,7 @@
my $logs = "/var/log/Xorg.99.log";
my $video;
if (! -f $logs) {
- my $param = "-probeonly -logverbose 255 -verbose -xf86config $ARGV[0]";
+ my $param = "-probeonly -logverbose 255 -verbose -xf86config $ARGV[0] -br";
qx (X $param :99 2>&1);
$code = $? >> 8;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org