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>
2026-06-01 13:09:50 +00:00 · 2011-05-12 08:08:05 +08:00
parent fc1859ea66
commit 79031b082b
172 changed files with 346 additions and 25 deletions
@@ -3,6 +3,8 @@ From: Seán de Búrca <leftmostcat@gmail.com>
 Date: Fri, 07 Aug 2009 00:38:52 +0000
 Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
 Upstream-Status: Inappropriate [configuration]
 ---
 diff --git a/help/el/el.po b/help/el/el.po
 index ab77264..635b68f 100644
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: table/Makefile
 ===================================================================
 --- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: tidy/doc/reference/Makefile.am
 ===================================================================
 --- tidy.orig/doc/reference/Makefile.am  2007-11-06 19:36:56.000000000 +0000
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: trunk/tests/Makefile.am
 ===================================================================
 --- trunk.orig/tests/Makefile.am	2008-03-04 12:22:10.000000000 +0000
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [disable feature]
 ---
 xev.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: claws-mail-2.9.1/claws-mail.desktop
 ===================================================================
 --- claws-mail-2.9.1.orig/claws-mail.desktop	2007-04-24 17:40:20.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Remove duplicate file entries as this breaks install with new Automake
 JL 19/03/10
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: claws-mail-2.9.1/src/addressbook.c
 ===================================================================
 --- claws-mail-2.9.1.orig/src/addressbook.c	2007-04-25 10:18:13.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [disable feature]
 Index: claws-mail-2.9.1/src/mainwindow.c
 ===================================================================
 --- claws-mail-2.9.1.orig/src/mainwindow.c	2007-04-25 07:40:10.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: 0.6.4/manager.c
 ===================================================================
 --- 0.6.4.orig/manager.c	2007-06-28 12:23:37.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: 0.6.4/Makefile.am
 ===================================================================
 --- 0.6.4.orig/Makefile.am	2007-06-28 12:23:37.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [disable feature]
 Index: 0.6.4/clipboard.sh
 ===================================================================
 --- 0.6.4.orig/clipboard.sh	2007-06-28 12:23:37.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: epdfview-0.1.7/src/Makefile.am
 ===================================================================
 --- epdfview-0.1.7.orig/src/Makefile.am	2010-07-13 12:30:44.014172385 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
 --- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in	2005-04-27 19:42:49.000000000 +0100
 +++ kf-0.5.4.1/configure.in	2005-09-29 14:12:32.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data
 diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop
 --- kf-0.5.4.1.orig/kf.desktop	2005-04-19 22:08:44.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: kf-0.5.4.1/src/jispman.c
 ===================================================================
 --- kf-0.5.4.1.orig/src/jispman.c	2006-12-03 15:33:47.000000000 +0100
@@ -3,6 +3,8 @@
 events/powerbtn  |    2 ++
 2 files changed, 5 insertions(+)
 Upstream-Status: Inappropriate [enable feature]
 Index: git/events/powerbtn
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -5,6 +5,8 @@
 actions/volume.sh     |    3 ---
 4 files changed, 12 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: git/eeepc-acpi-scripts/hotkey.sh
 ===================================================================
 --- git.orig/eeepc-acpi-scripts/hotkey.sh	2010-11-28 16:02:17.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: libgalago-0.5.2/po/Makefile.in.in
 ===================================================================
 --- libgalago-0.5.2.orig/po/Makefile.in.in	2006-06-06 09:59:17.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: libgalago-0.5.2/libgalago.pc.in
 ===================================================================
 --- libgalago-0.5.2.orig/libgalago.pc.in	2006-05-17 08:53:26.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: pygtk-2.10.0/gtk/gtkunixprint.override
 ===================================================================
 --- pygtk-2.10.0.orig/gtk/gtkunixprint.override
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: pygtk-2.17.0/Makefile.am
 ===================================================================
 --- pygtk-2.17.0.orig/Makefile.am
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: pygtk-2.10.4/gtk/__init__.py
 ===================================================================
 --- pygtk-2.10.4.orig/gtk/__init__.py	2007-11-27 19:27:05.000000000 -0300
@@ -8,6 +8,8 @@ Subject: [PATCH] Detect and use GCC atomic builtins for locking
 qemu-lock.h |   13 +++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
 Upstream-Status: Pending
 Index: qemu-0.14.0/configure
 ===================================================================
 --- qemu-0.14.0.orig/configure
@@ -2,6 +2,8 @@ Enable i386-linux-user
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 Upstream-Status: Inappropriate [configuration]
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target
@@ -8,6 +8,8 @@ Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/m
 linux-user/main.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
 Upstream-Status: Pending
 Index: qemu-0.14.0/linux-user/main.c
 ===================================================================
 --- qemu-0.14.0.orig/linux-user/main.c
@@ -6,6 +6,8 @@ added and files in the sysroot can be found.
 Patch from Paul Eggleton, Comments by RP 28/11/10
 Upstream-Status: Inappropriate [embedded specific]
 Index: qemu-0.14.0/configure
 ===================================================================
 --- qemu-0.14.0.orig/configure
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target	2011-04-04 12:12:19.142871742 +0100
@@ -2,6 +2,8 @@
 # makes info.info.x11.display zero and avoids the calls to
 # opengl_exec_set_parent_window, one of which is crashing.
 Upstream-Status: Pending
 Index: qemu-0.14.0/ui/sdl.c
 ===================================================================
 --- qemu-0.14.0.orig/ui/sdl.c
@@ -5,6 +5,8 @@ It has not been applied to upstream qemu
 Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 Index: qemu-0.14.0/vl.c
 ===================================================================
 --- qemu-0.14.0.orig/vl.c
@@ -7,6 +7,9 @@ More information is available on the Fedora Wiki:
 https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
 JL - 15/06/10
 Upstream-Status: Inappropriate [configuration]
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: qemu-0.14.0/Makefile
 ===================================================================
 --- qemu-0.14.0.orig/Makefile
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 diff -u -r qemu-0.14.0/Makefile.target qemu-0.14.0-fixed/Makefile.target
 --- qemu-0.14.0/Makefile.target 2011-04-26 21:22:17.627637741 -0700
 +++ qemu-0.14.0-fixed/Makefile.target   2011-04-26 21:23:02.767637747 -0700
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target
@@ -1,6 +1,9 @@
 # fix VMware VGA driver depth calculation error, which may cause segmentation fault
 #
 # ktian1, 06/29/2010
 Upstream-Status: Pending
 Index: qemu-0.14.0/console.h
 ===================================================================
 --- qemu-0.14.0.orig/console.h
@@ -10,6 +10,8 @@ committer Andrzej Zaborowski <andrew.zaborowski@intel.com> Tue, 16 Jun 2009 22:2
 target-i386/opengl_exec.c |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: qemu-0.14.0/target-i386/opengl_exec.c
 ===================================================================
 --- qemu-0.14.0.orig/target-i386/opengl_exec.c
@@ -9,6 +9,8 @@ Upstream-Status: other (logical part of qemu-git-qemugl-host.patch)
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 Upstream-Status: Inappropriate [other] - depends on qemu gl patch
 Index: qemu-0.14.0/target-i386/opengl_func.h
 ===================================================================
 --- qemu-0.14.0.orig/target-i386/opengl_func.h	2011-04-08 16:43:46.000000000 +0800
@@ -3,6 +3,8 @@ Author: Gerd Hoffmann <kraxel@redhat.com>
 Source: upstream, http://patchwork.ozlabs.org/patch/84704/
 Forwarding: not-needed
 Upstream-Status: Pending
 Index: qemu-0.14.0/hw/qxl.c
 ===================================================================
 --- qemu-0.14.0.orig/hw/qxl.c
@@ -9,6 +9,8 @@ http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
 ed had already taken GPLv3 when this patch out, so it should be GPLv3.
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 Upstream-Status: Pending
 Index: ed-1.5/configure
 ===================================================================
 --- ed-1.5.orig/configure	2010-08-30 07:34:49.000000000 -0700
@@ -4,6 +4,8 @@ This patch simple disables it.
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 Upstream-Status: Inappropriate [embedded specific]
 Index: gdk-pixbuf-2.22.1/configure.ac
 ===================================================================
 --- gdk-pixbuf-2.22.1.orig/configure.ac	2010-11-25 16:26:41.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: gdk-pixbuf-2.22.1/configure.ac
 ===================================================================
 --- gdk-pixbuf-2.22.1.orig/configure.ac	2010-11-26 09:06:34.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 --- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
 +++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
