X Strike Force X.Org X11 SVN commit: r675 - in trunk/debian: . patches/debian
Author: dnusinow
Date: 2005-10-11 20:01:48 -0500 (Tue, 11 Oct 2005)
New Revision: 675
Modified:
trunk/debian/changelog
trunk/debian/patches/debian/905_debian_xdm.diff
Log:
* Fix chooser path in xdm-config. This will fix querying xdm with -indirect.
Thanks Eugene Konev. (closes: #333455)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-11 22:04:11 UTC (rev 674)
+++ trunk/debian/changelog 2005-10-12 01:01:48 UTC (rev 675)
@@ -16,8 +16,10 @@
* Add transitional xserver-xfree86 package that merely depends on
xserver-xorg. Make all conflicts with xserver-xfree86 be on
pre-6.8.2.dfsg.1-1 packages. Thanks Adrian Davey. (closes: #332414)
+ * Fix chooser path in xdm-config. This will fix querying xdm with -indirect.
+ Thanks Eugene Konev. (closes: #333455)
- -- David Nusinow <dnusinow@debian.org> Thu, 6 Oct 2005 20:40:25 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 11 Oct 2005 20:55:45 -0400
xorg-x11 (6.8.2.dfsg.1-8) unstable; urgency=low
Modified: trunk/debian/patches/debian/905_debian_xdm.diff
===================================================================
--- trunk/debian/patches/debian/905_debian_xdm.diff 2005-10-11 22:04:11 UTC (rev 674)
+++ trunk/debian/patches/debian/905_debian_xdm.diff 2005-10-12 01:01:48 UTC (rev 675)
@@ -23,12 +23,16 @@
- Define a default userPath and systemPath. Again, this smacks of
the FHS.
-diff -ruN xc-old/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
---- xc-old/programs/xdm/config/Imakefile 2005-07-21 18:03:04.000000000 -0400
-+++ xc/programs/xdm/config/Imakefile 2005-07-21 18:09:54.000000000 -0400
-@@ -25,8 +25,13 @@
+Index: xc/programs/xdm/config/Imakefile
+===================================================================
+--- xc/programs/xdm/config/Imakefile.orig 2005-10-11 22:42:41.000000000 +0800
++++ xc/programs/xdm/config/Imakefile 2005-10-11 22:44:05.000000000 +0800
+@@ -23,10 +23,15 @@
+ # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm
+ #endif
- CHOOSERPATH = $(XDMDIR)/chooser
+-CHOOSERPATH = $(XDMDIR)/chooser
++CHOOSERPATH = $(BINDIR)/chooser
+#if LinuxDistribution && (LinuxDistribution == LinuxDebian)
+XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=debian.xpm\ @@\
@@ -40,9 +44,10 @@
XDMLOGDIR = $(LOGDIRECTORY)
#ifdef VarRunDirectory
-diff -ruN xc-old/programs/xdm/config/xdm-conf.cpp xc/programs/xdm/config/xdm-conf.cpp
---- xc-old/programs/xdm/config/xdm-conf.cpp 2005-05-08 23:28:35.000000000 -0400
-+++ xc/programs/xdm/config/xdm-conf.cpp 2005-07-21 18:09:54.000000000 -0400
+Index: xc/programs/xdm/config/xdm-conf.cpp
+===================================================================
+--- xc/programs/xdm/config/xdm-conf.cpp.orig 2005-03-01 00:35:18.000000000 +0700
++++ xc/programs/xdm/config/xdm-conf.cpp 2005-10-11 22:42:41.000000000 +0800
@@ -10,20 +10,22 @@
DisplayManager.keyFile: XDMDIR/xdm-keys
DisplayManager.servers: XDMDIR/Xservers
@@ -73,9 +78,10 @@
#ifdef XPM
DisplayManager*loginmoveInterval: 10
#endif /* XPM */
-diff -ruN xc-old/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc-old/programs/xdm/config/Xres.cpp 2005-07-21 18:03:04.000000000 -0400
-+++ xc/programs/xdm/config/Xres.cpp 2005-07-21 18:09:54.000000000 -0400
+Index: xc/programs/xdm/config/Xres.cpp
+===================================================================
+--- xc/programs/xdm/config/Xres.cpp.orig 2005-10-11 22:42:25.000000000 +0800
++++ xc/programs/xdm/config/Xres.cpp 2005-10-11 22:42:41.000000000 +0800
@@ -20,10 +20,10 @@
Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
<Key>Return: set-session-argument() finish-field()
@@ -89,9 +95,10 @@
xlogin*namePrompt: \040\040\040\040\040\040\040Login:
#endif /* XPM */
xlogin*fail: Login incorrect
-diff -ruN xc-old/programs/xdm/config/Xserv.ws.cpp xc/programs/xdm/config/Xserv.ws.cpp
---- xc-old/programs/xdm/config/Xserv.ws.cpp 2005-05-08 23:28:35.000000000 -0400
-+++ xc/programs/xdm/config/Xserv.ws.cpp 2005-07-21 18:09:54.000000000 -0400
+Index: xc/programs/xdm/config/Xserv.ws.cpp
+===================================================================
+--- xc/programs/xdm/config/Xserv.ws.cpp.orig 2005-03-01 00:35:18.000000000 +0700
++++ xc/programs/xdm/config/Xserv.ws.cpp 2005-10-11 22:42:41.000000000 +0800
@@ -10,4 +10,26 @@
XCOMM look like:
XCOMM XTerminalName:0 foreign
@@ -120,9 +127,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
-diff -ruN xc-old/programs/xdm/config/Xsession xc/programs/xdm/config/Xsession
---- xc-old/programs/xdm/config/Xsession 2005-05-08 23:28:35.000000000 -0400
-+++ xc/programs/xdm/config/Xsession 2005-07-21 18:09:54.000000000 -0400
+Index: xc/programs/xdm/config/Xsession
+===================================================================
+--- xc/programs/xdm/config/Xsession.orig 2005-03-01 00:35:18.000000000 +0700
++++ xc/programs/xdm/config/Xsession 2005-10-11 22:42:41.000000000 +0800
@@ -7,40 +7,5 @@
#
# $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $
@@ -166,9 +174,19 @@
-fi
+# invoke global X session script
+. /etc/X11/Xsession
-diff -ruN xc-old/programs/xdm/Imakefile xc/programs/xdm/Imakefile
---- xc-old/programs/xdm/Imakefile 2005-07-21 18:03:23.000000000 -0400
-+++ xc/programs/xdm/Imakefile 2005-07-21 18:09:54.000000000 -0400
+Index: xc/programs/xdm/Imakefile
+===================================================================
+--- xc/programs/xdm/Imakefile.orig 2005-10-11 22:42:38.000000000 +0800
++++ xc/programs/xdm/Imakefile 2005-10-11 22:43:44.000000000 +0800
+@@ -253,7 +253,7 @@
+ #endif
+ PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW)
+
+- CHOOSERPATH = $(XDMDIR)/chooser
++ CHOOSERPATH = $(BINDIR)/chooser
+ OSMAJORVERSION = OSMajorVersion
+ OSMINORVERSION = OSMinorVersion
+ CONN_DEFINES = $(CONNECTION_FLAGS)
@@ -290,9 +290,9 @@
'-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
'-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
Reply to: