r51467 - in /desktop/unstable/gdm3/debian: changelog patches/16_xserver_path.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Oct 16 20:56:08 2016
New Revision: 51467

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51467
Log:
Refresh debian/patches/16_xserver_path.patch.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/16_xserver_path.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=51467&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Sun Oct 16 20:56:08 2016
@@ -1,6 +1,7 @@
 gdm3 (3.22.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh debian/patches/16_xserver_path.patch.
   * Strip debian/tmp/ from .install files.
   * Bump debhelper compat level to 10.
 

Modified: desktop/unstable/gdm3/debian/patches/16_xserver_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/16_xserver_path.patch?rev=51467&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/16_xserver_path.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/16_xserver_path.patch	[utf-8] Sun Oct 16 20:56:08 2016
@@ -6,11 +6,11 @@
  # and /usr/X11 since they often symlink to each other, and configure
  # should use the more stable location (the real directory) if possible.
  #
--if test -x /usr/X11/bin/Xserver; then
+-if test -x /usr/bin/X; then
 +if test -n "$X_PATH"; then
 +   # assume the user set these variables and don't second-guess them.
 +   true
-+elif test -x /usr/X11/bin/Xserver; then
-    X_PATH="/usr/X11/bin"
-    X_SERVER_PATH="/usr/X11/bin"
-    X_SERVER="/usr/X11/bin/Xserver"
++elif test -x /usr/bin/X; then
+    X_PATH="/usr/bin"
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/X"