[oe-commits] org.oe.dev merge of 'c52d04f83b7eef3842ea742601beddaf2691356e'

[xora commit]

merge of 'c52d04f83b7eef3842ea742601beddaf2691356e'
     and 'fce2adbdc811d266a8655968e8ba49f814ae434e'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 5f1924931eba6262dd4cb92f0c0eeb8c0a69080c
ViewMTN: http://monotone.openembedded.org/revision/info/5f1924931eba6262dd4cb92f0c0eeb8c0a69080c
Files:
1
packages/openmoko2/libjana_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/openmoko2/openmoko-mediaplayer2_svn.bb
Diffs:

#
# mt diff -rc52d04f83b7eef3842ea742601beddaf2691356e -r5f1924931eba6262dd4cb92f0c0eeb8c0a69080c
#
# 
# 
# patch "packages/openmoko2/libjana_svn.bb"
#  from [3af6225d87476b9a12097c61226a21e1a880b384]
#    to [c9545a541ecf76d3592e82c5bf667cf381984d91]
# 
============================================================
--- packages/openmoko2/libjana_svn.bb	3af6225d87476b9a12097c61226a21e1a880b384
+++ packages/openmoko2/libjana_svn.bb	c9545a541ecf76d3592e82c5bf667cf381984d91
@@ -1,7 +1,7 @@ PV = "0.1.0+svnr${SRCREV}"
 DESCRIPTION = "O-Hand Jana Library"
 DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" 
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit autotools pkgconfig lib_package
 
@@ -16,14 +16,13 @@ do_stage() {
 	autotools_stage_all
 }
 
-PACKAGES = "libjana-ecal libjana-ecal-dbg \
-            libjana-gtk libjana-gtk-dbg \ 
-            libjana libjana-dbg libjana-dev \
-"
+PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
+             libjana-gtk libjana-gtk-dbg \ 
+            "
 
-FILES_libjana-ecal = "${libdir}/libjana.so.*"
+LEAD_SONAME = "libjana.so"
+
+FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
 FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
 FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
 FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
-FILES_libjana = "${libdir}/libjana.so.*"
-FILES_libjana-dbg = "${libdir}/.debug/libjana.so.*"


#
# mt diff -rfce2adbdc811d266a8655968e8ba49f814ae434e -r5f1924931eba6262dd4cb92f0c0eeb8c0a69080c
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [68174db4a686597d2417ecd378c32db5b19742b6]
#    to [e44a6f2e957a3e924c62d02fac7cf3236e6cbab0]
# 
# patch "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
#  from [74649b1d27e275317d1e844eab70431239d3d3fa]
#    to [d34ba67b0b3bd96a21bdcb63c52a50a81fd45e8d]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	68174db4a686597d2417ecd378c32db5b19742b6
+++ conf/distro/include/sane-srcrevs.inc	e44a6f2e957a3e924c62d02fac7cf3236e6cbab0
@@ -73,7 +73,7 @@ SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3261"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3263"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
============================================================
--- packages/openmoko2/openmoko-mediaplayer2_svn.bb	74649b1d27e275317d1e844eab70431239d3d3fa
+++ packages/openmoko2/openmoko-mediaplayer2_svn.bb	d34ba67b0b3bd96a21bdcb63c52a50a81fd45e8d
@@ -1,9 +1,9 @@ DEPENDS = "libmokoui2 expat gstreamer li
 DESCRIPTION = "A media player for OpenMoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
-RDEPENDS = "gst-meta-audio"
+RDEPENDS = "gst-meta-audio gconf"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit openmoko2
 
@@ -20,5 +20,6 @@ fi
     exit 1
 fi
 
-gconftool-2 --makefile-install-rule ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
 }