[oe-commits] org.oe.dev merge of '3dba2b4dd503fad1d9b3136a589986975da39964'

[hrw commit]

merge of '3dba2b4dd503fad1d9b3136a589986975da39964'
     and '876cf34988f6abf7cf9c048909f2a017a4582a61'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 6f4038f9978a5b4cd1f390d1b87da12f39b9a74a
ViewMTN: http://monotone.openembedded.org/revision/info/6f4038f9978a5b4cd1f390d1b87da12f39b9a74a
Files:
1
packages/tasks/task-gpe-sectest.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
conf/distro/include/sane-srcrevs.inc
packages/openmoko2/openmoko-dialer2_svn.bb
Diffs:

#
# mt diff -r3dba2b4dd503fad1d9b3136a589986975da39964 -r6f4038f9978a5b4cd1f390d1b87da12f39b9a74a
#
# 
# 
# delete "packages/tasks/task-gpe-sectest.bb"
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [098458d7451b302e662d248e4b54f392a787c643]
#    to [8bb22b9d820630e5803ef13f1376c3dc051c6e9f]
# 
============================================================
--- packages/lm_sensors/lmsensors-apps_2.10.1.bb	098458d7451b302e662d248e4b54f392a787c643
+++ packages/lm_sensors/lmsensors-apps_2.10.1.bb	8bb22b9d820630e5803ef13f1376c3dc051c6e9f
@@ -1,6 +1,6 @@ HOMEPAGE = "http://secure.netroedge.com/
 DESCRIPTION = "Hardware health monitoring applications"
 HOMEPAGE = "http://secure.netroedge.com/~lm78/"
-DEPENDS = "libsysfs virtual/libiconv"
+DEPENDS = "sysfsutils virtual/libiconv"
 LICENSE = "GPL"
 PR = "r2"
 


#
# mt diff -r876cf34988f6abf7cf9c048909f2a017a4582a61 -r6f4038f9978a5b4cd1f390d1b87da12f39b9a74a
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [75aa091df2487affbd25f7f9a213ee1b7e87d774]
#    to [6d0c484efba81861d983282087a7cb547e23b01a]
# 
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
#  from [31e4e965b0782f418f64556c10bf5a9e45fbff7c]
#    to [c4ffce03fc13089743a05ef4992588caaf7a1326]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	75aa091df2487affbd25f7f9a213ee1b7e87d774
+++ conf/distro/include/sane-srcrevs.inc	6d0c484efba81861d983282087a7cb547e23b01a
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "659"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3361"
+SRCREV_pn-openmoko-dialer2 ?= "3306"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
============================================================
--- packages/openmoko2/openmoko-dialer2_svn.bb	31e4e965b0782f418f64556c10bf5a9e45fbff7c
+++ packages/openmoko2/openmoko-dialer2_svn.bb	c4ffce03fc13089743a05ef4992588caaf7a1326
@@ -1,8 +1,9 @@ PR = "r5"
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r5"
+PE = "1"
 
 inherit openmoko2