[oe-commits] org.oe.dev merge of '701525ebf6131710f441a3072f8f1caed332cc46'

[oe commit]

merge of '701525ebf6131710f441a3072f8f1caed332cc46'
     and '866608b5715d308c7f889aa90017e6c734d22ec9'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 8196954143da459743fc0873f202b26656eafd77
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8196954143da459743fc0873f202b26656eafd77
Files:
1
packages/sqlite/sqlite3-3.4.1
packages/gpephone/libsettings_0.3.bb
packages/sqlite/sqlite3-3.4.1/libtool.patch
packages/sqlite/sqlite3_3.4.1.bb
conf/distro/include/preferred-gpe-versions-2.8.inc
packages/tinymail/tinymail_svn.bb
packages/linux/linux-davinci-2.6.x+git-davinci
packages/linux/linux-davinci
packages/linux/linux-davinci_2.6.x+git-davinci.bb
Diffs:

#
# mt diff -r701525ebf6131710f441a3072f8f1caed332cc46 -r8196954143da459743fc0873f202b26656eafd77
#
# 
# 
# add_dir "packages/sqlite/sqlite3-3.4.1"
# 
# add_file "packages/gpephone/libsettings_0.3.bb"
#  content [61c18c3f3f7c85c3f6b358e60597da6b601f3126]
# 
# add_file "packages/sqlite/sqlite3-3.4.1/libtool.patch"
#  content [9301b88cfee311e677873cae9b461f3fc90eb8a8]
# 
# add_file "packages/sqlite/sqlite3_3.4.1.bb"
#  content [864e21b3ffae637c9108c0c4da631438c43fe2a8]
# 
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
#  from [95d8384bd258f6fdf1d0b790aeb71658730dfb06]
#    to [fa020aa138cff1662245ee01559d9b3ad76e31be]
# 
# patch "packages/tinymail/tinymail_svn.bb"
#  from [5dce4fb46d7a9edce192ee7fef92021d0cce21be]
#    to [e208f4dc14e0d54aa306a071db2a4abb3da2a8fe]
# 
============================================================
--- packages/gpephone/libsettings_0.3.bb	61c18c3f3f7c85c3f6b358e60597da6b601f3126
+++ packages/gpephone/libsettings_0.3.bb	61c18c3f3f7c85c3f6b358e60597da6b601f3126
@@ -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
+}
============================================================
--- packages/sqlite/sqlite3-3.4.1/libtool.patch	9301b88cfee311e677873cae9b461f3fc90eb8a8
+++ packages/sqlite/sqlite3-3.4.1/libtool.patch	9301b88cfee311e677873cae9b461f3fc90eb8a8
@@ -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
============================================================
--- packages/sqlite/sqlite3_3.4.1.bb	864e21b3ffae637c9108c0c4da631438c43fe2a8
+++ packages/sqlite/sqlite3_3.4.1.bb	864e21b3ffae637c9108c0c4da631438c43fe2a8
@@ -0,0 +1,3 @@
+require sqlite3.inc
+PR = "r0"
+
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc	95d8384bd258f6fdf1d0b790aeb71658730dfb06
+++ conf/distro/include/preferred-gpe-versions-2.8.inc	fa020aa138cff1662245ee01559d9b3ad76e31be
@@ -42,7 +42,6 @@ PREFERRED_VERSION_xst ?= "0.15"
 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"
============================================================
--- packages/tinymail/tinymail_svn.bb	5dce4fb46d7a9edce192ee7fef92021d0cce21be
+++ packages/tinymail/tinymail_svn.bb	e208f4dc14e0d54aa306a071db2a4abb3da2a8fe
@@ -1,6 +1,6 @@ SECTION = "x11/utils"
 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"


#
# mt diff -r866608b5715d308c7f889aa90017e6c734d22ec9 -r8196954143da459743fc0873f202b26656eafd77
#
# 
# 
# rename "packages/linux/linux-davinci-2.6.x+git-davinci"
#     to "packages/linux/linux-davinci"
# 
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
#  from [714ecc1c0690c34190e49d301e23fbdf74de8a13]
#    to [2819e17abe4e3733ead05d9cb2ecd933dabd0466]
# 
============================================================
--- packages/linux/linux-davinci_2.6.x+git-davinci.bb	714ecc1c0690c34190e49d301e23fbdf74de8a13
+++ packages/linux/linux-davinci_2.6.x+git-davinci.bb	2819e17abe4e3733ead05d9cb2ecd933dabd0466
@@ -1,5 +1,6 @@ require linux-omap.inc
 require linux-omap.inc
 
+PV = "2.6.x+git${SRCDATE}"
 PR = "r1"
 
 COMPATIBLE_MACHINE = "davinci-dvevm"