Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Wed Dec 16 10:07:20 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-11-29 17:44:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2009-12-13 12:09:39.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 13 11:52:48 CET 2009 - sndirsch@suse.de + +- added xlog2xconf, which is a script to create a minimal xorg.conf + extracted from Xorg.<DISPLAY>.log + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xlog2xconf.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.xNhQ9J/_old 2009-12-16 10:06:09.000000000 +0100 +++ /var/tmp/diff_new_pack.xNhQ9J/_new 2009-12-16 10:06:09.000000000 +0100 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 63 +Release: 64 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -61,6 +61,7 @@ Source5: modprobe.nvidia %endif Source7: xorg-docs-1.4.tar.bz2 +Source8: xlog2xconf.sh Patch1: fpic.diff Patch2: p_default-module-path.diff Patch6: pu_fixes.diff @@ -421,6 +422,7 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \ %buildroot/var/adm/fillup-templates/sysconfig.displaymanager-%name %endif +install -m 755 %_sourcedir/xlog2xconf.sh %buildroot/usr/bin/xlog2xconf %clean rm -rf "$RPM_BUILD_ROOT" @@ -560,6 +562,7 @@ %endif %ifnarch s390 s390x %verify(not mode) /usr/bin/Xorg +/usr/bin/xlog2xconf %endif %ifnarch s390 s390x /usr/bin/cvt ++++++ xlog2xconf.sh ++++++ #!/bin/sh # # Create minimal xorg.conf extracted from Xorg.<DISPLAY>.log # # -c <configfile> (use to specify configfile to create) # -e (edit file with $EDITOR after creation) # -f (overwrite existing <configfile>) # -l <logfile> (use to specify X logfile to read) # if [ $UID -ne 0 ]; then echo "You must be root" exit 1 fi configfile=/etc/X11/xorg.conf editor=false overwrite=false logfile=/var/log/Xorg.0.log while getopts ":c:efl:" opt; do case $opt in c ) configfile=${OPTARG} ;; e ) editor=true ;; f ) overwrite=true ;; l ) logfile=${OPTARG} ;; * ) echo 'usage: minimal-xconfig [-c <configfile>] [-e] [-f] [-l <logfile>]' exit 1 ;; esac done if [ ! -f $logfile ]; then echo "$logfile does not exist." echo "Use \"-l <logfile>\" to specify a different logfile." exit 1 fi if ! grep -q -- "(==) --- Start of built-in configuration ---" $logfile; then echo "$logfile does not contain the required xorg.conf section." echo "Probably it uses a regular xorg.conf." echo "Use \"-l <logfile>\" to specify a different logfile." exit 1 fi if [ -f $configfile -a "$overwrite" == "false" ]; then echo "$configfile already exists." echo "Use \"-f\" to overwrite or \"-c <configfile>\" to specify a different configfile." exit 1 fi begin=false cat $logfile | \ while read line; do if [ "$begin" == "true" ]; then if echo $line | grep -q -- "(==) --- End of built-in configuration ---"; then break else if ! echo $line | grep -q ^Section; then if ! echo $line | grep -q ^EndSection; then echo -n " " fi fi echo $line test "$line" == "EndSection" && echo fi elif echo $line | grep -q -- "(==) --- Start of built-in configuration ---"; then begin=true fi done > $configfile if [ "$editor" == "true" ]; then $EDITOR $configfile else echo "created $configfile" fi exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org