From 79031b082b19d726dc166fd11e6a66503cda60f2 Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Thu, 12 May 2011 08:08:05 +0800
Subject: recipes: Add Upstream-Status to multiple recipes

gtk+: Add Upstream-Status
ed: Add Upstream-Status
gnome-common: Add Upstream-Status
libmatchbox: Add Upstream-Status
matchbox-wm: Add Upstream-Status
x11vnc: Add Upstream-Status
xtscal: Add Upstream-Status
eds-dbus: Add Upstream-Status
matchbox-desktop: Add Upstream-Status
matchbox-keyboard: Add Upstream-Status
matchbox-stroke: Add Upstream-Status
matchbox-theme-sato: Add Upstream-Status
owl-video-widget: Add Upstream-Status
beecrypt: Add Upstream-Status
gnome-icon-theme: Add Upstream-Status
tslib: Add Upstream-Status
libowl-av: Add Upstream-Status
sato-icon-theme: Add Upstream-Status
web-webkit: Add Upstream-Status
metacity: Add Upstream-Status
apr: Add Upstream-Status
gdk-pixbuf: Add Upstream-Status
pcmanfm: Add Upstream-Status
gpgme: Add Upstream-Status
eee-acpi-scripts: Add Upstream-Status
libgalago: Add Upstream-Status
python-pygtk: Add Upstream-Status
gnome-mime-data: Add Upstream-Status
clutter: Add Upstream-Status
clutter-gtk: Add Upstream-Status
tidy: Add Upstream-Status
mutter: Add Upstream-Status
xcursor-transparent-theme: Add Upstream-Status
leafpad: Add Upstream-Status
matchbox-config-gtk: Add Upstream-Status
contacts: Add Upstream-Status
dates: Add Upstream-Status
web: Add Upstream-Status
webkit: Add Upstream-Status
 - Also removed empty fix_im.patch
apr-util: Add Upstream-Status
libcroco: Add Upstream-Status
liboil: Add Upstream-Status
libxslt: Add Upstream-Status
libglade: Add Upstream-Status
gnome-terminal: Add Upstream-Status
xev: Add Upstream-Status
claws-mail: Add Upstream-Status
clipboard-manager: Add Upstream-Status
epdfview: Add Upstream-Status
kf: Add Upstream-Status
qemu: Add Upstream-Status
clutter-gst: Add Upstream-Status
table: Add Upstream-Status
matchbox-panel-2: Add Upstream-Status

(From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-sato/web/web-webkit/link-with-g++.patch | 3 +++
 meta/recipes-sato/web/web-webkit/make-382.patch      | 2 ++
 meta/recipes-sato/web/web/owl-window-menu.patch      | 2 ++
 3 files changed, 7 insertions(+)

(limited to 'meta/recipes-sato/web')

diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
index 50d6e93792..e0c678457a 100644
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
@@ -3,6 +3,9 @@ linking. The easiest way to achieve this is to add a dummy cpp file.
 This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
 
 RP - 14/4/08 
+
+Upstream-Status: Inappropriate [configuration]
+
 --- webkit.orig/src/Makefile.am
 +++ webkit/src/Makefile.am
 @@ -1,11 +1,11 @@
diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
index 253743d18f..3689435e32 100644
--- a/meta/recipes-sato/web/web-webkit/make-382.patch
+++ b/meta/recipes-sato/web/web-webkit/make-382.patch
@@ -2,6 +2,8 @@ Make 3.82 does not allow 8 spaces instead of a tab
 
 JL - 15/12/10
 
+Upstream-Status: Inappropriate [configuration]
+
 Index: webkit/Makefile.am
 ===================================================================
 --- webkit.orig/Makefile.am
diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
index 8b46c3256d..1e5916a8fc 100644
--- a/meta/recipes-sato/web/web/owl-window-menu.patch
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
 Index: trunk/src/web_main.c
 ===================================================================
 --- trunk.orig/src/web_main.c	2007-12-18 15:04:13.000000000 -0800
-- 
cgit v1.2.3-54-g00ecf