rpms/xorg-x11-server/F-9 .cvsignore, 1.50, 1.51 import.log, 1.4, 1.5 sources, 1.44, 1.45 xorg-x11-server.spec, 1.340, 1.341 xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.3, 1.4

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5093/F-9

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec 
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
Log Message:
xserver 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	24 Jul 2008 14:41:11 -0000	1.50
+++ .cvsignore	12 Sep 2008 14:14:43 -0000	1.51
@@ -1 +1 @@
-xorg-server-1.4.99.906.tar.bz2
+xorg-server-1.5.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	24 Jul 2008 14:41:11 -0000	1.4
+++ import.log	12 Sep 2008 14:14:43 -0000	1.5
@@ -1,2 +1,3 @@
 xorg-x11-server-1_4_99_905-2_20080702_fc9:F-9:xorg-x11-server-1.4.99.905-2.20080702.fc9.src.rpm:1215018868
 xorg-x11-server-1_4_99_906-1_fc9:F-9:xorg-x11-server-1.4.99.906-1.fc9.src.rpm:1216909882
+xorg-x11-server-1_5_0-1_fc9:F-9:xorg-x11-server-1.5.0-1.fc9.src.rpm:1221228853


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	24 Jul 2008 14:41:11 -0000	1.44
+++ sources	12 Sep 2008 14:14:43 -0000	1.45
@@ -1 +1 @@
-d225476fea6721d9f64c3268e47d6c51  xorg-server-1.4.99.906.tar.bz2
+9a817e5f7374d45b4dbe64b21bc0fb61  xorg-server-1.5.0.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- xorg-x11-server.spec	24 Jul 2008 14:41:11 -0000	1.340
+++ xorg-x11-server.spec	12 Sep 2008 14:14:43 -0000	1.341
@@ -18,7 +18,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.4.99.906
+Version:   1.5.0
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -459,6 +459,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Adam Jackson <ajax at redhat.com> 1.5.0-1
+- xserver 1.5.0
+
 * Wed Jul 23 2008 Adam Jackson <ajax at redhat.com> 1.4.99.906-1
 - 1.5RC6.
 

xserver-1.5.0-no-evdev-keyboards-kthnx.patch:

Index: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xserver-1.5.0-no-evdev-keyboards-kthnx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch	12 Jun 2008 02:07:31 -0000	1.3
+++ xserver-1.5.0-no-evdev-keyboards-kthnx.patch	12 Sep 2008 14:14:43 -0000	1.4
@@ -1,6 +1,6 @@
-From e654ed62d44b8d61484f97eab1b1adbfb08d375f Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Thu, 12 Jun 2008 11:52:29 +1000
+From d70615e602361be7204552327f1fd5fa6d170cd0 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Fri, 12 Sep 2008 10:12:55 -0400
 Subject: [PATCH] config: disable evdev for keyboards
 
 ---
@@ -8,12 +8,12 @@
  1 files changed, 28 insertions(+), 0 deletions(-)
 
 diff --git a/config/hal.c b/config/hal.c
-index f4eb438..ee0f18f 100644
+index 0e0505b..76e8c45 100644
 --- a/config/hal.c
 +++ b/config/hal.c
-@@ -168,6 +168,31 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
+@@ -166,6 +166,31 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
+     return ret;
  }
- #endif
  
 +static Bool
 +get_device_is_keyboard(LibHalContext *hal_ctx, const char *udi, DBusError *error_p)
@@ -43,7 +43,7 @@
  static void
  device_added(LibHalContext *hal_ctx, const char *udi)
  {
-@@ -184,6 +209,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+@@ -182,6 +207,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
  
      dbus_error_init(&error);
  
@@ -54,5 +54,5 @@
      if (!driver){
          /* verbose, don't tell the user unless they _want_ to see it */
 -- 
-1.5.3.7
+1.6.0.1