Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2015-01-30 06:11:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2015-01-24 22:20:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2015-01-30 06:11:15.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 28 09:35:36 UTC 2015 - [email protected] + +- startx.cpp: + * /usr/X11R6/bin/X --> /usr/bin/X + * /var/X11R6/bin/X --> /var/lib/X11/X +- refreshed patches + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit-suse.patch ++++++ --- /var/tmp/diff_new_pack.Mj4mJc/_old 2015-01-30 06:11:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Mj4mJc/_new 2015-01-30 06:11:16.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xinit-1.3.4.orig/startx.cpp +++ xinit-1.3.4/startx.cpp -@@ -50,10 +50,115 @@ export PATH +@@ -50,10 +50,114 @@ export PATH userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc @@ -69,10 +69,10 @@ +XCOMM check for the first link +XCOMM + -+if [ ! -L /usr/X11R6/bin/X -a ! -L /usr/bin/X ]; then ++if [ ! -L /var/lib/X11/X -a ! -L /usr/bin/X ]; then + + echo "" -+ echo "There is no link /usr/X11R6/bin/X (/usr/bin/Xorg) to /var/X11R6/bin/X!" ++ echo "There is no link /usr/bin/X (/usr/bin/Xorg) to /var/lib/X11/X!" + echo "Please link the files as mentioned above or install the X-Server again." + echo "I'm aborting now." + exit 1 @@ -82,12 +82,11 @@ +XCOMM check for the second link +XCOMM + -+if [ ! -L /var/X11R6/bin/X ]; then ++if [ ! -L /var/lib/X11/X ]; then + + echo "" -+ echo "There is no link /var/X11R6/bin/X to the correct X Server binary." -+ echo "Please configure the correct X Server with SaX/SaX2, which will create" -+ echo "the missing link. I'm aborting now." ++ echo "There is no link /var/lib/X11/X to the correct X Server binary." ++ echo "I'm aborting now." + exit 1 +fi + @@ -95,7 +94,7 @@ +XCOMM check if the Xorg file is an executable or an accidentally copied script or similar things +XCOMM + -+if [ ! -x /var/X11R6/bin/X ]; then ++if [ ! -x /var/lib/X11/X ]; then + + echo "" + echo "The file Xorg (binary of X-Server) doesn't seem to be a binary file." @@ -118,7 +117,7 @@ defaultclientargs="" defaultserverargs="" defaultdisplay=":0" -@@ -300,6 +405,9 @@ EOF +@@ -300,6 +404,9 @@ EOF fi done fi @@ -128,7 +127,7 @@ #if defined(__APPLE__) || defined(__CYGWIN__) eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -@@ -308,6 +416,12 @@ XINIT "$client" $clientargs -- "$server" +@@ -308,6 +415,12 @@ XINIT "$client" $clientargs -- "$server" #endif retval=$? ++++++ xinit-tolerant-hostname-changes.patch ++++++ --- /var/tmp/diff_new_pack.Mj4mJc/_old 2015-01-30 06:11:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Mj4mJc/_new 2015-01-30 06:11:16.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xinit-1.3.4.orig/startx.cpp +++ xinit-1.3.4/startx.cpp -@@ -408,6 +408,7 @@ fi +@@ -407,6 +407,7 @@ fi XCOMM handle TCP port 6000 test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ serverargs="$serverargs -nolisten tcp" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
