[oe-commits] org.oe.dev merge of '5a50d1d54a36230e32c94701cae6d541b1ff2707'

[xora commit]

merge of '5a50d1d54a36230e32c94701cae6d541b1ff2707'
     and '901d93e149a63cd1f5f76b365dfce833a71af87a'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 3dba2b4dd503fad1d9b3136a589986975da39964
ViewMTN: http://monotone.openembedded.org/revision/info/3dba2b4dd503fad1d9b3136a589986975da39964
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/openmoko2/openmoko-dialer2_svn.bb
packages/matchbox-common/matchbox-common_0.9.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/navit/navit_cvs.bb
Diffs:

#
# mt diff -r5a50d1d54a36230e32c94701cae6d541b1ff2707 -r3dba2b4dd503fad1d9b3136a589986975da39964
#
# 
# 
# 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
 


#
# mt diff -r901d93e149a63cd1f5f76b365dfce833a71af87a -r3dba2b4dd503fad1d9b3136a589986975da39964
#
# 
# 
# patch "packages/matchbox-common/matchbox-common_0.9.1.bb"
#  from [bddf9d7d1a113a7b887c375bef97a8a3174105be]
#    to [68df8bc491f589a6f3e7b69e5b10ec838e6b621f]
# 
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
#  from [36a2cba9690e481018472bdb8535b9f41a7769bf]
#    to [98095f550f8c77883c44c40c96ff2b2161a07c87]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [45f78eea6f26041db46347891bf6cfad062b1b81]
#    to [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
# 
============================================================
--- packages/matchbox-common/matchbox-common_0.9.1.bb	bddf9d7d1a113a7b887c375bef97a8a3174105be
+++ packages/matchbox-common/matchbox-common_0.9.1.bb	68df8bc491f589a6f3e7b69e5b10ec838e6b621f
@@ -1,14 +1,14 @@ DEPENDS = "libmatchbox"
 DESCRIPTION = "Matchbox window manager common files"
 SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://no-utilities-category.patch;patch=1 \
            file://add-media-category.patch;patch=1"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
 
 EXTRA_OECONF = "--enable-pda-folders"
 
@@ -17,4 +17,10 @@ FILES_${PN} = "\
   ${datadir}/matchbox/vfolders \
   ${datadir}/pixmaps"
 
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_PRIORITY = "11"
+
+
 PACKAGE_ARCH = "all"
============================================================
--- packages/matchbox-wm/matchbox-wm_1.2.bb	36a2cba9690e481018472bdb8535b9f41a7769bf
+++ packages/matchbox-wm/matchbox-wm_1.2.bb	98095f550f8c77883c44c40c96ff2b2161a07c87
@@ -1,9 +1,9 @@ RDEPENDS = ""
 require matchbox-wm.inc
 
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native "
 RDEPENDS = ""
 
-PR="r2"
+PR="r3"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
            file://gconf-2.m4 \
@@ -23,7 +23,7 @@ ALTERNATIVE_LINK = "${bindir}/x-window-m
 
 ALTERNATIVE_NAME = "x-window-manager"
 ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
 ALTERNATIVE_PRIORITY = "10"
 
 EXTRA_OECONF = " \
============================================================
--- packages/navit/navit_cvs.bb	45f78eea6f26041db46347891bf6cfad062b1b81
+++ packages/navit/navit_cvs.bb	bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9
@@ -8,7 +8,6 @@ SRC_URI = "cvs://anonymous@navit.cvs.sou
 S = "${WORKDIR}/navit"
 
 SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-#          file://compile-fix.patch;patch=1"
           "
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"