X Strike Force X.Org X11 SVN commit: r1334 - in branches/modular/app/xbase-clients/debian: . patches
Author: dnusinow
Date: 2006-02-26 19:15:48 -0500 (Sun, 26 Feb 2006)
New Revision: 1334
Added:
branches/modular/app/xbase-clients/debian/patches/03_startx_dummy.diff
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/patches/series
Log:
* Port patches from trunk
+ general/015_startx_dummy_fix.diff
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:13:30 UTC (rev 1333)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:15:48 UTC (rev 1334)
@@ -5,8 +5,9 @@
(closes: #354130)
* Port patches from trunk
+ general/014_startx_hostname_fix.diff
+ + general/015_startx_dummy_fix.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 19:12:32 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 19:15:25 -0500
xbase-clients (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/app/xbase-clients/debian/patches/03_startx_dummy.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/03_startx_dummy.diff 2006-02-27 00:13:30 UTC (rev 1333)
+++ branches/modular/app/xbase-clients/debian/patches/03_startx_dummy.diff 2006-02-27 00:15:48 UTC (rev 1334)
@@ -0,0 +1,13 @@
+Index: xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp
+===================================================================
+--- xbase-clients.orig/xinit-X11R7.0-1.0.1/startx.cpp 2006-02-26 19:14:32.000000000 -0500
++++ xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp 2006-02-26 19:15:10.000000000 -0500
+@@ -207,7 +207,7 @@
+ EOF
+ removelist="$displayname $removelist"
+ else
+- dummy=$((dummy+1));
++ dummy=$(($dummy+1));
+ XAUTH -q -f $xserverauthfile << EOF
+ add :$dummy . $authcookie
+ EOF
Modified: branches/modular/app/xbase-clients/debian/patches/series
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 00:13:30 UTC (rev 1333)
+++ branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 00:15:48 UTC (rev 1334)
@@ -1,2 +1,3 @@
001_debian_xinitrc.diff
02_startx_hostname.diff
+03_startx_dummy.diff
Reply to: