debian/changelog | 9 +++++
debian/patches/165_man_xorg_conf_no_device_ident.patch | 29 +++++++++++++++++
debian/patches/series | 1
3 files changed, 39 insertions(+)
New commits:
commit e8f63feb99aed8a8ed5e2bd975ebb61cb2d5c0fe
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Wed Mar 18 21:14:30 2009 -0700
Fix man page to not list Device identifier as mandatory
diff --git a/debian/changelog b/debian/changelog
index ef49dcc..e7dd7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.6.0-0ubuntu3) UNRELEASED; urgency=low
+
+ * Add 165_man_xorg_conf_no_device_ident.patch:
+ - Device identifier no longer necessary in Screen section of
+ xorg.conf. Update man page accordingly.
+ (LP: #261577)
+
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 18 Mar 2009 21:13:09 -0700
+
xorg-server (2:1.6.0-0ubuntu2) jaunty; urgency=low
* Add 163_thinko_in_xf86targetpreferred.patch:
diff --git a/debian/patches/165_man_xorg_conf_no_device_ident.patch
b/debian/patches/165_man_xorg_conf_no_device_ident.patch
new file mode 100644
index 0000000..3e2ab59
--- /dev/null
+++ b/debian/patches/165_man_xorg_conf_no_device_ident.patch
@@ -0,0 +1,29 @@
+From b3bb14b11a58f7bfc3ba5617c524d01a6e683de1 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <br...@bryceharrington.org>
+Date: Wed, 18 Mar 2009 21:08:19 -0700
+Subject: [PATCH] X boots up without a 'Device' identifier; don't need to say it
+ is mandatory in the xorg.conf man page anymore.
+
+Signed-off-by: Bryce Harrington <br...@bryceharrington.org>
+---
+ hw/xfree86/doc/man/xorg.conf.man.pre | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre
b/hw/xfree86/doc/man/xorg.conf.man.pre
+index 7349def..f4853e8 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -1537,9 +1537,7 @@ sections have the following format:
+ .PP
+ The
+ .B Identifier
+-and
+-.B Device
+-entries are mandatory.
++entry is mandatory.
+ All others are optional.
+ .PP
+ The
+--
+1.6.0.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 4540029..a9d7a8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@
999_default_modedebug_on.patch
163_thinko_in_xf86targetpreferred.patch
164_trap-aspect-ratios.patch
+165_man_xorg_conf_no_device_ident.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