@@ -43,7 +43,9 @@
@@ -4,6 +4,9 @@ pkg-config will only search the target sysroot and we want the native script. Th
 patch adds an option to allow the path to the tool to be specified.
 RP - 12/8/10"
 Upstream-Status: Pending
 Index: gnome-icon-theme-2.31.0/configure.ac
 ===================================================================
 --- gnome-icon-theme-2.31.0.orig/configure.ac	2010-12-01 11:00:22.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: gnome-mime-data-2.18.0/Makefile.am
 ===================================================================
 --- gnome-mime-data-2.18.0.orig/Makefile.am	2009-06-11 17:27:48.000000000 +0100
@@ -3,6 +3,8 @@ rather than target binary in cross-compile environment.
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 Upstream-Status: Inappropriate [embedded specific]
 Index: metacity-2.30.3/src/Makefile.am
 ===================================================================
 --- metacity-2.30.3.orig/src/Makefile.am	2010-09-05 00:09:52.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkcellrenderer.c
 ===================================================================
 RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: gtk/gtkcombobox.c
 ===================================================================
 RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 --- gtk+-2.12.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
 +++ gtk+-2.12.0/configure.in	2006-07-05 18:11:44.000000000 +0200
@@ -1554,22 +1554 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkentry.c
 ===================================================================
 RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: gtk+-2.12.5/gtk/gtkfilechooserdefault.c
 ================ ===================================================
 --- gtk+-2.12.5/gtk/gtkfilechooserdefault.c	(revision 19337)
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 --- gtk+-2.12.7.orig/gtk/gtkfilechooserdialog.c 
 +++ gtk+-2.12.7/gtk/gtkfilechooserdialog.c 
@@ -165,10 +165,10 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: gtk+-2.12.3/gtk/gtkfilesystemunix.c
 ===================================================================
 --- gtk+-2.12.3.orig/gtk/gtkfilesystemunix.c	2007-12-04 16:52:08.000000000 +0000
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 --- gtk+-2.4.3/gtk/gtklabel.c~	2004-06-11 13:50:34.000000000 +0100
 +++ gtk+-2.4.3/gtk/gtklabel.c	2004-07-05 13:33:57.000000000 +0100
@@ -1623,6 +1623,7 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [embedded specific]
 --- /tmp/configure.in	2007-01-08 17:50:49.000000000 +0100
 +++ gtk+-2.10.7/configure.in	2007-01-08 17:52:33.495251000 +0100
@@ -371,7 +371,7 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 --- gtk+-2.10.0/gtk/gtkmenushell.c.orig	2006-07-05 17:17:34.000000000 +0200
 +++ gtk+-2.10.0/gtk/gtkmenushell.c	2006-07-05 17:19:01.000000000 +0200
@@ -42,7 +42,7 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 --- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
 +++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
@@ -1,6 +1,6 @@
@@ -13,6 +13,8 @@ performance figures compared to GTK+ 2.10.6 with pangocairo too
 a python/cairo script to get some nice graphics from a torture test
 session with several GTK+s, hope to get it ready soon.
 Upstream-Status: Inappropriate [enable feature]
 Index: gtk+-2.10.6/configure.in
 ===================================================================
 --- gtk+-2.10.6.orig/configure.in	2006-10-30 12:59:28.000000000 +0000
@@ -1,4 +1,7 @@
 5f084ea0849d5967a3c22821542ecaaa8accb398
 Upstream-Status: Inappropriate [enable feature]
 diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
 index bd95351..64e0e59 100644
 --- gtk/gtkrange.c
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 --- /tmp/Makefile.am	2007-01-08 17:44:47.000000000 +0100
 +++ gtk+-2.10.7/gtk/Makefile.am	2007-01-08 17:45:17.025251000 +0100
@@ -1128,11 +1128,11 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [enable feature]
 Index: gdk/x11/gdksettings.c
 ===================================================================
 --- gdk/x11/gdksettings.c	(revision 18493)
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkcellrenderertoggle.c
 ===================================================================
 --- gtk/gtkcellrenderertoggle.c	(revision 18523)
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 --- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
 +++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
