X Strike Force X.Org X11 SVN commit: r992 - in trunk/debian: . patches/debian
Author: dnusinow
Date: 2005-12-31 16:13:33 -0500 (Sat, 31 Dec 2005)
New Revision: 992
Modified:
trunk/debian/changelog
trunk/debian/patches/debian/905_debian_xdm.diff
Log:
* Remove extra space in debian/905_debian_xdm.diff that caused a failure to
properly create xdm-config. Thanks Alex Romosan. (closes: #345406)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-12-31 20:54:55 UTC (rev 991)
+++ trunk/debian/changelog 2005-12-31 21:13:33 UTC (rev 992)
@@ -6,8 +6,10 @@
+ sparc
+ ia64
* Add HURD patches. Thanks Michael Banck. (closes: #345285)
+ * Remove extra space in debian/905_debian_xdm.diff that caused a failure to
+ properly create xdm-config. Thanks Alex Romosan. (closes: #345406)
- -- David Nusinow <dnusinow@debian.org> Sat, 31 Dec 2005 15:54:13 -0500
+ -- David Nusinow <dnusinow@debian.org> Sat, 31 Dec 2005 16:12:07 -0500
xorg-x11 (6.9.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/patches/debian/905_debian_xdm.diff
===================================================================
--- trunk/debian/patches/debian/905_debian_xdm.diff 2005-12-31 20:54:55 UTC (rev 991)
+++ trunk/debian/patches/debian/905_debian_xdm.diff 2005-12-31 21:13:33 UTC (rev 992)
@@ -25,8 +25,8 @@
Index: xc/programs/xdm/config/Imakefile
===================================================================
---- xc/programs/xdm/config/Imakefile.orig 2005-12-24 17:00:48.000000000 -0500
-+++ xc/programs/xdm/config/Imakefile 2005-12-24 17:16:27.000000000 -0500
+--- xc/programs/xdm/config/Imakefile.orig 2005-12-31 16:09:26.000000000 -0500
++++ xc/programs/xdm/config/Imakefile 2005-12-31 16:10:35.000000000 -0500
@@ -23,10 +23,15 @@
# define XdmbwPixmap XVendorStdFilePrefix-bw.xpm
#endif
@@ -44,10 +44,19 @@
XDMLOGDIR = $(LOGDIRECTORY)
#ifdef VarRunDirectory
+@@ -49,7 +54,7 @@
+
+ CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
+ #if defined(LinuxArchitecture) || defined(GNUMachArchitecture)
+-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) - DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) - DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
++CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) - DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
+ #else
+ CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter)
+ #endif /* LinuxArchitecture || GNUMachArchitecture */
Index: xc/programs/xdm/config/xdm-conf.cpp
===================================================================
---- xc/programs/xdm/config/xdm-conf.cpp.orig 2005-12-24 16:46:49.000000000 -0500
-+++ xc/programs/xdm/config/xdm-conf.cpp 2005-12-24 17:19:53.000000000 -0500
+--- xc/programs/xdm/config/xdm-conf.cpp.orig 2005-12-30 19:49:14.000000000 -0500
++++ xc/programs/xdm/config/xdm-conf.cpp 2005-12-31 16:09:37.000000000 -0500
@@ -17,11 +17,12 @@
DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys
DisplayManager.servers: XDMCONFIGDIR/Xservers
@@ -78,8 +87,8 @@
#endif /* XPM */
Index: xc/programs/xdm/config/Xres.cpp
===================================================================
---- xc/programs/xdm/config/Xres.cpp.orig 2005-12-24 16:58:18.000000000 -0500
-+++ xc/programs/xdm/config/Xres.cpp 2005-12-24 17:16:27.000000000 -0500
+--- xc/programs/xdm/config/Xres.cpp.orig 2005-12-31 16:09:26.000000000 -0500
++++ xc/programs/xdm/config/Xres.cpp 2005-12-31 16:09:37.000000000 -0500
@@ -20,10 +20,10 @@
Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
<Key>Return: set-session-argument() finish-field()
@@ -95,8 +104,8 @@
xlogin*fail: Login incorrect
Index: xc/programs/xdm/config/Xserv.ws.cpp
===================================================================
---- xc/programs/xdm/config/Xserv.ws.cpp.orig 2005-12-24 16:46:49.000000000 -0500
-+++ xc/programs/xdm/config/Xserv.ws.cpp 2005-12-24 17:16:27.000000000 -0500
+--- xc/programs/xdm/config/Xserv.ws.cpp.orig 2005-12-30 19:49:14.000000000 -0500
++++ xc/programs/xdm/config/Xserv.ws.cpp 2005-12-31 16:09:37.000000000 -0500
@@ -10,4 +10,26 @@
XCOMM look like:
XCOMM XTerminalName:0 foreign
@@ -127,8 +136,8 @@
+:0 local BINDIR/X DEFAULTVT -dpi 100 -nolisten tcp
Index: xc/programs/xdm/config/Xsession.cpp
===================================================================
---- xc/programs/xdm/config/Xsession.cpp.orig 2005-12-24 16:46:49.000000000 -0500
-+++ xc/programs/xdm/config/Xsession.cpp 2005-12-24 17:16:27.000000000 -0500
+--- xc/programs/xdm/config/Xsession.cpp.orig 2005-12-30 19:49:14.000000000 -0500
++++ xc/programs/xdm/config/Xsession.cpp 2005-12-31 16:09:37.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 $
@@ -192,8 +201,8 @@
+. /etc/X11/Xsession
Index: xc/programs/xdm/Imakefile
===================================================================
---- xc/programs/xdm/Imakefile.orig 2005-12-24 17:14:03.000000000 -0500
-+++ xc/programs/xdm/Imakefile 2005-12-24 17:16:27.000000000 -0500
+--- xc/programs/xdm/Imakefile.orig 2005-12-31 16:09:35.000000000 -0500
++++ xc/programs/xdm/Imakefile 2005-12-31 16:09:37.000000000 -0500
@@ -266,7 +266,7 @@
#endif
PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW)
Reply to: