xorg-server: Changes to 'debian-unstable'

[Julien Cristau <jcristau@moszumanska.debian.org>]

 debian/changelog |    1 +
 os/utils.c       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6cb85468baaf43bdfa150b8f1e385957553d9068
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Sep 22 00:44:42 2014 +0200

    Changelog addition

diff --git a/debian/changelog b/debian/changelog
index 37a43cf..96b7bb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.16.1-1) UNRELEASED; urgency=medium
 
   * Add my key to debian/upstream/signing-key.asc.
   * New upstream release.
+  * Update help text since -iglx is now the default (cherry-pick from master)
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 21 Sep 2014 11:29:00 +0200
 

commit 5d2b09330bd57209d3a0751d64b41d20f753b1c5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Wed Sep 17 15:38:39 2014 -0700

    Update help text since -iglx is now the default
    
    This should have been part of d0da0e9c3bb8fe0cd4879ecb24d21715bfaa209b
    
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit e3aa13b8d63ea2fba6eb47ddd0a7dde5a6d2b661)

diff --git a/os/utils.c b/os/utils.c
index b63913c..372bc8e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -541,8 +541,8 @@ UseMsg(void)
     ErrorF("-fn string             default font name\n");
     ErrorF("-fp string             default font path\n");
     ErrorF("-help                  prints message with these options\n");
-    ErrorF("+iglx                  Allow creating indirect GLX contexts (default)\n");
-    ErrorF("-iglx                  Prohibit creating indirect GLX contexts\n");
+    ErrorF("+iglx                  Allow creating indirect GLX contexts\n");
+    ErrorF("-iglx                  Prohibit creating indirect GLX contexts (default)\n");
     ErrorF("-I                     ignore all remaining arguments\n");
 #ifdef RLIMIT_DATA
     ErrorF("-ld int                limit data space to N Kb\n");