X Strike Force X.Org X11 SVN commit: r676 - in branches/6.9/debian: . patches/debian
Author: dnusinow
Date: 2005-10-11 20:06:30 -0500 (Tue, 11 Oct 2005)
New Revision: 676
Modified:
branches/6.9/debian/changelog
branches/6.9/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: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-10-12 01:01:48 UTC (rev 675)
+++ branches/6.9/debian/changelog 2005-10-12 01:06:30 UTC (rev 676)
@@ -26,8 +26,10 @@
Thanks Julien Cristau.
* Add libxvmc1-install and libxvmc-dev.install for hppa, powerpc, and sparc
* Add xlibmesa-dri.install for hppa
+ * Fix chooser path in xdm-config. This will fix querying xdm with -indirect.
+ Thanks Eugene Konev.
- -- David Nusinow <dnusinow@debian.org> Sun, 9 Oct 2005 12:23:03 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 11 Oct 2005 21:02:51 -0400
xorg-x11 (6.8.99.900.dfsg.1-0pre1) experimental; urgency=low
Modified: branches/6.9/debian/patches/debian/905_debian_xdm.diff
===================================================================
--- branches/6.9/debian/patches/debian/905_debian_xdm.diff 2005-10-12 01:01:48 UTC (rev 675)
+++ branches/6.9/debian/patches/debian/905_debian_xdm.diff 2005-10-12 01:06:30 UTC (rev 676)
@@ -25,11 +25,14 @@
Index: xc/programs/xdm/config/Imakefile
===================================================================
---- xc/programs/xdm/config/Imakefile.orig 2005-08-02 23:27:44.000000000 -0400
-+++ xc/programs/xdm/config/Imakefile 2005-08-03 00:33:22.000000000 -0400
-@@ -25,8 +25,13 @@
+--- xc/programs/xdm/config/Imakefile.orig 2005-10-11 21:07:58.000000000 +0800
++++ xc/programs/xdm/config/Imakefile 2005-10-11 21:09:29.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\ @@\
@@ -169,8 +172,17 @@
+. /etc/X11/Xsession
Index: xc/programs/xdm/Imakefile
===================================================================
---- xc/programs/xdm/Imakefile.orig 2005-08-03 00:13:37.000000000 -0400
-+++ xc/programs/xdm/Imakefile 2005-08-03 00:33:22.000000000 -0400
+--- xc/programs/xdm/Imakefile.orig 2005-10-11 21:08:02.000000000 +0800
++++ xc/programs/xdm/Imakefile 2005-10-11 21:08:07.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: