X Strike Force X.Org X11 SVN commit: r1982 - in trunk/app/xbase-clients-7.0.0/debian: . patches
Author: dnusinow
Date: 2006-04-26 01:19:46 -0400 (Wed, 26 Apr 2006)
New Revision: 1982
Modified:
trunk/app/xbase-clients-7.0.0/debian/changelog
trunk/app/xbase-clients-7.0.0/debian/patches/12_startx_paths.diff
trunk/app/xbase-clients-7.0.0/debian/rules
trunk/app/xbase-clients-7.0.0/debian/xbase-clients.dirs
trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install
Log:
* Patch startx so that it points to /etc/X11/xinit for xserverrc and
xinitrc. Thanks Vasilis Vasaitis and Bastian Kleineidam.
* Move xserverrc back to /etc/X11/xinit
* Use --list-missing with dh_install
Modified: trunk/app/xbase-clients-7.0.0/debian/changelog
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/changelog 2006-04-26 05:19:15 UTC (rev 1981)
+++ trunk/app/xbase-clients-7.0.0/debian/changelog 2006-04-26 05:19:46 UTC (rev 1982)
@@ -1,3 +1,12 @@
+xbase-clients (1:7.0.0-5) unstable; urgency=low
+
+ * Patch startx so that it points to /etc/X11/xinit for xserverrc and
+ xinitrc. Thanks Vasilis Vasaitis and Bastian Kleineidam.
+ * Move xserverrc back to /etc/X11/xinit
+ * Use --list-missing with dh_install
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 25 Apr 2006 21:37:22 -0400
+
xbase-clients (1:7.0.0-4) unstable; urgency=low
* Add quilt to build-depends.
Modified: 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-26 05:19:15 UTC (rev 1981)
+++ trunk/app/xbase-clients-7.0.0/debian/patches/12_startx_paths.diff 2006-04-26 05:19:46 UTC (rev 1982)
@@ -1,7 +1,7 @@
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
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/startx.cmd 2006-04-12 20:11:50.000000000 -0400
++++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cmd 2006-04-25 21:01:54.000000000 -0400
@@ -31,8 +31,8 @@
userclientrc = home'\xinitrc.cmd'
@@ -15,8 +15,8 @@
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
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/xinitrc.cmd 2006-04-12 20:11:50.000000000 -0400
++++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/xinitrc.cmd 2006-04-25 21:01:54.000000000 -0400
@@ -12,9 +12,9 @@
userresources = home'\.Xresources'
@@ -30,3 +30,21 @@
manpath = VALUE('MANPATH',,env)
/* merge in defaults */
+Index: xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cpp
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/startx.cpp 2006-04-25 21:02:12.000000000 -0400
++++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cpp 2006-04-25 21:17:19.000000000 -0400
+@@ -59,11 +59,11 @@
+ scosysclientrc=XINITDIR/xinitrc
+ #else
+ userclientrc=$HOME/.xinitrc
+-sysclientrc=XINITDIR/xinitrc
++sysclientrc=/etc/X11/xinit/xinitrc
+ #endif
+
+ userserverrc=$HOME/.xserverrc
+-sysserverrc=XINITDIR/xserverrc
++sysserverrc=/etc/X11/xinit/xserverrc
+ defaultclient=XTERM
+ defaultserver=XSERVER
+ defaultclientargs=""
Modified: trunk/app/xbase-clients-7.0.0/debian/rules
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/rules 2006-04-26 05:19:15 UTC (rev 1981)
+++ trunk/app/xbase-clients-7.0.0/debian/rules 2006-04-26 05:19:46 UTC (rev 1982)
@@ -106,7 +106,7 @@
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)
Modified: trunk/app/xbase-clients-7.0.0/debian/xbase-clients.dirs
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/xbase-clients.dirs 2006-04-26 05:19:15 UTC (rev 1981)
+++ trunk/app/xbase-clients-7.0.0/debian/xbase-clients.dirs 2006-04-26 05:19:46 UTC (rev 1982)
@@ -1 +1,2 @@
var/lib/xkb
+etc/X11/xinit
Modified: trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install 2006-04-26 05:19:15 UTC (rev 1981)
+++ trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install 2006-04-26 05:19:46 UTC (rev 1982)
@@ -4,6 +4,6 @@
usr/include/X11/bitmaps/*
usr/lib/X11/x11perfcomp/*
usr/lib/X11/xedit/*
-usr/lib/X11/xinit/xinitrc
+usr/lib/X11/xinit/xinitrc etc/X11/xinit
usr/lib/X11/xsm/system.xsm
etc/X11/app-defaults/*
Reply to: