xinit: Changes to 'debian-unstable'
debian/changelog | 6 +++
debian/patches/07_startx_serverrc_fix.diff | 44 +++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 51 insertions(+)
New commits:
commit 8a0d1f2c1c55042c6a5bd898014a488153afbc68
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 28 14:27:08 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 48969d8..9a6af61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xinit (1.0.9-2) UNRELEASED; urgency=low
+xinit (1.0.9-2) unstable; urgency=low
* Fix startx. Patch from Jeremy Huddleston (closes: #482425).
- -- Julien Cristau <jcristau@debian.org> Wed, 28 May 2008 14:09:58 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 May 2008 14:27:01 +0200
xinit (1.0.9-1) unstable; urgency=low
commit 2a54e2343213f3752f303c3818178b4148b04699
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 28 14:25:08 2008 +0200
Fix startx. Patch from Jeremy Huddleston (closes: #482425).
diff --git a/debian/changelog b/debian/changelog
index 3823eea..48969d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xinit (1.0.9-2) UNRELEASED; urgency=low
+
+ * Fix startx. Patch from Jeremy Huddleston (closes: #482425).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 May 2008 14:09:58 +0200
+
xinit (1.0.9-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/07_startx_serverrc_fix.diff b/debian/patches/07_startx_serverrc_fix.diff
new file mode 100644
index 0000000..b97c383
--- /dev/null
+++ b/debian/patches/07_startx_serverrc_fix.diff
@@ -0,0 +1,44 @@
+From: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Subject: only use xserverrc if we have no arguments or display
+
+diff --git a/startx.cpp b/startx.cpp
+index 9266341..8ffdc70 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -161,12 +161,6 @@ case $1 in
+ esac
+ #endif
+
+-if [ -f $userserverrc ]; then
+- defaultserverargs=$userserverrc
+-elif [ -f $sysserverrc ]; then
+- defaultserverargs=$sysserverrc
+-fi
+-
+ whoseargs="client"
+ while [ x"$1" != x ]; do
+ case "$1" in
+@@ -218,13 +212,19 @@ fi
+
+ XCOMM process server arguments
+ if [ x"$server" = x ]; then
+- XCOMM if no server arguments or display either, use rc file instead
++ server=$defaultserver
++
++ XCOMM if no server arguments or display either, use defaults
+ if [ x"$serverargs" = x -a x"$display" = x ]; then
+- server=$defaultserver
++ XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
++ if [ -f $userserverrc ]; then
++ server=$userserverrc
++ elif [ -f $sysserverrc ]; then
++ server=$sysserverrc
++ fi
++
+ serverargs=$defaultserverargs
+ display=$defaultdisplay
+- else
+- server=$defaultserver
+ fi
+ fi
+
diff --git a/debian/patches/series b/debian/patches/series
index 7a5032f..7ccc9c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04_startx_paths.diff
05_use_bash.diff
06_move_serverauthfile_into_tmp.diff
+07_startx_serverrc_fix.diff
Reply to: