debian/changelog | 10 +++--
debian/patches/14_default_screen_section.diff | 49 +++++++++++++++++---------
debian/rules | 2 -
3 files changed, 40 insertions(+), 21 deletions(-)
New commits:
commit 789139ee3ce57258a294e2f1cf33d3e6a60f897b
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Mon Nov 19 20:39:03 2007 -0500
* Re-enable validation of the screen section of xorg.conf
Modify 14_default_screen_section.diff. This also fixes a problem where the
server can't find the device section when it is specified in the screen
section. Closes: #451950
diff --git a/debian/changelog b/debian/changelog
index ac86ff1..93abc92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
* Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
+ * Re-enable validation of the screen section of xorg.conf
+ Modify 14_default_screen_section.diff. This also fixes a problem where the
+ server can't find the device section when it is specified in the screen
+ section. Closes: #451950
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 19 Nov 2007 20:00:56 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 19 Nov 2007 20:38:04 -0500
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
diff --git a/debian/patches/14_default_screen_section.diff
b/debian/patches/14_default_screen_section.diff
index 77e0637..3151f6e 100644
--- a/debian/patches/14_default_screen_section.diff
+++ b/debian/patches/14_default_screen_section.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-30
19:55:22.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-30 20:48:02.000000000
-0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-11-19
20:36:12.000000000 -0500
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-11-19 20:36:13.000000000
-0500
@@ -1800,11 +1800,6 @@
if (!servlayoutp)
return FALSE;
@@ -27,18 +27,35 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier,
scrnum);
/*
-Index: xorg-server/hw/xfree86/parser/read.c
+Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-30 19:55:22.000000000
-0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-09-30 19:55:22.000000000
-0400
-@@ -82,8 +82,8 @@
- {
- /*if (!xf86validateDevice (p))
- return FALSE;*/
-- if (!xf86validateScreen (p))
-- return FALSE;
-+ /*if (!xf86validateScreen (p))
-+ return FALSE;*/
- if (!xf86validateInput (p))
- return FALSE;
- if (!xf86validateLayout (p))
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-11-19
20:36:47.000000000 -0500
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-11-19 20:36:57.000000000
-0500
+@@ -498,12 +498,6 @@
+ XF86ConfDevicePtr device;
+ XF86ConfAdaptorLinkPtr adaptor;
+
+- if (!screen)
+- {
+- xf86validationError ("At least one Screen section is
required.");
+- return (FALSE);
+- }
+-
+ while (screen)
+ {
+ if (screen->scrn_obso_driver && !screen->scrn_identifier)
+@@ -512,13 +506,7 @@
+ monitor = xf86findMonitor (screen->scrn_monitor_str,
p->conf_monitor_lst);
+ if (screen->scrn_monitor_str)
+ {
+- if (!monitor)
+- {
+- xf86validationError (UNDEFINED_MONITOR_MSG,
+-
screen->scrn_monitor_str, screen->scrn_identifier);
+- return (FALSE);
+- }
+- else
++ if (monitor)
+ {
+ screen->scrn_monitor = monitor;
+ if (!xf86validateMonitor(p, screen))
commit d1870052e3b3456fc98e10dc8c6becd63c4e6daf
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Mon Nov 19 20:02:44 2007 -0500
* Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
diff --git a/debian/changelog b/debian/changelog
index 9bca2f5..ac86ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
+
+ * Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
+
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 19 Nov 2007 20:00:56 -0500
+
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
[ Julien Cristau ]
commit 3053b8a4007c5bb3adaa0014864e6f642929310c
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Mon Nov 19 20:00:19 2007 -0500
Revert "* chmod +x configure in debian/rules clean, to fix FTBFS."
This reverts commit 157dec6bee7741877e855cee9ab9374693f99292.
diff --git a/debian/changelog b/debian/changelog
index ce117a3..9bca2f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xorg-server (2:1.4.1~git20071117-2) UNRELEASED; urgency=low
-
- * chmod +x configure in debian/rules clean, to fix FTBFS.
-
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 19 Nov 2007 00:52:54 +0100
-
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index ca30cbb..a474d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,8 +103,6 @@ clean: xsfclean
rm -f include/dix-config.h include/do-not-use-config.h \
include/xorg-config.h include/xorg-server.h
- chmod +x configure
-
dh_clean
install: build
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
