Author: dnusinow
Date: 2006-02-23 21:58:23 -0500 (Thu, 23 Feb 2006)
New Revision: 1295
Modified:
branches/modular/app/xdm-X11R7.0-1.0.1/debian/changelog
branches/modular/app/xdm-X11R7.0-1.0.1/debian/patches/debian.diff
Log:
* Fix PATH in xdm-config. Thanks Nicolas Bonifas. (closes: #353974)
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/debian/changelog 2006-02-24
02:43:18 UTC (rev 1294)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/debian/changelog 2006-02-24
02:58:23 UTC (rev 1295)
@@ -1,3 +1,10 @@
+xdm (1:1.0.1-2) experimental; urgency=low
+
+ [ David Nusinow ]
+ * Fix PATH in xdm-config. Thanks Nicolas Bonifas. (closes: #353974)
+
+ -- David Nusinow <[EMAIL PROTECTED]> Thu, 23 Feb 2006 21:56:55 -0500
+
xdm (1:1.0.1-1) experimental; urgency=low
[ Eugene Konev ]
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/debian/patches/debian.diff
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/debian/patches/debian.diff
2006-02-24 02:43:18 UTC (rev 1294)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/debian/patches/debian.diff
2006-02-24 02:58:23 UTC (rev 1295)
@@ -5,10 +5,10 @@
Ported parts of 905_debian_xdm.diff. Some changes are now done through
configure flags
-Index: xdm-1.0.1/config/Makefile.am
+Index: xdm-X11R7.0-1.0.1/config/Makefile.am
===================================================================
---- xdm-1.0.1.orig/config/Makefile.am 2005-12-31 01:14:25.000000000 +0700
-+++ xdm-1.0.1/config/Makefile.am 2006-02-19 10:54:50.000000000 +0700
+--- xdm-X11R7.0-1.0.1.orig/config/Makefile.am 2006-02-20 22:02:43.000000000
-0500
++++ xdm-X11R7.0-1.0.1/config/Makefile.am 2006-02-23 21:55:43.000000000
-0500
@@ -50,7 +50,7 @@
-DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
-DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
@@ -18,10 +18,10 @@
Xservers.ws: $(srcdir)/Xservers.ws.cpp
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp
| $(CPP_SED_MAGIC) > $@
-Index: xdm-1.0.1/config/Xresources.cpp
+Index: xdm-X11R7.0-1.0.1/config/Xresources.cpp
===================================================================
---- xdm-1.0.1.orig/config/Xresources.cpp 2006-02-19 10:54:49.000000000
+0700
-+++ xdm-1.0.1/config/Xresources.cpp 2006-02-19 10:54:50.000000000 +0700
+--- xdm-X11R7.0-1.0.1.orig/config/Xresources.cpp 2006-02-23
21:55:43.000000000 -0500
++++ xdm-X11R7.0-1.0.1/config/Xresources.cpp 2006-02-23 21:55:43.000000000
-0500
@@ -20,10 +20,10 @@
Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
<Key>Return: set-session-argument() finish-field()
@@ -35,10 +35,10 @@
xlogin*namePrompt: \040\040\040\040\040\040\040Login:
#endif /* XPM */
xlogin*fail: Login incorrect
-Index: xdm-1.0.1/config/Xservers.ws.cpp
+Index: xdm-X11R7.0-1.0.1/config/Xservers.ws.cpp
===================================================================
---- xdm-1.0.1.orig/config/Xservers.ws.cpp 2005-12-31 01:14:25.000000000
+0700
-+++ xdm-1.0.1/config/Xservers.ws.cpp 2006-02-19 10:54:50.000000000 +0700
+--- xdm-X11R7.0-1.0.1.orig/config/Xservers.ws.cpp 2006-02-20
22:02:43.000000000 -0500
++++ xdm-X11R7.0-1.0.1/config/Xservers.ws.cpp 2006-02-23 21:55:43.000000000
-0500
@@ -10,4 +10,26 @@
XCOMM look like:
XCOMM XTerminalName:0 foreign
@@ -67,10 +67,10 @@
+XCOMM :0 local BINDIR/X :0 vt9 -depth 15 -nolisten tcp
+XCOMM :1 local BINDIR/X :1 vt10 -depth 8 -nolisten tcp
+:0 local BINDIR/X DEFAULTVT -dpi 100 -nolisten tcp
-Index: xdm-1.0.1/config/Xsession.cpp
+Index: xdm-X11R7.0-1.0.1/config/Xsession.cpp
===================================================================
---- xdm-1.0.1.orig/config/Xsession.cpp 2005-12-31 01:14:25.000000000 +0700
-+++ xdm-1.0.1/config/Xsession.cpp 2006-02-19 10:54:50.000000000 +0700
+--- xdm-X11R7.0-1.0.1.orig/config/Xsession.cpp 2006-02-20 22:02:43.000000000
-0500
++++ xdm-X11R7.0-1.0.1/config/Xsession.cpp 2006-02-23 21:55:43.000000000
-0500
@@ -3,58 +3,5 @@
XCOMM $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
XCOMM $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32
dawes Exp $
@@ -132,10 +132,10 @@
-fi
+# invoke global X session script
+. /etc/X11/Xsession
-Index: xdm-1.0.1/config/xdm-config.cpp
+Index: xdm-X11R7.0-1.0.1/config/xdm-config.cpp
===================================================================
---- xdm-1.0.1.orig/config/xdm-config.cpp 2005-12-31 01:14:25.000000000
+0700
-+++ xdm-1.0.1/config/xdm-config.cpp 2006-02-19 11:00:45.000000000 +0700
+--- xdm-X11R7.0-1.0.1.orig/config/xdm-config.cpp 2006-02-20
22:02:43.000000000 -0500
++++ xdm-X11R7.0-1.0.1/config/xdm-config.cpp 2006-02-23 21:56:47.000000000
-0500
@@ -17,22 +17,22 @@
DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys
DisplayManager.servers: XDMCONFIGDIR/Xservers
@@ -161,14 +161,14 @@
-DisplayManager._0.startup: XDMSCRIPTDIR/GiveConsole
-DisplayManager._0.reset: XDMSCRIPTDIR/TakeConsole
+DisplayManager*userPath:
/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+DisplayManager*systemPath:
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/ sbin:/bin:/usr/bin/X11
++DisplayManager*systemPath:
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
#ifdef XPM
DisplayManager*loginmoveInterval: 10
#endif /* XPM */
-Index: xdm-1.0.1/configure.ac
+Index: xdm-X11R7.0-1.0.1/configure.ac
===================================================================
---- xdm-1.0.1.orig/configure.ac 2006-02-19 10:54:50.000000000 +0700
-+++ xdm-1.0.1/configure.ac 2006-02-19 10:54:50.000000000 +0700
+--- xdm-X11R7.0-1.0.1.orig/configure.ac 2006-02-23 21:55:43.000000000
-0500
++++ xdm-X11R7.0-1.0.1/configure.ac 2006-02-23 21:55:43.000000000 -0500
@@ -200,6 +200,12 @@
[XDMSCRIPTDIR="$withval"], [XDMSCRIPTDIR="${XDMLIBDIR}"])
AC_SUBST(XDMSCRIPTDIR)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
