merge of '397efbec9ac99e7d5a70da62efbdb0739257baec'

     and '73007e84fa4bb064d168541a555f54c32aa7d072'

6 files changed, 46 insertions, 2 deletions

diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index a31466a434..acc8498262 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -42,7 +42,6 @@ PREFERRED_VERSION_ipaq-sleep ?= "0.9"
 PREFERRED_VERSION_teleport ?= "0.34"
 PREFERRED_VERSION_xst ?= "0.15"
 
-
 PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
 PREFERRED_VERSION_gpe-appmgr ?= "2.8"
 PREFERRED_VERSION_gpe-autostarter ?= "0.12"
diff --git a/packages/gpephone/libsettings_0.3.bb b/packages/gpephone/libsettings_0.3.bb
new file mode 100644
index 0000000000..c429bb2481
--- /dev/null
+++ b/packages/gpephone/libsettings_0.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "G(PE)^2 settings API library"
+SECTION = "gpe/libs"
+PRIORITY = "required"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 gconf-dbus"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/${PN}/${P}.tar.gz"
+
+FILES_${PN} += " ${libdir}/*.so.*"
+FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
+FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
+
+do_stage () {
+    autotools_stage_all
+}
diff --git a/packages/sqlite/sqlite3-3.4.1/.mtn2git_empty b/packages/sqlite/sqlite3-3.4.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.4.1/.mtn2git_empty
diff --git a/packages/sqlite/sqlite3-3.4.1/libtool.patch b/packages/sqlite/sqlite3-3.4.1/libtool.patch
new file mode 100644
index 0000000000..ccf9993ed2
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.4.1/libtool.patch
@@ -0,0 +1,25 @@
+Index: sqlite-3.2.1/Makefile.in
+===================================================================
+--- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
++++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
+@@ -15,7 +15,10 @@
+ # The toplevel directory of the source tree.  This is the directory
+ # that contains this "Makefile.in" and the "configure.in" script.
+ #
+-TOP = @srcdir@
++TOP = $(srcdir)
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++top_builddir = .
+ 
+ # C Compiler and options for use in building executables that
+ # will run on the platform that is doing the build.
+@@ -96,7 +99,7 @@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+ INSTALL = @INSTALL@
+-LIBTOOL = ./libtool
++LIBTOOL = @LIBTOOL@
+ ALLOWRELEASE = @ALLOWRELEASE@
+ 
+ # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3_3.4.1.bb b/packages/sqlite/sqlite3_3.4.1.bb
new file mode 100644
index 0000000000..cee00874bd
--- /dev/null
+++ b/packages/sqlite/sqlite3_3.4.1.bb
@@ -0,0 +1,3 @@
+require sqlite3.inc
+PR = "r0"
+
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index f48c84bbaa..0596bcad1e 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices"
 SECTION = "x11/utils"
-LICENSE = "GPL"
+LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
 PV = "0.0+svn${SRCDATE}"
 PR = "r3"