Hello community, here is the log from the commit of package sax2 for openSUSE:Factory checked in at Thu May 28 03:41:44 CEST 2009. -------- --- sax2/sax2.changes 2009-05-21 05:11:30.000000000 +0200 +++ sax2/sax2.changes 2009-05-27 22:41:45.000000000 +0200 @@ -1,0 +2,11 @@ +Wed May 27 22:37:52 CEST 2009 - sndirsch@suse.de + +- disabled mouse and keyboard module (bnc #483554) + +------------------------------------------------------------------- +Wed May 27 17:04:05 CEST 2009 - sndirsch@suse.de + +- getPrimary.sh: + * only run 'lspci -vv' for VGA devices (bnc #478164) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.n18323/_old 2009-05-28 03:37:00.000000000 +0200 +++ /var/tmp/diff_new_pack.n18323/_new 2009-05-28 03:37:00.000000000 +0200 @@ -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: 570 +Release: 571 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -530,6 +530,11 @@ %endif %changelog +* Wed May 27 2009 sndirsch@suse.de +- disabled mouse and keyboard module (bnc #483554) +* Wed May 27 2009 sndirsch@suse.de +- getPrimary.sh: + * only run 'lspci -vv' for VGA devices (bnc #478164) * Thu May 21 2009 sndirsch@suse.de - use special profile for ACER-EZ1600 (bnc #504710) * Tue May 19 2009 sndirsch@suse.de ++++++ sax2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/frame.cpp new/sax/api/frame.cpp --- old/sax/api/frame.cpp 2009-03-13 14:50:25.000000000 +0100 +++ new/sax/api/frame.cpp 2009-05-27 22:54:11.000000000 +0200 @@ -357,12 +357,14 @@ mModuleList -> insertItem ( QPixmap(MONITORS_PIXMAP), mText["MonitorModule"] ); +#if 0 mModuleList -> insertItem ( QPixmap(POINTERS_PIXMAP), mText["MouseModule"] ); mModuleList -> insertItem ( QPixmap(KEYBOARD_PIXMAP), mText["KeyboardModule"] ); +#endif mModuleList -> insertItem ( QPixmap(XTABLETS_PIXMAP), mText["TabletModule"] ); @@ -473,6 +475,7 @@ mMonitor -> import(); } } +#if 0 if (selection == mText["MouseModule"]) { mDialogStack -> raiseWidget ( mMouse -> getDialogID() ); if ( mMouse -> needInit() ) { @@ -491,6 +494,7 @@ mKeyboard -> import(); } } +#endif if (selection == mText["TabletModule"]) { mDialogStack -> raiseWidget ( mTablet -> getDialogID() ); if ( mTablet -> needInit() ) { Files old/sax/locale/sax-2008-12-19.tar.gz and new/sax/locale/sax-2008-12-19.tar.gz differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/modules/create/input.pm new/sax/modules/create/input.pm --- old/sax/modules/create/input.pm 2008-06-24 03:20:40.000000000 +0200 +++ new/sax/modules/create/input.pm 2009-05-27 22:53:20.000000000 +0200 @@ -81,6 +81,10 @@ /^Driver/ && do { foreach $n (@list) { if ($n ne "") { + if ($n eq "kbd" || $n eq "mouse" || $n eq "vmmouse") { + push(@result,PrintLine("# Driver \"$n\" will be disabled unless 'Option \"AutoAddDevices\" \"off\"'")); + push(@result,PrintLine("# is set in \"ServerFlags\" section.")); + } push(@result,PrintLine($i,"\"$n\"")); } } Files old/sax/spp/spp.o and new/sax/spp/spp.o differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2009-05-21 05:10:37.000000000 +0200 +++ new/sax/svnbuild 2009-05-27 22:54:47.000000000 +0200 @@ -1 +1 @@ -1856 +1859 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/tools/getPrimary/getPrimary.sh new/sax/tools/getPrimary/getPrimary.sh --- old/sax/tools/getPrimary/getPrimary.sh 2008-07-16 03:01:26.000000000 +0200 +++ new/sax/tools/getPrimary/getPrimary.sh 2009-05-27 22:52:59.000000000 +0200 @@ -26,10 +26,14 @@ # the PCI config space. You can see it in a "lspci -v -v" output. Check # for "Control I/O+" instead of "Control I/O-" for the VGA compatible # devices." -bus_slot_function=$(/sbin/lspci -vv | \ - grep -B2 "Control: I/O+" | \ - grep "VGA compatible" | \ - awk '{print $1}' | head -n 1) +for busid in $(/sbin/lspci -n | grep 0300 | cut -d " " -f 1); do + /sbin/lspci -s $busid -vv | grep -q "Control: I/O+" + if test $? -eq 0; then + bus_slot_function=$busid + break; + fi +done + test "$bus_slot_function" == "" && fallback # search for SaX2 ChipID ("sysp -c" is the same as "sax2 -p") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org