X Strike Force X.Org X11 SVN commit: r1971 - in trunk/xserver/xorg-server-1.0.2/debian: . local
Author: dnusinow
Date: 2006-04-25 21:14:58 -0400 (Tue, 25 Apr 2006)
New Revision: 1971
Added:
trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/rules
Log:
* Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and
Vasilis Vasaitis. (closes: #357713)
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-25 11:51:34 UTC (rev 1970)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-26 01:14:58 UTC (rev 1971)
@@ -1,5 +1,12 @@
-xorg-server (1:1.0.2-6) UNRELEASED; urgency=low
+xorg-server (1:1.0.2-7) UNRELEASED; urgency=low
+ * Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and
+ Vasilis Vasaitis. (closes: #357713)
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 25 Apr 2006 21:14:15 -0400
+
+xorg-server (1:1.0.2-6) unstable; urgency=low
+
[ David Nusinow ]
* Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau.
(closes: #362641)
Added: trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc 2006-04-25 11:51:34 UTC (rev 1970)
+++ trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc 2006-04-26 01:14:58 UTC (rev 1971)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# $Id: xserverrc 189 2005-06-11 00:04:27Z branden $
+
+exec /usr/bin/X11/X -dpi 100 -nolisten tcp
Modified: trunk/xserver/xorg-server-1.0.2/debian/rules
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/rules 2006-04-25 11:51:34 UTC (rev 1970)
+++ trunk/xserver/xorg-server-1.0.2/debian/rules 2006-04-26 01:14:58 UTC (rev 1971)
@@ -92,6 +92,8 @@
install -m 755 debian/local/xvfb-run debian/tmp/usr/bin
install debian/local/xvfb-run.1 debian/tmp/usr/share/man/man1
+ install -d debian/tmp/etc/X11/xinit
+ install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
# Build architecture-dependent files here.
binary-arch: build install
Reply to: