X Strike Force X.Org X11 SVN commit: r121 - in trunk/debian: . local/Xsession.d
Author: dnusinow
Date: 2005-05-16 22:51:09 -0500 (Mon, 16 May 2005)
New Revision: 121
Modified:
trunk/debian/changelog
trunk/debian/local/Xsession.d/30xorg-common_xresources
Log:
Merge changes from xfree tree to local/Xsession.d/30xorg-common_xresources
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-17 03:49:21 UTC (rev 120)
+++ trunk/debian/changelog 2005-05-17 03:51:09 UTC (rev 121)
@@ -28,6 +28,7 @@
- xterm.faq.html
- xvfb-run
- xdm/Xstartup
+ - Xsession.d/30xorg-common_xresources
- Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
until I know more about why it was removed.
Modified: trunk/debian/local/Xsession.d/30xorg-common_xresources
===================================================================
--- trunk/debian/local/Xsession.d/30xorg-common_xresources 2005-05-17 03:49:21 UTC (rev 120)
+++ trunk/debian/local/Xsession.d/30xorg-common_xresources 2005-05-17 03:51:09 UTC (rev 121)
@@ -1,4 +1,4 @@
-# $Id: 30xfree86-common_xresources 1328 2004-04-28 16:12:46Z branden $
+# $Id: 30xfree86-common_xresources 2083 2004-12-19 01:53:31Z branden $
# This file is sourced by Xsession(5), not executed.
@@ -6,7 +6,7 @@
# Then merge the user's X resources, if the options file is so configured.
if which xrdb >/dev/null 2>&1; then
if [ -d "$SYSRESOURCES" ]; then
- RESOURCEFILES=$(run_parts $SYSRESOURCES)
+ RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
if [ -n "$RESOURCEFILES" ]; then
for RESOURCEFILE in $RESOURCEFILES; do
xrdb -merge $RESOURCEFILE
Reply to: