[oe-commits] org.oe.dev merge of '353324dd9a65b594eaee01782ae8aa085ae87b9a'

[hrw commit]

merge of '353324dd9a65b594eaee01782ae8aa085ae87b9a'
     and '5a50d1d54a36230e32c94701cae6d541b1ff2707'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3263bb8f7f5649e8d58f55f6a448e00449fbeae1
ViewMTN: http://monotone.openembedded.org/revision/info/3263bb8f7f5649e8d58f55f6a448e00449fbeae1
Files:
1
packages/navit/navit_cvs.bb
packages/matchbox-common/matchbox-common_0.9.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
Diffs:

#
# mt diff -r353324dd9a65b594eaee01782ae8aa085ae87b9a -r3263bb8f7f5649e8d58f55f6a448e00449fbeae1
#
# 
# 
# add_file "packages/navit/navit_cvs.bb"
#  content [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
# 
# 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]
# 
============================================================
--- packages/navit/navit_cvs.bb	bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9
+++ packages/navit/navit_cvs.bb	bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9
@@ -0,0 +1,19 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+PV = "0.0.2+cvs${SRCDATE}"
+PR = "r0"
+
+inherit autotools
+S = "${WORKDIR}/navit"
+
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
+          "
+
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+#--enable-shared
+
+EXTRA_AUTORECONF = " -I m4"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+
============================================================
--- 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 = " \


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