[poky] [PATCH 04/24] gnome-vfs: update its patch's Upstream-Status
Dexuan Cui
dexuan.cui at intel.com
Tue May 10 23:26:50 PDT 2011
From: Dexuan Cui <dexuan.cui at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
---
.../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch | 2 ++
.../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
index 3dbc130..0f52136 100644
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
@@ -154,7 +154,7 @@
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
index e25ecdd..dabec32 100644
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
removes kerberos completely to avoid conflicts with installed kerberos
--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
+++ configure.in 2007-01-05 19:42:56.604261797 +0200
--
1.7.2
More information about the poky
mailing list