From 92bc5616ee7d89e0d0c68187de0802e536b7f916 Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Wed, 7 Jul 2010 18:25:14 +0800
Subject: gnome-common: update to 2.28.0

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/packages/gnome/gnome-common-2.20.0/omf.patch | 13 ------------
 meta/packages/gnome/gnome-common-2.28.0/omf.patch | 13 ++++++++++++
 meta/packages/gnome/gnome-common_2.20.0.bb        | 23 ----------------------
 meta/packages/gnome/gnome-common_2.28.0.bb        | 24 +++++++++++++++++++++++
 4 files changed, 37 insertions(+), 36 deletions(-)
 delete mode 100644 meta/packages/gnome/gnome-common-2.20.0/omf.patch
 create mode 100644 meta/packages/gnome/gnome-common-2.28.0/omf.patch
 delete mode 100644 meta/packages/gnome/gnome-common_2.20.0.bb
 create mode 100644 meta/packages/gnome/gnome-common_2.28.0.bb

(limited to 'meta/packages')

diff --git a/meta/packages/gnome/gnome-common-2.20.0/omf.patch b/meta/packages/gnome/gnome-common-2.20.0/omf.patch
deleted file mode 100644
index 0d85b001e0..0000000000
--- a/meta/packages/gnome/gnome-common-2.20.0/omf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 @@
- install-data-hook-omf:
- 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(omffile); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		if [ -f $$file.out ]; then \
-+			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		fi; \
- 	done
- 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
diff --git a/meta/packages/gnome/gnome-common-2.28.0/omf.patch b/meta/packages/gnome/gnome-common-2.28.0/omf.patch
new file mode 100644
index 0000000000..0d85b001e0
--- /dev/null
+++ b/meta/packages/gnome/gnome-common-2.28.0/omf.patch
@@ -0,0 +1,13 @@
+--- 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 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(omffile); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		if [ -f $$file.out ]; then \
++			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		fi; \
+ 	done
+ 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/meta/packages/gnome/gnome-common_2.20.0.bb b/meta/packages/gnome/gnome-common_2.20.0.bb
deleted file mode 100644
index c2eae72d55..0000000000
--- a/meta/packages/gnome/gnome-common_2.20.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Common macros for building GNOME applications"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "GPLv3"
-
-SECTION = "x11/gnome"
-PR = "r1"
-inherit gnome
-
-# all isn't appropriate since STAGING_DATADIR is target specific
-# PACKAGE_ARCH="all"
-
-# The omf.make file failed if scrollkeeper doesn't happen to be
-# installed
-
-SRC_URI += "file://omf.patch;patch=1"
-
-EXTRA_AUTORECONF = ""
-DEPENDS = ""
-
-FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = ""
diff --git a/meta/packages/gnome/gnome-common_2.28.0.bb b/meta/packages/gnome/gnome-common_2.28.0.bb
new file mode 100644
index 0000000000..5106f58e6b
--- /dev/null
+++ b/meta/packages/gnome/gnome-common_2.28.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Common macros for building GNOME applications"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SECTION = "x11/gnome"
+PR = "r0"
+inherit gnome
+
+# all isn't appropriate since STAGING_DATADIR is target specific
+# PACKAGE_ARCH="all"
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
-- 
cgit v1.2.3-54-g00ecf