[oe-commits] org.oe.dev merge

[xora commit]

merge

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 31024bd7a03a72ee2f8d8fcf92172e00365dd291
ViewMTN: http://monotone.openembedded.org/revision/info/31024bd7a03a72ee2f8d8fcf92172e00365dd291
Files:
1
packages/openmoko-projects.merge
packages/openmoko-projects.merge/assassin_svn.bb
packages/openmoko-projects.merge/diversity-daemon_svn.bb
packages/openmoko-projects.merge/diversity-nav_svn.bb
packages/openmoko-projects.merge/illume
packages/openmoko-projects.merge/illume/include-path.diff
packages/openmoko-projects.merge/illume_svn.bb
packages/openmoko-projects.merge/tangogps
packages/openmoko-projects.merge/tangogps/global-config-h.patch
packages/openmoko-projects.merge/tangogps_0.7.bb
packages/packagekit.merge
packages/packagekit.merge/files
packages/packagekit.merge/files/disable-docbook2man.patch
packages/packagekit.merge/packagekit_git.bb
packages/openmoko-projects/assassin_svn.bb
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
packages/packagekit/packagekit_git.bb
Diffs:

#
# mt diff -r25a0ed0729c8e42822ca420c9bacaea39f33ccc7 -r31024bd7a03a72ee2f8d8fcf92172e00365dd291
#
#
#
# delete "packages/openmoko-projects.merge"
# 
# delete "packages/openmoko-projects.merge/assassin_svn.bb"
# 
# delete "packages/openmoko-projects.merge/diversity-daemon_svn.bb"
# 
# delete "packages/openmoko-projects.merge/diversity-nav_svn.bb"
# 
# delete "packages/openmoko-projects.merge/illume"
# 
# delete "packages/openmoko-projects.merge/illume/include-path.diff"
# 
# delete "packages/openmoko-projects.merge/illume_svn.bb"
# 
# delete "packages/openmoko-projects.merge/tangogps"
# 
# delete "packages/openmoko-projects.merge/tangogps/global-config-h.patch"
# 
# delete "packages/openmoko-projects.merge/tangogps_0.7.bb"
# 
# delete "packages/packagekit.merge"
# 
# delete "packages/packagekit.merge/files"
# 
# delete "packages/packagekit.merge/files/disable-docbook2man.patch"
# 
# delete "packages/packagekit.merge/packagekit_git.bb"
# 
# patch "packages/openmoko-projects/assassin_svn.bb"
#  from [138a3c3ebad00edd5369a922d879c6435db33028]
#    to [ec54896d60155ed78661fbb53074c68150c9077c]
# 
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
#  from [999b1e20ed0a67ee79e83a1483e4de1d18c21e1f]
#    to [d791f5379c76cef1135ea42eb1ad3e1199c7320c]
# 
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
#  from [735e09ebf7933d1a68caa20982cd25a68e8dae54]
#    to [dd3619fc28f05cad72d65a94fbe062468b4920b0]
# 
# patch "packages/packagekit/packagekit_git.bb"
#  from [8fe65fd15a32dc4664adf3b54c04374d3aff362c]
#    to [e472c18b509c7526b9b58c4c600b74cb2d57a6d4]
#
============================================================
--- packages/openmoko-projects/assassin_svn.bb	138a3c3ebad00edd5369a922d879c6435db33028
+++ packages/openmoko-projects/assassin_svn.bb	ec54896d60155ed78661fbb53074c68150c9077c
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "Action GUI for Installer"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
 PV = "0.2+svn${SRCREV}"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
 
============================================================
--- packages/openmoko-projects/diversity-daemon_svn.bb	999b1e20ed0a67ee79e83a1483e4de1d18c21e1f
+++ packages/openmoko-projects/diversity-daemon_svn.bb	d791f5379c76cef1135ea42eb1ad3e1199c7320c
@@ -2,10 +2,10 @@ LICENSE = "GPL"
 HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "net/misc"
 LICENSE = "GPL"
-DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl"
-RDEPENDS = "eds-dbus gypsy openmoko-dialer2"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS = "eds-dbus openmoko-dialer2"
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
 
@@ -13,7 +13,7 @@ inherit autotools pkgconfig
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus"
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
 
 FILES_${PN} += "${datadir}/dbus-1/"
 FILES_${PN} += "${sysconfdir}/dbus-1/"
============================================================
--- packages/openmoko-projects/diversity-nav_svn.bb	735e09ebf7933d1a68caa20982cd25a68e8dae54
+++ packages/openmoko-projects/diversity-nav_svn.bb	dd3619fc28f05cad72d65a94fbe062468b4920b0
@@ -3,9 +3,9 @@ DEPENDS = "evas edje ecore edbus"
 SECTION = "openmoko/applications"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
-RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png"
+RDEPENDS = "diversity-daemon"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
 
============================================================
--- packages/packagekit/packagekit_git.bb	8fe65fd15a32dc4664adf3b54c04374d3aff362c
+++ packages/packagekit/packagekit_git.bb	e472c18b509c7526b9b58c4c600b74cb2d57a6d4
@@ -2,10 +2,10 @@ LICENSE = "GPL"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool"
-RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg"
+DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
+RDEPENDS = "opkg"
 PV = "0.1+git${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
            file://disable-docbook2man.patch;patch=1"
@@ -25,3 +25,4 @@ FILES_${PN} += "${libdir}/packagekit-bac
 }
 
 FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/"
+FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so "