Hello community, here is the log from the commit of package xorg-x11 checked in at Mon Aug 21 17:50:47 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-08-20 22:46:48.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-08-21 17:23:33.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 21 17:09:35 CEST 2006 - sndirsch@suse.de + +- /etc/X11/xinit/xinitrc.common: + * check for kde/startkde/fvwm2/wmlist also in /usr/bin, since + these have moved for openSUSE >= 10.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.PGv7Pu/_old 2006-08-21 17:50:37.000000000 +0200 +++ /var/tmp/diff_new_pack.PGv7Pu/_new 2006-08-21 17:50:37.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cpp fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.1 -Release: 14 +Release: 15 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -410,6 +410,10 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Mon Aug 21 2006 - sndirsch@suse.de +- /etc/X11/xinit/xinitrc.common: + * check for kde/startkde/fvwm2/wmlist also in /usr/bin, since + these have moved for openSUSE >= 10.2 * Sun Aug 20 2006 - sndirsch@suse.de - create compatibility symlinks in X11R6/bin only for SUSE <= 10.1 (exception: xauth) ++++++ xdm.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinitrc.common new/xinitrc.common --- old/xinitrc.common 2006-06-21 10:44:22.000000000 +0200 +++ new/xinitrc.common 2006-08-21 17:22:20.000000000 +0200 @@ -39,14 +39,14 @@ # test -n "$WINDOWMANAGER" && WINDOWMANAGER="$(type -p $WINDOWMANAGER 2>/dev/null)" if test -z "$WINDOWMANAGER" ; then - if test -x /usr/X11R6/bin/kde ; then - WINDOWMANAGER=/usr/X11R6/bin/kde - elif test -x /usr/X11R6/bin/startkde ; then - WINDOWMANAGER=/usr/X11R6/bin/startkde - elif test -x /usr/X11R6/bin/fvwm2 ; then - WINDOWMANAGER=/usr/X11R6/bin/fvwm2 - elif test -x /usr/X11R6/bin/wmlist ; then - for i in $(/usr/X11R6/bin/wmlist) ; do + if test -x /usr/X11R6/bin/kde -o -x /usr/bin/kde; then + WINDOWMANAGER=$(type -p kde) + elif test -x /usr/X11R6/bin/startkde -o -x /usr/bin/startkde; then + WINDOWMANAGER=$(type -p startkde) + elif test -x /usr/X11R6/bin/fvwm2 -o -x /usr/bin/fvwm2; then + WINDOWMANAGER=$(type -p fvwm2) + elif test -x /usr/X11R6/bin/wmlist -o -x /usr/bin/wmlist ; then + for i in $($(type -p wmlist)) ; do WINDOWMANAGER="$(type -p $i 2>/dev/null)" test -n "$WINDOWMANAGER" && break done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de