X Strike Force X.Org X11 SVN commit: r1443 - in branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian: . patches
Author: dnusinow
Date: 2006-03-12 16:19:17 -0500 (Sun, 12 Mar 2006)
New Revision: 1443
Added:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/10_dont_look_in_home_for_config.diff
Modified:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
Log:
* Add 10_dont_look_in_home_for_config.diff to prevent looking in a user's
home directory for xorg.conf. Thanks Daniel Stone for the patch.
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-03-12 20:27:44 UTC (rev 1442)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-03-12 21:19:17 UTC (rev 1443)
@@ -19,8 +19,10 @@
* Version the conflict with xserver-xfree86 to allow for the transition
package to be installed
* Remove README.DRI, as it is non-free. Add it to prune list.
+ * Add 10_dont_look_in_home_for_config.diff to prevent looking in a user's
+ home directory for xorg.conf. Thanks Daniel Stone for the patch.
- -- David Nusinow <dnusinow@debian.org> Sun, 12 Mar 2006 13:25:46 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 12 Mar 2006 16:18:13 -0500
xorg-server (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/10_dont_look_in_home_for_config.diff
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/10_dont_look_in_home_for_config.diff 2006-03-12 20:27:44 UTC (rev 1442)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/10_dont_look_in_home_for_config.diff 2006-03-12 21:19:17 UTC (rev 1443)
@@ -0,0 +1,10 @@
+--- hw/xfree86/common/xf86Config.c.orig 2006-03-11 20:19:59.000000000 +0200
++++ hw/xfree86/common/xf86Config.c 2006-03-11 20:20:04.000000000 +0200
+@@ -98,7 +98,6 @@
+ "/etc/X11/%R," "%P/etc/X11/%R," \
+ "%E," "%F," \
+ "/etc/X11/%F," "%P/etc/X11/%F," \
+- "%D/%X," \
+ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
+ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+ "%P/etc/X11/%X," \
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-03-12 20:27:44 UTC (rev 1442)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-03-12 21:19:17 UTC (rev 1443)
@@ -7,3 +7,4 @@
07_xorgconf_manpage_overhaul.diff -p0
08_s390_servermd.diff -p3
09_debian_xserver_rtff.diff -p0
+10_dont_look_in_home_for_config.diff -p0
Reply to: