summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-10-14 17:04:30 +0100
committerRobert Ancell <robert.ancell@canonical.com>2015-10-14 17:04:30 +0100
commit28844815803d08937c1c9b74ed025ae803372cb0 (patch)
tree70961d40f64432a7f60bedb026dbddcdd5fb15bb
parent29f893d323aa7d39e4842682c8e189ed8371ceb3 (diff)
downloadlightdm-git-28844815803d08937c1c9b74ed025ae803372cb0.tar.gz
Drop unnecessary debian/patches/xorg-1.17.patch
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/xorg-1.17.patch26
2 files changed, 0 insertions, 27 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 7f14c0ad..d3ba2550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
04_language_handling.patch
05_translate_debian_files.patch
autologin-session-workaround.patch
-xorg-1.17.patch
diff --git a/debian/patches/xorg-1.17.patch b/debian/patches/xorg-1.17.patch
deleted file mode 100644
index 9f7ecfd2..00000000
--- a/debian/patches/xorg-1.17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: The X.org X server 1.17 doesn't listen on TCP by default, we need to pass -listen to enable it
-Author: Robert Ancell <robert.ancell@canonical.com>
-Bug: https://bugs.launchpad.net/bugs/1449282
-
-=== modified file 'src/x-server-local.c'
-Index: 1.16/src/x-server-local.c
-===================================================================
---- 1.16.orig/src/x-server-local.c
-+++ 1.16/src/x-server-local.c
-@@ -477,6 +477,7 @@ x_server_local_start (DisplayServer *dis
- /* Connect to a remote server using XDMCP */
- if (server->priv->xdmcp_server != NULL)
- {
-+ g_string_append (command, " -listen tcp");
- if (server->priv->xdmcp_port != 0)
- g_string_append_printf (command, " -port %d", server->priv->xdmcp_port);
- g_string_append_printf (command, " -query %s", server->priv->xdmcp_server);
-@@ -485,6 +486,8 @@ x_server_local_start (DisplayServer *dis
- }
- else if (!server->priv->allow_tcp)
- g_string_append (command, " -nolisten tcp");
-+ else
-+ g_string_append (command, " -listen tcp");
-
- if (server->priv->vt >= 0)
- g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);