X Strike Force X.Org X11 SVN commit: r1754 - in trunk/app/xbase-clients-7.0.0/debian: . patches
Author: dnusinow
Date: 2006-04-12 20:12:46 -0400 (Wed, 12 Apr 2006)
New Revision: 1754
Added:
trunk/app/xbase-clients-7.0.0/debian/patches/12_startx_paths.diff
Modified:
trunk/app/xbase-clients-7.0.0/debian/changelog
trunk/app/xbase-clients-7.0.0/debian/patches/series
Log:
* Add 12_startx_paths.diff to use X11R7 paths for startx and xinit. Thanks
Arjan Opmeer. (closes: #357713)
Modified: trunk/app/xbase-clients-7.0.0/debian/changelog
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/changelog 2006-04-12 23:54:11 UTC (rev 1753)
+++ trunk/app/xbase-clients-7.0.0/debian/changelog 2006-04-13 00:12:46 UTC (rev 1754)
@@ -2,8 +2,10 @@
* Remove mention of xorgconfig and xorgcfg in package description. Thanks
Daniel Leidert. (closes: #362066)
+ * Add 12_startx_paths.diff to use X11R7 paths for startx and xinit. Thanks
+ Arjan Opmeer. (closes: #357713)
- -- David Nusinow <dnusinow@debian.org> Wed, 12 Apr 2006 19:33:49 -0400
+ -- David Nusinow <dnusinow@debian.org> Wed, 12 Apr 2006 20:12:13 -0400
xbase-clients (1:7.0.0-2) unstable; urgency=low
Added: trunk/app/xbase-clients-7.0.0/debian/patches/12_startx_paths.diff
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/patches/12_startx_paths.diff 2006-04-12 23:54:11 UTC (rev 1753)
+++ trunk/app/xbase-clients-7.0.0/debian/patches/12_startx_paths.diff 2006-04-13 00:12:46 UTC (rev 1754)
@@ -0,0 +1,32 @@
+Index: xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cmd
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/startx.cmd 2006-04-11 20:57:09.000000000 -0400
++++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cmd 2006-04-12 20:02:23.000000000 -0400
+@@ -31,8 +31,8 @@
+
+ userclientrc = home'\xinitrc.cmd'
+ userserverrc = home'\xservrc.cmd'
+-sysclientrc = x11root'\usr\X11R6\lib\X11\xinit\xinitrc.cmd'
+-sysserverrc = x11root'\usr\X11R6\lib\X11\xinit\xservrc.cmd'
++sysclientrc = x11root'\etc\X11\xinit\xinitrc.cmd'
++sysserverrc = x11root'\etc\X11\xinit\xservrc.cmd'
+ clientargs = ''
+ serverargs = ''
+
+Index: xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/xinitrc.cmd
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/xinitrc.cmd 2006-04-11 20:57:09.000000000 -0400
++++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/xinitrc.cmd 2006-04-12 20:11:14.000000000 -0400
+@@ -12,9 +12,9 @@
+
+ userresources = home'\.Xresources'
+ usermodmap = home'\.Xmodmap'
+-sysresources = x11root'\usr\X11R6\lib\X11\xinit\.Xresources'
+-sysmodmap = x11root'\usr\X11R6\lib\X11\xinit\.Xmodmap'
+-xbitmapdir = x11root'\usr\X11R6\include\X11\bitmaps'
++sysresources = x11root'\etc\X11\xinit\.Xresources'
++sysmodmap = x11root'\etc\X11\xinit\.Xmodmap'
++xbitmapdir = x11root'\etc\X11\bitmaps'
+ manpath = VALUE('MANPATH',,env)
+
+ /* merge in defaults */
Modified: trunk/app/xbase-clients-7.0.0/debian/patches/series
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/patches/series 2006-04-12 23:54:11 UTC (rev 1753)
+++ trunk/app/xbase-clients-7.0.0/debian/patches/series 2006-04-13 00:12:46 UTC (rev 1754)
@@ -9,3 +9,4 @@
09_debian_startx_manpage.diff -p0
10_debian_add_xkbpath_env_variable.diff -p0
11_xkb_documentation_updates.diff -p0
+12_startx_paths.diff
Reply to: