patch upstream status update

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

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

deleted file mode 100644
index 2341e40..0000000
@@ -1,19 +0,0 @@
-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
-+++ xorg-server-1.7.99.2/configure.ac	2010-01-29 16:42:39.000000000 +0000
-@@ -503,14 +503,10 @@
- 
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR
--AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
--	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
--	[
- 		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
- 		case $host_os in
- 			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- 		esac
--	])
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- 				[ FONTPATH="$withval" ],
- 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])

deleted file mode 100644
index bd88427..0000000
@@ -1,20 +0,0 @@
---- 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 @@
-     /*
-      * Open the APM driver
-      */
--    LinuxApmFd = open ("/dev/apm_bios", 2);
-+    /*LinuxApmFd = open ("/dev/apm_bios", 2);
-     if (LinuxApmFd < 0 && errno == ENOENT)
- 	LinuxApmFd = open ("/dev/misc/apm_bios", 2); 
-     if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
- 	RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
- 	AddEnabledDevice (LinuxApmFd);
-     }
--	
-+    */	
-     /*
-      * now get the VT
-      */

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>

148 lines not on this page · raw message

83 lines not on this page · raw message

61 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"

515 lines not on this page · raw message

54 lines not on this page · raw message

deleted file mode 100644
index 35ccada..0000000
@@ -1,13 +0,0 @@
---- 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[] =  {
-     "/dev/psaux",
-     "/dev/input/mice",
-     "/dev/adbmouse",
-+#ifdef BREAK_MY_SERIAL_CONSOLE
-     "/dev/ttyS0",
-     "/dev/ttyS1",
-+#endif
- };
- 
- #define NUM_DEFAULT_MOUSE    (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))

deleted file mode 100644
index 6b34032..0000000
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac	2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX

58 lines not on this page · raw message

index 52b63ed..cc9acaa 100644
@@ -4,7 +4,7 @@ DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \
         libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans bigreqsproto \
         xcmiscproto libdrm openssl"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
 PROVIDES = "virtual/xserver"
 PACKAGES =+ "xserver-kdrive-fbdev \

new file mode 100644
index 0000000..2f98bb8
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff --git a/configure.ac b/configure.ac
+index b3b752c..600500b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+ dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+ DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+-if test "$cross_compiling" != yes; then
+-	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+-		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+-		[case $host_os in
++		case $host_os in
+ 			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+-		esac])
+-fi
++		esac
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ 				[ FONTPATH="$withval" ],
+ 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])

index bd88427..458f19a 100644
@@ -1,20 +1,24 @@
---- 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 @@
+Upstream-Status: Inappropriate [disable feature]
+
+diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
+index 9863c14..adbfbaa 100644
+--- a/hw/kdrive/linux/linux.c
++++ b/hw/kdrive/linux/linux.c
+@@ -251,7 +251,7 @@ LinuxEnable (void)
      /*
       * Open the APM driver
       */
 -    LinuxApmFd = open ("/dev/apm_bios", 2);
-+    /*LinuxApmFd = open ("/dev/apm_bios", 2);
++/*  LinuxApmFd = open ("/dev/apm_bios", 2);
      if (LinuxApmFd < 0 && errno == ENOENT)
- 	LinuxApmFd = open ("/dev/misc/apm_bios", 2); 
+ 	LinuxApmFd = open ("/dev/misc/apm_bios", 2);
      if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ LinuxEnable (void)
  	RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
  	AddEnabledDevice (LinuxApmFd);
      }
--	
-+    */	
+-
++*/
      /*
       * now get the VT
       */

deleted file mode 100644
index ccc1913..0000000
@@ -1,39 +0,0 @@
-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
-+++ xorg-server-1.3.0.0/configure.ac	2007-05-09 16:51:34.000000000 +0200
-@@ -520,7 +520,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
- 
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
-+else
- REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
- 
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1603,7 +1607,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
- 
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
- 
- AC_TRY_COMPILE([
-@@ -1616,10 +1622,12 @@
- 
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
- 
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
- 
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], 

index 14cf990..4cde6ab 100644
@@ -1,14 +1,12 @@
 Add some extra video modes and change the default to VGA.
 
----
- hw/kdrive/src/kmode.c |   41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
+Upstream-Status: Inappropriate [embedded specific]
 
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c	2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c	2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming  kdMonitorTimings[
+diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
+index 38b7bc8..d569444 100644
+--- a/hw/kdrive/src/kmode.c
++++ b/hw/kdrive/src/kmode.c
+@@ -30,6 +30,31 @@ const KdMonitorTiming  kdMonitorTimings[] = {
      /*	H	V	Hz	KHz */
  		/*  FP	    BP	    BLANK   POLARITY */
  

@@ -40,10 +38,10 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
      /* IPAQ modeline:
       *
       * Modeline "320x240"      5.7222 320 337 340 352   240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming  kdMonitorTimings[
+@@ -39,6 +64,11 @@ const KdMonitorTiming  kdMonitorTimings[] = {
  	            1,      11,     14,     KdSyncNegative,
      },
-     
+ 
 +    {   240,	320,	64,	    0,
 +	            0,	    0,	    0,     KdSyncNegative,
 +	            0,      0,      0,     KdSyncNegative,

@@ -52,7 +50,7 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
      /* Other VESA modes */
      {	640,	350,	85,	31500,			    /* VESA */
  		    32,	    96,	    192,    KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming  kdMonitorTimings[
+@@ -74,11 +104,18 @@ const KdMonitorTiming  kdMonitorTimings[] = {
  		    16,	    120,    176,    KdSyncNegative, /* 37.861 */
  		    1,	    20,	    24,	    KdSyncNegative, /* 72.809 */
      },

@@ -62,17 +60,16 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
  		   16,	    48,	    160,    KdSyncNegative, /* 31.469 */
  		   10,	    33,	    45,	    KdSyncNegative, /* 59.940 */
      },
-+
-+
-+  {   480,    640,    60,     0,                      /* VESA */
+ 
++    {  480,    640,    60,     0,                      /* VESA */
 +               0,      0,     0,    KdSyncNegative, /* 31.469 */
 +               0,      0,     0,     KdSyncNegative, /* 59.940 */
-+   },
-+  
-     
++    },
++
      /* 800x600 modes */
      {	800,	600,	85,	56250,			    /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming  kdMonitorTimings[
+ 		    32,	    152,    248,    KdSyncPositive, /* 53.674 */
+@@ -88,8 +125,6 @@ const KdMonitorTiming  kdMonitorTimings[] = {
  		    16,	    160,    256,    KdSyncPositive, /* 46.875 */
  		    1,	    21,	    25,	    KdSyncPositive, /* 75.000 */
      },

index a5c22a5..125d126 100644
@@ -1,8 +1,10 @@
-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
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c	2008-09-25 21:55:46.000000000 +0100
-@@ -498,6 +498,7 @@
+Upstream-Status: Pending
+
+diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
+index 2c7fa91..7f6b6f9 100644
+--- a/hw/kdrive/fbdev/fbdev.c
++++ b/hw/kdrive/fbdev/fbdev.c
+@@ -485,6 +485,7 @@ fbdevRandRSetConfig (ScreenPtr		pScreen,
      KdScreenInfo	*screen = pScreenPriv->screen;
      FbdevScrPriv	*scrpriv = screen->driver;
      Bool		wasEnabled = pScreenPriv->enabled;

@@ -10,17 +12,10 @@ Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
      FbdevScrPriv	oldscr;
      int			oldwidth;
      int			oldheight;
-@@ -525,11 +526,46 @@
-     oldheight = screen->height;
-     oldmmwidth = pScreen->mmWidth;
-     oldmmheight = pScreen->mmHeight;
--    
-+
-     /*
+@@ -517,6 +518,41 @@ fbdevRandRSetConfig (ScreenPtr		pScreen,
       * Set new configuration
       */
--    
-+
+ 
 +    if (newwidth != oldwidth || newheight != oldheight)
 +    {
 +	struct fb_var_screeninfo var;

@@ -58,4 +53,4 @@ Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
 +
      scrpriv->randr = KdAddRotation (screen->randr, randr);
  
-     KdOffscreenSwapOut (screen->pScreen);
+     fbdevUnmapFramebuffer (screen);

similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/fix-newer-xorg-headers.patch

157 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/keyboard-resume-workaround.patch

new file mode 100644
index 0000000..b1340fb
@@ -0,0 +1,22 @@
+require xserver-kdrive.inc
+
+DEPENDS += "libxkbfile libxcalibrate font-util pixman"
+
+RDEPENDS_${PN} += "xkeyboard-config"
+
+EXTRA_OECONF += "--disable-glx"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+	file://extra-kmodes.patch; \
+	file://disable-apm.patch; \
+	file://no-serial-probing.patch; \
+	file://keyboard-resume-workaround.patch; \
+	file://hide-cursor-and-ppm-root.patch; \
+	file://fbdev_xrandr_ioctl.patch; \
+	file://fix-newer-xorg-headers.patch;\
+	file://crosscompile.patch;"
+
+S = "${WORKDIR}/xorg-server-${PV}"

deleted file mode 100644
index b7e5520..0000000
@@ -1,29 +0,0 @@
-require xserver-kdrive.inc
-
-DEPENDS += "libxkbfile libxcalibrate font-util pixman"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-EXTRA_OECONF += "--disable-glx"
-
-PE = "1"
-PR = "r26"
-
-SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
-	file://extra-kmodes.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://fbdev_xrandr_ioctl.patch;patch=1 \
-	file://fix-newer-xorg-headers.patch;patch=1 \
-	file://crosscompile.patch;patch=1 \
-	file://nodolt.patch;patch=1"
-#	file://kdrive-evdev.patch;patch=1
-#	file://kdrive-use-evdev.patch;patch=1
-#	file://enable-builtin-fonts.patch;patch=1
-#	file://optional-xkb.patch;patch=1
-
-
-S = "${WORKDIR}/xorg-server-${PV}"

index 2611f22..1ee8181 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 diff --git a/COPYING b/COPYING
 new file mode 100644
 index 0000000..d511905

index 9193929..c34ef34 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 ---
  Makefile  |    6 +++---
  config.mk |    3 ++-

index f6bd91e..c287014 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher

index 29012fe..c93f511 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- console-tools-0.3.2/kbdtools/showkey.c~compile	1999-08-25 17:20:08.000000000 -0400
 +++ console-tools-0.3.2/kbdtools/showkey.c	2004-05-09 03:03:23.000000000 -0400
 @@ -264,7 +264,6 @@

index f5b7532..60ee8ff 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher

index 47d7ea5..f370be8 100644
@@ -1,6 +1,8 @@
 Patch from Matthias Goebl <[email protected]>
 Added via OE bugtracker: bug #478
 
+Upstream-Status: Pending
+
 --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig
 +++ console-tools-0.3.2/kbdtools/kbd_mode.c
 @@ -29,11 +29,16 @@

index c73d8a3..0c95068 100644
@@ -1,6 +1,8 @@
 Fixing the locale issues isn't enough, console-tools also does a couple of
 other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)),
 
+Upstream-Status: Pending
+
 --- console-tools-0.3.2/lib/cfont/fontstruct.c.ark	2005-05-22 19:12:38.000000000 +0000
 +++ console-tools-0.3.2/lib/cfont/fontstruct.c	2005-05-22 19:13:23.000000000 +0000
 @@ -50,8 +50,7 @@

index 2611f22..1ee8181 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 diff --git a/COPYING b/COPYING
 new file mode 100644
 index 0000000..d511905

index aa2faf9..9b5e952 100644
@@ -11,6 +11,7 @@ This patch avoids these linking errors:
 Nitin A Kamble <[email protected]>
 Date: 2011/02/03
 
+Upstream-Status: Pending
 
 Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am
 ===================================================================

index 565832e..2f62972 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: git/os/osdep.h
 ===================================================================
 --- git.orig/os/osdep.h	2008-10-07 18:38:21.000000000 +0100

index daf5824..95ad9cf 100644
@@ -2,6 +2,8 @@
 #
 # by Kevin Tian <[email protected]>, 2010-07-21
 
+Upstream-Status: Inappropriate [disable feature]
+
 diff --git a/Makefile.am b/Makefile.am
 index 6f83c12..32972a8 100644
 --- a/Makefile.am

index 9550255..31dc0e9 100644
@@ -5,6 +5,8 @@
 #
 # Kevin Tian <[email protected]>, 2010-08-06
 
+Upstream-Status: Pending
+
 diff --git a/depmod.c b/depmod.c
 index 647e5e6..46e03e0 100644
 --- a/depmod.c

index 7b30824..d29957d 100644
@@ -2,6 +2,8 @@
 #
 # comments added by Kevin Tian <[email protected]>, 2010-07-21
 
+Upstream-Status: Pending
+
 diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
 --- module-init-tools-3.12/modprobe.8.orig
 +++ module-init-tools-3.12/modprobe.8

index 128c953..4a6e0fe 100644
@@ -1,6 +1,9 @@
 # poky uses new name to differentiate from modutils, so reflect this new name in source
 #
 # comment added by Kevin Tian <[email protected]>, 2010-07-21
+
+Upstream-Status: Inappropriate [embedded specific]
+
 --- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
 +++ module-init-tools-3.0-pre10/generate-modprobe.conf
 @@ -45,12 +45,12 @@

index ca83ec0..33fb6e0 100644
@@ -9,6 +9,8 @@
 #
 # by Kevin Tian <[email protected]>, 2010-07-21
 
+Upstream-Status: Pending
+
 Index: module-init-tools-3.2.2/Makefile.am
 ===================================================================
 --- module-init-tools-3.2.2.orig/Makefile.am	2010-05-26 15:43:16.000000000 -0400

index 6e7b76a..21ac49c 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 Index: modutils-initscripts-1.0/LICENSE
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

index a26a3a2..3198553 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- modutils-2.4.27/include/elf_arm.h.orig	2004-09-21 18:37:00.000000000 -0400
 +++ modutils-2.4.27/include/elf_arm.h	2004-09-21 18:38:18.000000000 -0400
 @@ -1,7 +1,11 @@

index cdf5015..63e80d7 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher

index 53750bc..4507b03 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: modutils-2.4.27/depmod/depmod.c
 ===================================================================
 --- modutils-2.4.27.orig/depmod/depmod.c

index 65904b6..b2419a4 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- modutils-2.4.26.orig/genksyms/lex.l
 +++ modutils-2.4.26/genksyms/lex.l
 @@ -130,6 +130,7 @@

index 0e15a10..ab100f2 100644
@@ -2,6 +2,8 @@ This test disables the annoying
    Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
 message.
 
+Upstream-Status: Inappropriate [disable feature]
+
 --- modutils-2.4.6/insmod/modprobe.c~notest	Mon Feb 26 02:07:17 2001
 +++ modutils-2.4.6/insmod/modprobe.c	Wed Feb 19 14:31:52 2003
 @@ -785,7 +785,6 @@

index 2927a23..973705e 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- modutils-2.4.25/Makefile.common.in	Sun Nov 24 21:23:35 2002
 +++ modutils-2.4.25/Makefile.common.in	Thu Jan 29 17:16:30 2004
 @@ -7,6 +7,7 @@

index 077baaf..e9f1224 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h
 --- modutils-2.4.27.orig/include/module.h	2003-01-27 11:22:02.000000000 -0500
 +++ modutils-2.4.27/include/module.h	2004-08-23 19:52:34.756772712 -0400