@@ -2827,10 +2827,9 @@
@@ -13,6 +13,8 @@ since the internal value is returned without being duplicated.
 gtk/gtkrecentmanager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 Upstream-Status: Pending
 diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
 index 317b3d5..d062572 100644
 --- a/gtk/gtkrecentmanager.c
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkcellrenderer.c
 ===================================================================
 RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [embedded specific]
 Index: gtk+-2.14.2/configure.in
 ===================================================================
 --- gtk+-2.14.2.orig/configure.in	2008-09-23 16:32:42.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkentry.c
 ===================================================================
 RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [embedded specific]
 Index: gtk+-2.14.2/configure.in
 ===================================================================
 --- gtk+-2.14.2.orig/configure.in	2008-09-23 15:52:44.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 --- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
 +++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
@@ -1,6 +1,6 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 --- /tmp/Makefile.am	2007-01-08 17:44:47.000000000 +0100
 +++ gtk+-2.10.7/gtk/Makefile.am	2007-01-08 17:45:17.025251000 +0100
@@ -1128,11 +1128,11 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkcellrenderertoggle.c
 ===================================================================
 --- gtk/gtkcellrenderertoggle.c	(revision 18523)
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 --- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
 +++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
@@ -2827,10 +2827,9 @@
@@ -13,6 +13,8 @@ since the internal value is returned without being duplicated.
 gtk/gtkrecentmanager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 Upstream-Status: Pending
 Index: gtk+-2.21.2/gtk/gtkrecentmanager.c
 ===================================================================
 --- gtk+-2.21.2.orig/gtk/gtkrecentmanager.c	2010-06-22 18:11:30.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkcellrenderer.c
 ===================================================================
 --- gtk/gtkcellrenderer.c.orig	2010-06-22 17:21:22.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: gtk+-2.21.2/docs/faq/Makefile.am
 ===================================================================
 --- gtk+-2.21.2.orig/docs/faq/Makefile.am	2010-04-09 10:29:53.000000000 +0800
@@ -5,6 +5,9 @@ embedded applications, just don't build them.
 Thanks to Joshua Lock for suggesting this approach.
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 Upstream-Status: Inappropriate [embedded specific]
 diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am
 --- gtk+-2.22.1.orig/docs/Makefile.am	2010-11-15 04:13:09.000000000 -0800
 +++ gtk+-2.22.1/docs/Makefile.am	2011-02-23 19:25:16.914815097 -0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkentry.c
 ===================================================================
 RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [embedded specific]
 Index: gtk+-2.23.2/configure.in
 ===================================================================
 --- gtk+-2.23.2.orig/configure.in	2010-11-10 22:22:47.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: gtk+-2.23.2/Makefile.am
 ===================================================================
 --- gtk+-2.23.2.orig/Makefile.am	2010-11-10 20:34:42.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: gtk+-2.21.2/gtk/Makefile.am
 ===================================================================
 --- gtk+-2.21.2.orig/gtk/Makefile.am	2010-06-22 17:21:41.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk/gtkcellrenderertoggle.c
 ===================================================================
 --- gtk/gtkcellrenderertoggle.c.orig	2010-06-22 18:11:33.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: gtk+-2.21.2/gdk/x11/gdkevents-x11.c
 ===================================================================
 --- gtk+-2.21.2.orig/gdk/x11/gdkevents-x11.c	2010-06-22 17:28:04.000000000 +0800
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in
 --- libglade-2.4.0~/configure.in	2004-05-17 12:38:31.000000000 +0100
 +++ libglade-2.4.0/configure.in	2004-07-28 16:53:09.000000000 +0100
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 --- libglade-2.5.1/glade/Makefile.am.old	2006-04-25 21:03:25.000000000 +0100
 +++ libglade-2.5.1/glade/Makefile.am	2006-04-25 21:03:45.000000000 +0100
@@ -30,10 +30,6 @@
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 diff -urN libglade-2.4.2.orig/configure.in libglade-2.4.2/configure.in
 --- libglade-2.4.2.orig/configure.in	2005-02-11 12:42:58.000000000 +0100
 +++ libglade-2.4.2/configure.in	2005-03-22 01:22:00.000000000 +0100
@@ -5,6 +5,8 @@ Upstream-Status: Inappropriate [not used]
 examples/Makefile.am      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: clutter-gst/examples/Makefile.am
 ===================================================================
 --- clutter-gst.orig/examples/Makefile.am	2007-11-06 12:31:36.000000000 +0000
@@ -5,6 +5,8 @@ Upstream-Status: Inappropriate [not used]
 examples/Makefile.am      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: clutter-gst/examples/Makefile.am
 ===================================================================
 --- clutter-gst.orig/examples/Makefile.am	2007-11-06 12:31:36.000000000 +0000
@@ -5,6 +5,8 @@ Upstream-Status: Inappropriate [not used]
 examples/Makefile.am      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: git/examples/Makefile.am
 ===================================================================
 --- git.orig/examples/Makefile.am	2009-06-30 16:41:53.000000000 +0100
@@ -4,6 +4,8 @@ This patch enables the macros that clutter-gtk is still using
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 Upstream-Status: Inappropriate [configuration]
 Index: git/clutter-gtk/Makefile.am
 ===================================================================
 --- git.orig/clutter-gtk/Makefile.am	2011-05-04 14:07:20.000000000 -0700
@@ -2,6 +2,8 @@ Install the test binary needed for core-image-clutter
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 Upstream-Status: Inappropriate [configuration]
 Index: git/examples/Makefile.am
 ===================================================================
 --- git.orig/examples/Makefile.am	2011-05-04 14:07:20.000000000 -0700
@@ -2,6 +2,8 @@ Installing the same file twice causes an error in Automake 1.11
 JL 19/03/10
 Upstream-Status: Pending
 Index: git/clutter/Makefile.am
 ===================================================================
 --- git.orig/clutter/Makefile.am	2010-03-19 11:37:51.000000000 +0000
@@ -4,6 +4,8 @@
 tests/test-text.c   |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: clutter-0-6/tests/Makefile.am
 ===================================================================
 --- clutter.orig/tests/Makefile.am	2007-11-06 12:29:17.000000000 +0000
@@ -4,6 +4,8 @@
 tests/test-text.c   |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: clutter/tests/Makefile.am
 ===================================================================
 --- clutter.orig/tests/Makefile.am	2008-06-26 16:46:26.000000000 +0100
@@ -4,6 +4,8 @@
 tests/test-text.c   |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: git/tests/interactive/Makefile.am
 ===================================================================
 --- git.orig/tests/interactive/Makefile.am	2009-03-12 11:01:36.000000000 +0000
@@ -1,3 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
 Index: git/tests/interactive/Makefile.am
 ===================================================================
 --- git.orig/tests/interactive/Makefile.am	2011-01-28 14:06:29.000000000 +0800
@@ -4,6 +4,8 @@
 tests/test-text.c   |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: git/tests/interactive/Makefile.am
 ===================================================================
 --- git.orig/tests/interactive/Makefile.am	2009-03-12 11:01:36.000000000 +0000
@@ -4,6 +4,8 @@
 tests/test-text.c   |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 Upstream-Status: Inappropriate [configuration]
 Index: git/tests/interactive/Makefile.am
 ===================================================================
 --- git.orig/tests/interactive/Makefile.am	2009-11-30 17:39:46.000000000 +0000
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 Index: git/tests/test-depth.c
 ===================================================================
 --- git.orig/tests/test-depth.c	2009-05-24 14:54:40.000000000 +0100
@@ -30,6 +30,8 @@ Date:   Mon Oct 11 16:16:45 2010 +0100
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2363
 Upstream-Status: Backport
 diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
 index 3036639..1e723e7 100644
 --- a/tests/conform/Makefile.am
@@ -1,3 +1,5 @@
 Upstream-Status: Pending
 --- libmatchbox/libmb/mbpixbuf.c.orig	2007-05-04 14:41:55.000000000 +0100
 +++ libmatchbox/libmb/mbpixbuf.c	2007-05-04 14:41:55.000000000 +0100
@@ -710,46 +710,19 @@
--- a/Show More
+++ b/Show More