From: Stanislav Brabec <utx@penguin.cz>
Date: Sun, 6 Apr 2008 23:39:25 +0000 (+0000)
Subject: goffice updated to version 0.6.2:
X-Git-Tag: Release-2010-05/1~7245^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb161ad2ccefa39f24c692c77b818c7117ea4938;p=openembedded.git

goffice updated to version 0.6.2:
* new stable branch
* required by newer gnumeric
* builds correctly in current OE
* dropped obsolete versions
---

diff --git a/packages/gnome/goffice_0.2.1.bb b/packages/gnome/goffice_0.2.1.bb
deleted file mode 100644
index 2048cdd34d..0000000000
--- a/packages/gnome/goffice_0.2.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r1"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnome/goffice_0.3.2.bb b/packages/gnome/goffice_0.6.2.bb
similarity index 85%
rename from packages/gnome/goffice_0.3.2.bb
rename to packages/gnome/goffice_0.6.2.bb
index a81f96910c..95e64a508e 100644
--- a/packages/gnome/goffice_0.3.2.bb
+++ b/packages/gnome/goffice_0.6.2.bb
@@ -4,7 +4,7 @@ PR="r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libxml2 libart-lgpl"
+DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl"
 
 FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
 
@@ -12,7 +12,7 @@ inherit gnome pkgconfig
 
 do_stage() {
         gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C goffice libgoffice-0.6 ${STAGING_LIBDIR}
 }
 
 PACKAGES_DYNAMIC = "goffice-plugin-*"