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
+Upstream-Status: Pending
+
Index: table/Makefile
===================================================================
--- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100
+Upstream-Status: Inappropriate [configuration]
+
Index: tidy/doc/reference/Makefile.am
===================================================================
--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: trunk/tests/Makefile.am
===================================================================
--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000
+Upstream-Status: Inappropriate [disable feature]
+
---
xev.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
+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
+Upstream-Status: Pending
+
Remove duplicate file entries as this breaks install with new Automake
JL 19/03/10
+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
+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
+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
+Upstream-Status: Inappropriate [configuration]
+
Index: 0.6.4/Makefile.am
===================================================================
--- 0.6.4.orig/Makefile.am 2007-06-28 12:23:37.000000000 +0100
+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
+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
+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
+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
+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
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
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
+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
+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
+Upstream-Status: Inappropriate [configuration]
+
Index: pygtk-2.10.0/gtk/gtkunixprint.override
===================================================================
--- pygtk-2.10.0.orig/gtk/gtkunixprint.override
+Upstream-Status: Inappropriate [configuration]
+
Index: pygtk-2.17.0/Makefile.am
===================================================================
--- pygtk-2.17.0.orig/Makefile.am
+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
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
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
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
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
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
+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
# 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
Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
Index: qemu-0.14.0/vl.c
===================================================================
--- qemu-0.14.0.orig/vl.c
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
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile
===================================================================
--- qemu-0.14.0.orig/Makefile
+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
+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
# 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
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
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
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
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
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
+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
+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 @@
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
+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
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
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderer.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk/gtkcombobox.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
+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 @@
+Upstream-Status: Pending
+
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk+-2.12.5/gtk/gtkfilechooserdefault.c
================ ===================================================
--- gtk+-2.12.5/gtk/gtkfilechooserdefault.c (revision 19337)
+Upstream-Status: Inappropriate [enable feature]
+
--- gtk+-2.12.7.orig/gtk/gtkfilechooserdialog.c
+++ gtk+-2.12.7/gtk/gtkfilechooserdialog.c
@@ -165,10 +165,10 @@
+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
+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 @@
+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 @@
+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 @@
+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 @@
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
5f084ea0849d5967a3c22821542ecaaa8accb398
+
+Upstream-Status: Inappropriate [enable feature]
+
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index bd95351..64e0e59 100644
--- gtk/gtkrange.c
+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 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gdk/x11/gdksettings.c
===================================================================
--- gdk/x11/gdksettings.c (revision 18493)
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c (revision 18523)
+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 @@
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
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderer.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
+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
+Upstream-Status: Pending
+
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
+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
+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 @@
+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 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c (revision 18523)
+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 @@
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
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderer.c
===================================================================
--- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800
+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
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
+Upstream-Status: Pending
+
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
+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
+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
+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
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c.orig 2010-06-22 18:11:33.000000000 +0800
+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
+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
+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 @@
+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
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
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
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
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
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
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
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
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
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
+Upstream-Status: Inappropriate [configuration]
+
Index: git/tests/interactive/Makefile.am
===================================================================
--- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
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
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
+Upstream-Status: Pending
+
Index: git/tests/test-depth.c
===================================================================
--- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +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
+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 @@
+Upstream-Status: Pending
+
Index: libmb/mbpixbuf.c
===================================================================
--- libmatchbox/libmb.orig/mbpixbuf.c 2006-02-01 12:45:55.000000000 +0000
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
+Upstream-Status: Inappropriate [configuration]
+
--- libmatchbox-1.5/configure.ac~autofoo 2004-12-21 12:56:46.000000000 -0500
+++ libmatchbox-1.5/configure.ac 2005-01-18 16:40:04.421179624 -0500
@@ -1,10 +1,10 @@
libmb.pc.in | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: libmatchbox-1.9/configure.ac
===================================================================
--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
diff -urNd ../libmatchbox-1.6-r1/libmatchbox-1.6/configure.ac libmatchbox-1.6/configure.ac
--- ../libmatchbox-1.6-r1/libmatchbox-1.6/configure.ac 2005-01-11 21:47:39 +00:00
+++ libmatchbox-1.6/configure.ac 2005-03-14 03:06:25 +00:00
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Pending
+
Index: libmatchbox-1.9/libmb/mbexp.c
===================================================================
--- libmatchbox-1.9.orig/libmb/mbexp.c 2010-08-28 06:33:25.000000000 +0800
+Upstream-Status: Inappropriate [configuration]
+
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
+Upstream-Status: Inappropriate [embedded specific]
+
Index: git/configure.in
===================================================================
--- git.orig/configure.in 2009-01-27 14:49:10.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: git/src/metacity-plugins.pc.in
===================================================================
--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: git/src/mutter-plugins.pc.in
===================================================================
--- git.orig/src/mutter-plugins.pc.in 2009-07-03 17:30:39.000000000 +0100
+Upstream-Status: Inappropriate [configuration]
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am 2009-01-27 13:26:12.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: git/configure.in
===================================================================
--- git.orig/configure.in 2009-06-16 13:12:17.000000000 +0100
## DP: See bug #496759 - being tested upstream for 32bit BE devices
@DPATCH@
+
+Upstream-Status: Pending
+
diff -urNad tslib-1.0~/plugins/input-raw.c tslib-1.0/plugins/input-raw.c
--- tslib-1.0~/plugins/input-raw.c 2008-12-09 10:56:47.000000000 +0000
+++ tslib-1.0/plugins/input-raw.c 2008-12-09 11:05:41.000000000 +0000
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: tslib-1.0/configure.ac
===================================================================
--- tslib-1.0.orig/configure.ac 2006-08-24 22:02:55.000000000 +0100
+Upstream-Status: Pending
+
--- tslib/plugins/linear.c~multievent
+++ tslib/plugins/linear.c
@@ -39,14 +39,12 @@
Signed-off-by: Yu Ke <ke.yu@intel.com>
+Upstream-Status: Pending
+
diff --git a/libvncserver/main.c b/libvncserver/main.c
index b6bd930..8bbb7bf 100644
--- a/libvncserver/main.c
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800
+Upstream-Status: Inappropriate [configuration]
+
diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
+Upstream-Status: Inappropriate [configuration]
+
diff -ur xcursor-transparent-theme-0.1.1~/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
--- xcursor-transparent-theme-0.1.1~/cursors/Makefile.am 2003-10-30 12:13:59.000000000 +0000
+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2004-07-27 12:56:24.000000000 +0100
+Upstream-Status: Pending
+
--- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000
+++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000
@@ -131,9 +131,10 @@
xtscal.in | 19 -----
6 files changed, 14 insertions(+), 455 deletions(-)
+Upstream-Status: Pending
+
Index: xtscal-0.6.3/xtscal.in
===================================================================
--- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
+Upstream-Status: Pending
+
Index: xtscal-0.6.3/configure.ac
===================================================================
--- xtscal-0.6.3.orig/configure.ac
+Upstream-Status: Inappropriate [configuration]
+
Index: trunk/configure.in
===================================================================
--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: addressbook/libedata-book/ximian-vcard.h
===================================================================
--- addressbook/libedata-book/ximian-vcard.h (revision 578)
This patch fix it.
+Upstream-Status: Submitted
+
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Index: git/addressbook/backends/file/e-book-backend-file.c
===================================================================
+Upstream-Status: Inappropriate [disable feature]
+
Index: git/camel/Makefile.am
===================================================================
--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: addressbook/libedata-book/ximian-vcard.h
===================================================================
--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800
+Upstream-Status: Inappropriate [disable feature]
+
Index: git/camel/providers/Makefile.am
===================================================================
--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800
RP 16/3/10
+Upstream-Status: Pending
+
Index: git/git.mk
===================================================================
--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
+Upstream-Status: Inappropriate [enable feature]
+
--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
@@ -152,7 +152,7 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: appearance/mb-appearance.c
===================================================================
--- appearance/mb-appearance.c (revision 1614)
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
+Upstream-Status: Pending
+
Index: matchbox-desktop-2/configure.ac
===================================================================
--- matchbox-desktop-2.orig/configure.ac
Signed-off-by: Yu Ke <ke.yu@intel.com>
+Upstream-Status: Pending
+
diff --git a/src/desktop.c b/src/desktop.c
index d4fc2fb..5aa2cfc 100644
--- a/src/desktop.c
+Upstream-Status: Inappropriate [configuration]
+
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
Index: matchbox-keyboard/matchbox-keyboard.desktop
===================================================================
+Upstream-Status: Inappropriate [other] - need clean up
+
diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Pending
+
Index: matchbox-panel-2/applets/startup/startup.c
===================================================================
--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
+Upstream-Status: Inappropriate [configuration]
+
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
+Upstream-Status: Pending
Index: matchbox-stroke/configure.ac
===================================================================
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
Index: matchbox-stroke/matchbox-stroke.desktop
===================================================================
Signed-off-by: Saul Wold <sgw@linux.intel.com>
+Upstream-Status: Pending
+
Index: matchbox-sato/Sato/matchbox2/Makefile.am
===================================================================
--- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c
--- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800
+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800
+Upstream-Status: Inappropriate [configuration]
+
Index: libowl-av/Makefile.am
===================================================================
--- libowl-av.orig/Makefile.am
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
diff -ruN video-orig/src/video.c video/src/video.c
--- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
JL - 15/12/10
+Upstream-Status: Inappropriate [configuration]
+
Index: video/Makefile.am
===================================================================
--- video.orig/Makefile.am
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
Index: pcmanfm-0.9.7/data/ui/Makefile.am
===================================================================
--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [enable feature]
+
Index: pcmanfm-0.9.7/configure.ac
===================================================================
--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800
+Upstream-Status: Inappropriate [enable feature]
+
Index: contacts-0.9/src/contacts-gtk.c
===================================================================
--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
JL - 15/12/10
+Upstream-Status: Accepted
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
src/dates_platform.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
+Upstream-Status: Inappropriate [enable feature]
+
Index: git/src/dates_gtk.c
===================================================================
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/19
+Upstream-Status: Pending
+
Index: git/src/Makefile.am
===================================================================
--- git.orig/src/Makefile.am
JL - 15/12/10
+Upstream-Status: Accepted
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
RP - 12/8/10
+Upstream-Status: Pending
+
Index: sato-icon-theme-0.4.1/configure.ac
===================================================================
--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
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 @@
JL - 15/12/10
+Upstream-Status: Inappropriate [configuration]
+
Index: webkit/Makefile.am
===================================================================
--- webkit.orig/Makefile.am
+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
Dolt cause build error on some platform, so disable it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
===================================================================
--- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-util-1.3.4/apu-config.in
===================================================================
--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-util-1.3.4/configure.in
===================================================================
--- apr-util-1.3.4.orig/configure.in
+++ /dev/null
-Index: apr-util-1.2.12/configure.in
-===================================================================
---- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
-+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
-@@ -8,13 +8,13 @@
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-
--sinclude(build/apu-conf.m4)
--sinclude(build/apu-iconv.m4)
--sinclude(build/apu-hints.m4)
--sinclude(build/apr_common.m4)
--sinclude(build/find_apr.m4)
--sinclude(build/dbm.m4)
--sinclude(build/dbd.m4)
-+#sinclude(build/apu-conf.m4)
-+#sinclude(build/apu-iconv.m4)
-+#sinclude(build/apu-hints.m4)
-+#sinclude(build/apr_common.m4)
-+#sinclude(build/find_apr.m4)
-+#sinclude(build/dbm.m4)
-+#sinclude(build/dbd.m4)
-
- dnl Generate ./config.nice for reproducing runs of configure
- dnl
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.4.2/buildconf
===================================================================
--- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.4.2/build/buildcheck.sh
===================================================================
--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.3.3/apr-config.in
===================================================================
--- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.3.3/configure.in
===================================================================
--- apr-1.3.3.orig/configure.in
We are unable to run code at configure time in a cross environemnt, but as we
control the build we can be fairly certain this dependency is met.
+Upstream-Status: Inappropriate [embedded specific]
+
JL 05/07/10
Index: beecrypt-4.2.1/configure.ac
===================================================================
http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
JL 05/07/10
+
+Upstream-Status: Pending
+
Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
===================================================================
--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
Index: gpgme-1.3.0/configure.ac
===================================================================
+Upstream-Status: Inappropriate [configuration]
+
--- opie/configure.in.old 2006-05-19 20:57:30.000000000 +0100
+++ opie/configure.in 2006-05-19 20:57:56.000000000 +0100
@@ -131,8 +131,8 @@
Fix typo in whitelist so cross-compile works for x86_64.
+Upstream-Status: Inappropriate [configuration]
+
--- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500
+++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400
@@ -9,7 +9,7 @@
+Upstream-Status: Inappropriate [disable feature]
+
--- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100
+++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100
@@ -345,7 +345,9 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libxslt-1.1.22/libexslt.pc.in
===================================================================
--- libxslt-1.1.22.orig/libexslt.pc.in 2008-03-19 16:52:20.000000000 +0000