From 4378f77b0757aae29b22b367dbd468bc56a252e2 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 10 Jun 2009 17:28:03 +0100
Subject: gnome-desktop: 2.26.0 -> 2.26.2
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
meta-gnome/packages/gnome/gnome-desktop.inc | 4 +++-
meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch | 10 ++++++++++
meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb | 8 --------
meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb | 3 +++
4 files changed, 16 insertions(+), 9 deletions(-)
create mode 100644 meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
delete mode 100644 meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb
create mode 100644 meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
diff --git a/meta-gnome/packages/gnome/gnome-desktop.inc b/meta-gnome/packages/gnome/gnome-desktop.inc
index aeabf4f41..be00145a1 100644
--- a/meta-gnome/packages/gnome/gnome-desktop.inc
+++ b/meta-gnome/packages/gnome/gnome-desktop.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "GNOME library for reading .desktop files"
SECTION = "x11/gnome"
LICENSE = "GPL"
-DEPENDS = "gnome-common libgnomeui"
+DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
EXTRA_OECONF = "--disable-scrollkeeper"
@@ -14,3 +14,5 @@ do_stage () {
}
FILES_${PN} += "${datadir}/gnome-about"
+
+inherit gnome pkgconfig
\ No newline at end of file
diff --git a/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch b/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
new file mode 100644
index 000000000..c13234172
--- /dev/null
+++ b/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
@@ -0,0 +1,10 @@
+--- Makefile.am~ 2007-05-22 16:50:35.000000000 +0200
++++ Makefile.am 2007-05-22 16:50:35.000000000 +0200
+@@ -3,7 +3,6 @@
+ libgnome-desktop \
+ gnome-about \
+ pixmaps \
+- desktop-docs \
+ docs \
+ man
+
diff --git a/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb b/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb
deleted file mode 100644
index 52c0e6d3e..000000000
--- a/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require gnome-desktop.inc
-
-inherit gnome pkgconfig
-
-DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
-
-SRC_URI += " \
- file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb b/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
new file mode 100644
index 000000000..f4184a4d6
--- /dev/null
+++ b/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
@@ -0,0 +1,3 @@
+require gnome-desktop.inc
+
+SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
--
cgit v1.2.3