debian/changelog | 10 +++++++++
debian/patches/08_pick-free-display.patch | 31 ++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 1
4 files changed, 43 insertions(+)
New commits:
commit dbfd254d37e5a71b780cbdaba43cd91b96023780
Author: Laurent Bigonville <bi...@bigon.be>
Date: Mon Oct 19 03:54:42 2015 +0200
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 8ec79e6..68ad392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xinit (1.3.4-3) UNRELEASED; urgency=medium
+xinit (1.3.4-3) unstable; urgency=medium
+ * Team upload.
* d/p/08_pick-free-display.patch: Properly pick a free display number if
-nolock or -displayfd is used to start X (like GDM is now doing)
* debian/rules: Make /etc/X11/xinit/xserverrc executable again, this got
lost during the xsfbs -> dh7 switch
- -- Laurent Bigonville <bi...@debian.org> Mon, 19 Oct 2015 03:49:19 +0200
+ -- Laurent Bigonville <bi...@debian.org> Mon, 19 Oct 2015 03:54:32 +0200
xinit (1.3.4-2) unstable; urgency=medium
commit a7e33612117b46a103498b8d59a00a37a512497c
Author: Laurent Bigonville <bi...@bigon.be>
Date: Mon Oct 19 03:50:01 2015 +0200
debian/rules: Make /etc/X11/xinit/xserverrc executable again, this got lost
during the xsfbs -> dh7 switch
diff --git a/debian/changelog b/debian/changelog
index 2e65547..8ec79e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xinit (1.3.4-3) UNRELEASED; urgency=medium
* d/p/08_pick-free-display.patch: Properly pick a free display number if
-nolock or -displayfd is used to start X (like GDM is now doing)
+ * debian/rules: Make /etc/X11/xinit/xserverrc executable again, this got
+ lost during the xsfbs -> dh7 switch
- -- Laurent Bigonville <bi...@debian.org> Mon, 19 Oct 2015 03:44:48 +0200
+ -- Laurent Bigonville <bi...@debian.org> Mon, 19 Oct 2015 03:49:19 +0200
xinit (1.3.4-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 00cae49..35955b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,3 +20,4 @@ override_dh_install:
override_dh_fixperms:
dh_fixperms
chmod 0755 debian/xinit/etc/X11/xinit/xinitrc
+ chmod 0755 debian/xinit/etc/X11/xinit/xserverrc
commit f5ead13a42ef2147c355a4faf0ddde8c56f7d60c
Author: Laurent Bigonville <bi...@bigon.be>
Date: Mon Oct 19 03:45:54 2015 +0200
d/p/08_pick-free-display.patch: Properly pick a free display number if
-nolock or -displayfd is used to start X (like GDM is now doing)
diff --git a/debian/changelog b/debian/changelog
index ea67453..2e65547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xinit (1.3.4-3) UNRELEASED; urgency=medium
+
+ * d/p/08_pick-free-display.patch: Properly pick a free display number if
+ -nolock or -displayfd is used to start X (like GDM is now doing)
+
+ -- Laurent Bigonville <bi...@debian.org> Mon, 19 Oct 2015 03:44:48 +0200
+
xinit (1.3.4-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/08_pick-free-display.patch
b/debian/patches/08_pick-free-display.patch
new file mode 100644
index 0000000..74f9304
--- /dev/null
+++ b/debian/patches/08_pick-free-display.patch
@@ -0,0 +1,31 @@
+commit e07fa99039c0f63ed8f0b142e546ef102321fca0
+Author: Hans de Goede <hdego...@redhat.com>
+Date: Fri Mar 20 14:25:44 2015 +0100
+
+ startx: Fix startx picking an already used display number when -nolock is
used
+
+ Currently startx relies on /tmp/.X?-lock being present for automatically
+ picking a free display number. This does not work if -nolock is used when
+ starting the server, or if the server is started with -displayfd as
-displayfd
+ implies -nolock.
+
+ This is becoming a problem now that -displayfd is getting used by
+ display-managers (e.g. gdm), this fixes this by also checking for
+ /tmp/.X11-unix/X?
+
+ Signed-off-by: Hans de Goede <hdego...@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+diff --git a/startx.cpp b/startx.cpp
+index cc8be90..a9d477b 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -120,7 +120,7 @@ enable_xauth=1
+ XCOMM Automatically determine an unused $DISPLAY
+ d=0
+ while true ; do
+- [ -e /tmp/.X$d-lock ] || break
++ [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
+ d=$(($d + 1))
+ done
+ defaultdisplay=":$d"
diff --git a/debian/patches/series b/debian/patches/series
index 0865b75..a7c5d38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_debian_startx_manpage.diff
06_move_serverauthfile_into_tmp.diff
07_Pass-keeptty-on-current-tty.patch
+08_pick-free-display.patch
