[oe-commits] org.oe.dev merge of '58cd98da4adf334b3a3a9aa2ca78999544c51106'

[xora commit]

merge of '58cd98da4adf334b3a3a9aa2ca78999544c51106'
     and 'bbb0c0e6195245b39f66759ad685ab747657d131'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 915c245097ab5f04957b45d8b76b60ece103e80d
ViewMTN: http://monotone.openembedded.org/revision/info/915c245097ab5f04957b45d8b76b60ece103e80d
Files:
1
packages/gpgme/gpgme_1.1.4.bb
conf/machine/h5000.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r58cd98da4adf334b3a3a9aa2ca78999544c51106 -r915c245097ab5f04957b45d8b76b60ece103e80d
#
# 
# 
# patch "packages/gpgme/gpgme_1.1.4.bb"
#  from [53b2f747053c5b94da60e11074304b02588bb891]
#    to [aa0b3ea4aaa3d040cf4f1e567928d0281dc5af64]
# 
============================================================
--- packages/gpgme/gpgme_1.1.4.bb	53b2f747053c5b94da60e11074304b02588bb891
+++ packages/gpgme/gpgme_1.1.4.bb	aa0b3ea4aaa3d040cf4f1e567928d0281dc5af64
@@ -1,6 +1,6 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gp
 LICENSE = "GPL"
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libgpg-error pth libassuan"
 
@@ -20,3 +20,8 @@ do_stage() {
 	install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
 }
 
+FILES_${PN} = "${libdir}/libgpgme*.so.*"
+FILES_${PN}-dev += "${bindir}/gpgme-config"
+
+LEAD_SONAME = "libgpgme"
+


#
# mt diff -rbbb0c0e6195245b39f66759ad685ab747657d131 -r915c245097ab5f04957b45d8b76b60ece103e80d
#
# 
# 
# patch "conf/machine/h5000.conf"
#  from [e03a562f647e39de325cf64e33abb934e96da504]
#    to [b0fe52891e392a5d43162145964546c7517d27e4]
# 
# patch "packages/tasks/task-base.bb"
#  from [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
#    to [2ebcd1a884302a4643dd61431a84aadea41cb978]
# 
============================================================
--- conf/machine/h5000.conf	e03a562f647e39de325cf64e33abb934e96da504
+++ conf/machine/h5000.conf	b0fe52891e392a5d43162145964546c7517d27e4
@@ -27,6 +27,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
+			      kernel-module-h5400-bt \
 			      kernel-module-snd-soc-h5000 \
 			      kernel-module-i2c-pxa"
 
============================================================
--- packages/tasks/task-base.bb	1a4f000020453dc9598a87cbb8a1df9e88bc5c96
+++ packages/tasks/task-base.bb	2ebcd1a884302a4643dd61431a84aadea41cb978
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r59"
+PR = "r60"
 
 inherit task