[oe-commits] org.oe.dev merge of '4afe7a39abef322799f31bedff527afcc6c16d7f'

[coredump2 commit]

merge of '4afe7a39abef322799f31bedff527afcc6c16d7f'
     and 'c9fabe80e49ddb31c5f4120c9b456c5cb1aace8c'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 8f245ee5e55e12795960474b0ef1e39b8d5ad15a
ViewMTN: http://monotone.openembedded.org/revision/info/8f245ee5e55e12795960474b0ef1e39b8d5ad15a
Files:
1
conf/distro/include/moko-autorev.inc
packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
packages/settings-daemon/settings-daemon_svn.bb
Diffs:

#
# mt diff -r4afe7a39abef322799f31bedff527afcc6c16d7f -r8f245ee5e55e12795960474b0ef1e39b8d5ad15a
#
# 
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [936fa5b0bafa49c816782957d4d6d7de12cee042]
#    to [bfb54642af40a5440c951be6f7f4845770a7fb31]
# 
# patch "packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb"
#  from [8f9f753bc2c5c49521344050b8d6c56e4ec93404]
#    to [14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34]
# 
============================================================
--- conf/distro/include/moko-autorev.inc	936fa5b0bafa49c816782957d4d6d7de12cee042
+++ conf/distro/include/moko-autorev.inc	bfb54642af40a5440c951be6f7f4845770a7fb31
@@ -44,7 +44,7 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
-SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
+SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
============================================================
--- packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb	8f9f753bc2c5c49521344050b8d6c56e4ec93404
+++ packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb	14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34
@@ -1,4 +1,4 @@
-require uboot-openmoko_svn.bb
+require u-boot-openmoko_svn.bb
 
 inherit native
 


#
# mt diff -rc9fabe80e49ddb31c5f4120c9b456c5cb1aace8c -r8f245ee5e55e12795960474b0ef1e39b8d5ad15a
#
# 
# 
# patch "packages/settings-daemon/settings-daemon_svn.bb"
#  from [645f5cd35518ca1a4b650a7c494a2bed8154ac61]
#    to [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
# 
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb	645f5cd35518ca1a4b650a7c494a2bed8154ac61
+++ packages/settings-daemon/settings-daemon_svn.bb	f266cffda5f763fbd31050c83eb2c9e97bfcaaac
@@ -1,10 +1,12 @@ LICENSE = "GPL"
 DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
 LICENSE = "GPL"
-DEPENDS = "gconf glib-2.0"
+DEPENDS = "gconf glib-2.0 gtk+"
 RDEPENDS = "xrdb"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
 
+PR = "r1"
+
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://70settings-daemon"