xdm: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/patches/debian.diff | 25 ++++---------------------
debian/rules | 4 +++-
3 files changed, 16 insertions(+), 22 deletions(-)
New commits:
commit 66420dc7afca13f1def501ceff77b784ec6dece8
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 20 02:21:16 2010 +0200
Set default PATHs when running configure instead of patching xdm-config.
diff --git a/debian/changelog b/debian/changelog
index af5e036..bab295b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xdm (1:1.1.10-2) UNRELEASED; urgency=low
* debian.diff: stop defining XDMAUTHDIR, it's not used anymore.
* debian.diff: replace references to the XFree86 X server with Xorg.
+ * Set default system and user PATHs when running configure instead of
+ patching xdm-config.
-- Julien Cristau <jcristau@debian.org> Tue, 20 Apr 2010 02:08:13 +0200
diff --git a/debian/patches/debian.diff b/debian/patches/debian.diff
index 22a6cac..f891c3f 100644
--- a/debian/patches/debian.diff
+++ b/debian/patches/debian.diff
@@ -13,8 +13,6 @@ configure flags
* config/xdm-config.cpp:
- Supply a simpler default configuration, so that no matter what X server
number is used, people get the same results.
- - Define a default userPath and systemPath. Again, this smacks of the FHS
- (we should be able to drop that part nowadays?).
Index: xdm/config/Xservers.ws.cpp
===================================================================
@@ -143,7 +141,7 @@ Index: xdm/config/xdm-config.cpp
===================================================================
--- xdm.orig/config/xdm-config.cpp
+++ xdm/config/xdm-config.cpp
-@@ -18,19 +18,18 @@
+@@ -18,19 +18,16 @@
DisplayManager*resources: XDMCONFIGDIR/Xresources
DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling
! All displays should use authorization, but we cannot be sure
@@ -163,8 +161,6 @@ Index: xdm/config/xdm-config.cpp
-DisplayManager._0.setup: XDMSCRIPTDIR/Xsetup_0
-DisplayManager._0.startup: XDMSCRIPTDIR/GiveConsole
-DisplayManager._0.reset: XDMSCRIPTDIR/TakeConsole
-+DisplayManager*userPath: /usr/local/bin:/usr/bin:/bin:/usr/games
-+DisplayManager*systemPath: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#ifdef XPM
DisplayManager*loginmoveInterval: 10
#endif /* XPM */
diff --git a/debian/rules b/debian/rules
index 3282487..1e7e376 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,9 @@ $(STAMP_DIR)/build: $(STAMP_DIR)/prepare $(STAMP_DIR)/config
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
$(confflags) \
- CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1
+ CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1 \
+ DEF_USER_PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" \
+ DEF_SYSTEM_PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
cd $(BUILD_DIR) && $(MAKE)
>$@
commit 17ad93cf4ed0c29117b1b9b3f6dad0506ac32860
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 20 02:11:14 2010 +0200
debian.diff: replace references to the XFree86 X server with Xorg.
diff --git a/debian/changelog b/debian/changelog
index 467bdb8..af5e036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xdm (1:1.1.10-2) UNRELEASED; urgency=low
* debian.diff: stop defining XDMAUTHDIR, it's not used anymore.
+ * debian.diff: replace references to the XFree86 X server with Xorg.
-- Julien Cristau <jcristau@debian.org> Tue, 20 Apr 2010 02:08:13 +0200
diff --git a/debian/patches/debian.diff b/debian/patches/debian.diff
index 59f97b6..22a6cac 100644
--- a/debian/patches/debian.diff
+++ b/debian/patches/debian.diff
@@ -28,7 +28,7 @@ Index: xdm/config/Xservers.ws.cpp
+XCOMM When adding X servers, please keep the following things in mind:
+XCOMM - If the X server's number is not zero, it must be passed to the X
+XCOMM server's command line as its first argument.
-+XCOMM - When using the XFree86 X server, it is wise to add the vtXX
++XCOMM - When using the Xorg X server, it is wise to add the vtXX
+XCOMM option to each local X server, since this is the only sure way
+XCOMM of knowing in advance which X server attaches to which virtual
+XCOMM console.
@@ -40,8 +40,8 @@ Index: xdm/config/Xservers.ws.cpp
+XCOMM X servers that do not listen on a TCP port, so you do not need
+XCOMM to remove the "-nolisten tcp" option for SSH's benefit.
+XCOMM - See the Xserver(1) manpage for a description of X server
-+XCOMM options. If you are using the XFree86 X server, see the
-+XCOMM XFree86(1) manpage for a description of options specific to it
++XCOMM options. If you are using the Xorg X server, see the
++XCOMM Xorg(1) manpage for a description of options specific to it
+XCOMM (such as "-depth").
+XCOMM
+XCOMM Examples for multiple local X displays:
commit ba3c21321bdf3aaf6a9fde4bb7e01bf5cf84a9b7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 20 02:08:30 2010 +0200
debian.diff: stop defining XDMAUTHDIR, it's not used anymore.
diff --git a/debian/changelog b/debian/changelog
index a4b5600..467bdb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xdm (1:1.1.10-2) UNRELEASED; urgency=low
+
+ * debian.diff: stop defining XDMAUTHDIR, it's not used anymore.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 20 Apr 2010 02:08:13 +0200
+
xdm (1:1.1.10-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/debian.diff b/debian/patches/debian.diff
index d2e6649..59f97b6 100644
--- a/debian/patches/debian.diff
+++ b/debian/patches/debian.diff
@@ -16,19 +16,6 @@ configure flags
- Define a default userPath and systemPath. Again, this smacks of the FHS
(we should be able to drop that part nowadays?).
-Index: xdm/config/Makefile.am
-===================================================================
---- xdm.orig/config/Makefile.am
-+++ xdm/config/Makefile.am
-@@ -56,7 +56,7 @@
- -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
- -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \
- -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \
-- -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
-+ -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES) -DXDMAUTHDIR="$(XDMAUTHDIR)"
-
- Xservers.ws: $(srcdir)/Xservers.ws.cpp
- $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
Index: xdm/config/Xservers.ws.cpp
===================================================================
--- xdm.orig/config/Xservers.ws.cpp
Reply to: