add upstream status info

deleted file mode 100644
index 13a6c2c..0000000
@@ -1,12 +0,0 @@
---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig	2006-06-08 14:49:12.158684250 +0200
-+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c	2006-06-08 14:49:52.493205000 +0200
-@@ -52,8 +52,8 @@
- /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
- 
- #define NEED_REPLIES
- #ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
-+#include <kdrive-config.h>
- #endif
- 
- #include <X11/X.h>

deleted file mode 100644
index 8ec3a37..0000000
@@ -1,11 +0,0 @@
-Index: xorg-server-1.2.0/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am	2007-03-28 17:11:38.000000000 +0200
-+++ xorg-server-1.2.0/hw/kdrive/Makefile.am	2007-03-28 17:12:28.000000000 +0200
-@@ -1,5 +1,5 @@
- if KDRIVEFBDEV
--FBDEV_SUBDIRS = fbdev
-+FBDEV_SUBDIRS = fbdev epson
- endif
- 
- if KDRIVEIMAGEON

deleted file mode 100644
index 9a59530..0000000
@@ -1,12 +0,0 @@
-Index: xorg-server-1.2.0/configure.ac
-===================================================================
---- xorg-server-1.2.0.orig/configure.ac	2007-03-29 13:28:10.000000000 +0200
-+++ xorg-server-1.2.0/configure.ac	2007-03-29 13:28:35.000000000 +0200
-@@ -1517,6 +1517,7 @@
-             AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
-         fi
-         AC_DEFINE(TSLIB, 1, [Have tslib support])
-+        AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support])
-     fi
- 
-     # damage shadow extension glx (NOTYET) fb mi

110 lines not on this page · raw message

41 lines not on this page · raw message

deleted file mode 100644
index eb98fb8..0000000
@@ -1,18 +0,0 @@
----
- render/glyphstr.h |    1 +
- 1 file changed, 1 insertion(+)
-
---- xorg-server-1.3.0.0.orig/render/glyphstr.h
-+++ xorg-server-1.3.0.0/render/glyphstr.h
-@@ -23,10 +23,11 @@
-  */
- 
- #ifndef _GLYPHSTR_H_
- #define _GLYPHSTR_H_
- 
-+#include <X11/X.h>
- #include <X11/extensions/renderproto.h>
- #include "picture.h"
- #include "screenint.h"
- #include "regionstr.h"
- #include "miscstruct.h"

307 lines not on this page · raw message

515 lines not on this page · raw message

54 lines not on this page · raw message

58 lines not on this page · raw message

deleted file mode 100644
index 72c8a18..0000000
@@ -1,29 +0,0 @@
-Server reports XRandR version provided by libxrandr instead of XRandR
-version implemented. It confuses applications that execute XRandR
-version dependent code (e. g. gtk+ >= 2.18.0).
-
-Index: xorg-server-1.3.0.0/randr/rrdispatch.c
-===================================================================
---- xorg-server-1.3.0.0.orig/randr/rrdispatch.c
-+++ xorg-server-1.3.0.0/randr/rrdispatch.c
-@@ -22,6 +22,9 @@
- 
- #include "randrstr.h"
- 
-+#define SERVER_RANDR_MAJOR	1
-+#define SERVER_RANDR_MINOR	2
-+
- Bool
- RRClientKnowsRates (ClientPtr	pClient)
- {
-@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
-      * Report the current version; the current
-      * spec says they're all compatible after 1.0
-      */
--    rep.majorVersion = RANDR_MAJOR;
--    rep.minorVersion = RANDR_MINOR;
-+    rep.majorVersion = SERVER_RANDR_MAJOR;
-+    rep.minorVersion = SERVER_RANDR_MINOR;
-     if (client->swapped) {
-     	swaps(&rep.sequenceNumber, n);
-     	swapl(&rep.length, n);

151 lines not on this page · raw message

122 lines not on this page · raw message

index 2341e40..87595d0 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [cross compiling]
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: xorg-server-1.7.99.2/configure.ac
 ===================================================================
 --- xorg-server-1.7.99.2.orig/configure.ac	2010-01-29 16:38:49.000000000 +0000

index bd88427..c22b1c0 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Yu Ke <[email protected]>
+
 --- xserver/hw/kdrive/linux/linux.c.orig	2005-04-23 15:56:13.988849232 +0000
 +++ xserver/hw/kdrive/linux/linux.c	2005-04-23 15:57:05.001094192 +0000
 @@ -342,7 +342,7 @@

index 13a6c2c..98d5176 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 --- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig	2006-06-08 14:49:12.158684250 +0200
 +++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c	2006-06-08 14:49:52.493205000 +0200
 @@ -52,8 +52,8 @@

index 9794e98..efac5ef 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 ---
  Xext/Makefile.am           |    6 ++++++
  configure.ac               |   11 +++++++++--

index 14cf990..896c033 100644
@@ -1,5 +1,9 @@
 Add some extra video modes and change the default to VGA.
 
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 ---
  hw/kdrive/src/kmode.c |   41 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 39 insertions(+), 2 deletions(-)

index a5c22a5..06761c9 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
 ===================================================================
 --- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c	2008-09-25 21:55:12.000000000 +0100

index eb98fb8..7aa487a 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 ---
  render/glyphstr.h |    1 +
  1 file changed, 1 insertion(+)

index 73f30ee..b946bb5 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: xorg-server-1.7.99.2/dix/window.c
 ===================================================================
 --- xorg-server-1.7.99.2.orig/dix/window.c	2009-11-04 16:25:50.000000000 +0000

index 2dc22bf..5d876af 100644
@@ -1,5 +1,10 @@
 # Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at
 # http://lists.freedesktop.org/archives/xorg/2005-December/011635.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c
 --- xserver.original/hw/kdrive/linux/evdev.c	2005-12-16 10:36:05.000000000 -0200
 +++ xserver/hw/kdrive/linux/evdev.c	2005-12-16 10:40:51.077410192 -0200

index 28d7325..8a480dc 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 --- xserver/hw/kdrive/fbdev/fbinit.c~	2006-01-31 17:09:33.000000000 +0100
 +++ xserver/hw/kdrive/fbdev/fbinit.c	2006-01-31 17:11:55.000000000 +0100
 @@ -28,6 +28,8 @@

index d614b54..0062661 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
 ===================================================================
 --- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c	2007-09-29 18:31:15.000000000 +0200

index 35ccada..6acb834 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 --- xserver/hw/kdrive/linux/mouse.c.orig	2004-05-13 14:25:51.000000000 -0700
 +++ xserver/hw/kdrive/linux/mouse.c	2005-09-22 12:20:47.000000000 -0700
 @@ -927,8 +927,10 @@ char *kdefaultMouse[] =  {

index 6b34032..37811db 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: git/configure.ac
 ===================================================================
 --- git.orig/configure.ac	2009-01-15 20:35:31.000000000 +0000

index a580b50..af3c16c 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: xorg-server-1.2.0/Makefile.am
 ===================================================================
 --- xorg-server-1.2.0.orig/Makefile.am	2007-01-23 06:39:15.000000000 +0100

index bd88427..c22b1c0 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Yu Ke <[email protected]>
+
 --- xserver/hw/kdrive/linux/linux.c.orig	2005-04-23 15:56:13.988849232 +0000
 +++ xserver/hw/kdrive/linux/linux.c	2005-04-23 15:57:05.001094192 +0000
 @@ -342,7 +342,7 @@

index ccc1913..631c111 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Yu Ke <[email protected]>
+
 Index: xorg-server-1.3.0.0/configure.ac
 ===================================================================
 --- xorg-server-1.3.0.0.orig/configure.ac	2007-04-20 03:23:40.000000000 +0200

index 14cf990..896c033 100644
@@ -1,5 +1,9 @@
 Add some extra video modes and change the default to VGA.
 
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 ---
  hw/kdrive/src/kmode.c |   41 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 39 insertions(+), 2 deletions(-)

index 35ccada..6acb834 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
 --- xserver/hw/kdrive/linux/mouse.c.orig	2004-05-13 14:25:51.000000000 -0700
 +++ xserver/hw/kdrive/linux/mouse.c	2005-09-22 12:20:47.000000000 -0700
 @@ -927,8 +927,10 @@ char *kdefaultMouse[] =  {