X Strike Force X.Org X11 SVN commit: r1333 - in branches/modular/app/xbase-clients/debian: . patches
Author: dnusinow
Date: 2006-02-26 19:13:30 -0500 (Sun, 26 Feb 2006)
New Revision: 1333
Added:
branches/modular/app/xbase-clients/debian/patches/02_startx_hostname.diff
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/patches/series
Log:
* Port patches from trunk
+ general/014_startx_hostname_fix.diff
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:10:27 UTC (rev 1332)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:13:30 UTC (rev 1333)
@@ -3,8 +3,10 @@
* Add an empty /var/lib/xkb directory so that the server loads the correct
keymaps. Thanks Silvestre Zabala, Eugene Konev, and Daniel Stone.
(closes: #354130)
+ * Port patches from trunk
+ + general/014_startx_hostname_fix.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 16:53:21 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 19:12:32 -0500
xbase-clients (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/app/xbase-clients/debian/patches/02_startx_hostname.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/02_startx_hostname.diff 2006-02-27 00:10:27 UTC (rev 1332)
+++ branches/modular/app/xbase-clients/debian/patches/02_startx_hostname.diff 2006-02-27 00:13:30 UTC (rev 1333)
@@ -0,0 +1,32 @@
+Index: xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp
+===================================================================
+--- xbase-clients.orig/xinit-X11R7.0-1.0.1/startx.cpp 2006-02-18 14:56:27.000000000 -0500
++++ xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp 2006-02-26 19:11:55.000000000 -0500
+@@ -172,18 +172,17 @@
+
+ #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
+ XCOMM set up default Xauth info for this machine
+-case `uname` in
+-Linux*)
+- if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
++
++XCOMM check for GNU hostname
++if hostname --version > /dev/null 2>&1; then
++ if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
+ hostname=`hostname -f`
+- else
+- hostname=`hostname`
+- fi
+- ;;
+-*)
++ fi
++fi
++
++if [ -z "$hostname" ]; then
+ hostname=`hostname`
+- ;;
+-esac
++fi
+
+ authdisplay=${display:-:0}
+ mcookie=`MK_COOKIE`
Modified: branches/modular/app/xbase-clients/debian/patches/series
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 00:10:27 UTC (rev 1332)
+++ branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 00:13:30 UTC (rev 1333)
@@ -1 +1,2 @@
001_debian_xinitrc.diff
+02_startx_hostname.diff
Reply to: