summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/sane-srcrevs.inc36
-rw-r--r--packages/openmoko2/openmoko-session2.bb2
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session2
3 files changed, 20 insertions, 20 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e522d7f73d..7187c875be 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -29,12 +29,12 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "3434"
+SRCREV_pn-libgsmd ?= "3451"
SRCREV_pn-libgsmd-devel ?= "3293"
-SRCREV_pn-libjana ?= "665"
-SRCREV_pn-libmokogsmd2 ?= "3362"
+SRCREV_pn-libjana ?= "697"
+SRCREV_pn-libmokogsmd2 ?= "3378"
SRCREV_pn-libmokojournal2 ?= "3217"
-SRCREV_pn-libmokopanelui2 ?= "3226"
+SRCREV_pn-libmokopanelui2 ?= "3349"
SRCREV_pn-libmokoui2 ?= "3229"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
@@ -58,37 +58,37 @@ SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3382"
+SRCREV_pn-openmoko-appmanager2 ?= "3442"
SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
SRCREV_pn-openmoko-common ?= "397"
-SRCREV_pn-openmoko-common2 ?= "2679"
+SRCREV_pn-openmoko-common2 ?= "3259"
SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "358"
+SRCREV_pn-openmoko-contacts2 ?= "374"
SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "659"
+SRCREV_pn-openmoko-dates2 ?= "661"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3306"
+SRCREV_pn-openmoko-dialer2 ?= "3462"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
SRCREV_pn-openmoko-footer ?= "2354"
SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3345"
SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-messages2 ?= "3424"
SRCREV_pn-openmoko-panel-battery ?= "3360"
-SRCREV_pn-openmoko-panel-bt ?= "2896"
+SRCREV_pn-openmoko-panel-bt ?= "3149"
SRCREV_pn-openmoko-panel-clock ?= "2567"
SRCREV_pn-openmoko-panel-demo ?= "1622"
SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "3185"
+SRCREV_pn-openmoko-panel-gsm ?= "3256"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
SRCREV_pn-openmoko-panel-usb ?= "3360"
SRCREV_pn-openmoko-session ?= "152"
@@ -98,12 +98,12 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324"
SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
SRCREV_pn-openmoko-taskmanager ?= "1663"
SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "346"
-SRCREV_pn-openmoko-terminal2 ?= "2972"
+SRCREV_pn-openmoko-tasks2 ?= "348"
+SRCREV_pn-openmoko-terminal2 ?= "3435"
SRCREV_pn-openmoko-theme-standard ?= "2370"
SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "3289"
-SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
+SRCREV_pn-openmoko-theme-standard2 ?= "3425"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3342"
SRCREV_pn-openmoko-today2-folders ?= "3414"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index a8768534b1..3d8c9109e1 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r62"
+PR = "r63"
SRC_URI = "\
file://etc \
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 2f27a4cc6a..9eea32a45d 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -2,7 +2,7 @@
SHOWCURSOR="no"
openmoko-today &
-openmoko-dialer &
+phone-kit &
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &