Imported Debian patch 2:1.15.1-0ubuntu2.6

[deb_xorg-server.git] / debian / patches / xfree86_add_matchseat_key_description_to_xorg_conf_man.patch

diff --git a/debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch b/debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
new file mode 100644 (file)
index 0000000..c7f70cc
--- /dev/null
+++ b/debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
@@ -0,0 +1,68 @@
+From a6f5ffd5879e7fb052d343592951cc476b699bb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <lbsousajr@gmail.com>
+Date: Thu, 3 Apr 2014 11:19:15 -0300
+Subject: [PATCH] xfree86: add short description about MatchSeat key in
+ xorg.conf man page
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
+Reviewed-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ hw/xfree86/man/xorg.conf.man | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
+index 6d2652e..cadd87b 100644
+--- a/hw/xfree86/man/xorg.conf.man
++++ b/hw/xfree86/man/xorg.conf.man
+@@ -1378,6 +1378,14 @@ for the regular text mode.
+ The frequency is specified in MHz.
+ This is rarely used.
+ .TP 7
++.BI "MatchSeat  " "seat\-id"
++Only apply this
++.B Device
++section if X server was started with
++.B -seat
++.I seat\-id
++option.
++.TP 7
+ .BI "Option \*qModeDebug\*q \*q" boolean \*q
+ Enable printing of additional debugging information about modesetting to
+ the server log.
+@@ -1900,6 +1908,14 @@ The only case where there is even a choice in this value is for depth 24,
+ where some hardware supports both a packed 24 bit framebuffer layout and a
+ sparse 32 bit framebuffer layout.
+ .TP 7
++.BI "MatchSeat  " "seat\-id"
++Only apply this
++.B Screen
++section if X server was started with
++.B -seat
++.I seat\-id
++option.
++.TP 7
+ .B Options
+ Various
+ .B Option
+@@ -2295,6 +2311,14 @@ and the first two should normally be used to indicate the core pointer
+ and core keyboard devices respectively.
+ .RE
+ .TP 7
++.BI "MatchSeat  " "seat\-id"
++Only apply this
++.B ServerLayout
++section if X server was started with
++.B -seat
++.I seat\-id
++option.
++.TP 7
+ .B Options
+ In addition to the following, any option permitted in the
+ .B ServerFlags
+-- 
+2.0.4
+