merge of '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'

     and '36fe2f5bf87b5a8eedda174012a2e93f8bb5a8f5'

8 files changed, 28 insertions, 99 deletions

diff --git a/packages/libeventdb/libeventdb.inc b/packages/libeventdb/libeventdb.inc
new file mode 100644
index 0000000000..7facee79ce
--- /dev/null
+++ b/packages/libeventdb/libeventdb.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Database access library for GPE calendar"
+SECTION = "gpe/libs"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libgpepimc sqlite"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit pkgconfig gpe autotools
+
+do_stage () {
+        autotools_stage_all
+}
diff --git a/packages/libeventdb/libeventdb_0.17.bb b/packages/libeventdb/libeventdb_0.17.bb
index 282383108b..bb8fbaa9b8 100644
--- a/packages/libeventdb/libeventdb_0.17.bb
+++ b/packages/libeventdb/libeventdb_0.17.bb
@@ -1,20 +1,5 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
+PR = "r1"
 
 headers = "event-db.h"
-
-do_stage () {
-	oe_libinstall -so libeventdb ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
-	done
-}
diff --git a/packages/libeventdb/libeventdb_0.18.bb b/packages/libeventdb/libeventdb_0.18.bb
index 2db316c65e..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.18.bb
+++ b/packages/libeventdb/libeventdb_0.18.bb
@@ -1,14 +1,3 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_0.19.bb b/packages/libeventdb/libeventdb_0.19.bb
index 52e44ecc0e..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.19.bb
+++ b/packages/libeventdb/libeventdb_0.19.bb
@@ -1,14 +1,3 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_0.21.bb b/packages/libeventdb/libeventdb_0.21.bb
index 52e44ecc0e..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.21.bb
+++ b/packages/libeventdb/libeventdb_0.21.bb
@@ -1,14 +1,3 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_0.30.bb b/packages/libeventdb/libeventdb_0.30.bb
index d93766a21a..b3b34d3be9 100644
--- a/packages/libeventdb/libeventdb_0.30.bb
+++ b/packages/libeventdb/libeventdb_0.30.bb
@@ -1,16 +1,4 @@
-DEFAULT_PREFERENCE = "-1"
-
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
-
-GPE_TARBALL_SUFFIX = "bz2"
+require libeventdb.inc
 
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
+PR = "r1"
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libeventdb/libeventdb_0.90.bb b/packages/libeventdb/libeventdb_0.90.bb
index 2372db528b..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.90.bb
+++ b/packages/libeventdb/libeventdb_0.90.bb
@@ -1,14 +1,3 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-        autotools_stage_all
-}
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_svn.bb b/packages/libeventdb/libeventdb_svn.bb
index 4361df2ea4..132205ee0a 100644
--- a/packages/libeventdb/libeventdb_svn.bb
+++ b/packages/libeventdb/libeventdb_svn.bb
@@ -1,21 +1,8 @@
-DESCRIPTION = "Database access library for GPE calendar"
-LICENSE     = "LGPL"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
+PR = "r1"
 PV = "0.90+svn${SRCDATE}"
-PR = "r0"
-
 DEFAULT_PREFERENCE = "-1"
 
-inherit pkgconfig gpe autotools
-
 SRC_URI = "${GPE_SVN}"
-
 S = "${WORKDIR}/${PN}"
-
-do_stage () {
-    autotools_stage_all
-}