[oe-commits] org.oe.dev merge of '4691fac16318391e3125e1a88e96b9003fa1c4f0'

[mickeyl commit]

merge of '4691fac16318391e3125e1a88e96b9003fa1c4f0'
     and '9934077f8cc45499fe70c414041ee257c6f7b98d'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f74df1cd51f519cf932bce26d4e97f1f77795a0e
ViewMTN: http://monotone.openembedded.org/revision/info/f74df1cd51f519cf932bce26d4e97f1f77795a0e
Files:
1
packages/openmoko2/openmoko-session2.bb
packages/navit/navit_0.0.2.bb
packages/navit/navit_0.0.1.bb
Diffs:

#
# mt diff -r4691fac16318391e3125e1a88e96b9003fa1c4f0 -rf74df1cd51f519cf932bce26d4e97f1f77795a0e
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [6a49d5ee5cf7764ce7cabf3a367907f08278c1dc]
#    to [a4e57156caaece7b3fd09e98c9f541594ba4879b]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	6a49d5ee5cf7764ce7cabf3a367907f08278c1dc
+++ packages/openmoko2/openmoko-session2.bb	a4e57156caaece7b3fd09e98c9f541594ba4879b
@@ -1,11 +1,10 @@ RDEPENDS += "openmoko-common2 openmoko-t
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
-RREPLACES = "openmoko-session matchbox-common"
-RPROVIDES = "matchbox-common"
-PR = "r42"
+RCONFLICTS_${PN} = "openmoko-session matchbox-common"
+PR = "r61"
 
 SRC_URI = "\
   file://etc \


#
# mt diff -r9934077f8cc45499fe70c414041ee257c6f7b98d -rf74df1cd51f519cf932bce26d4e97f1f77795a0e
#
# 
# 
# add_file "packages/navit/navit_0.0.2.bb"
#  content [8189c9268a53e80bff74928adc510bd38c8de9b2]
# 
# patch "packages/navit/navit_0.0.1.bb"
#  from [87c4e6ce2cdf4c2270e9f3aa51f1441b78a4db82]
#    to [f26539d3ae16efb9541db714be3d65c0312fc4a8]
# 
============================================================
--- packages/navit/navit_0.0.2.bb	8189c9268a53e80bff74928adc510bd38c8de9b2
+++ packages/navit/navit_0.0.2.bb	8189c9268a53e80bff74928adc510bd38c8de9b2
@@ -0,0 +1,13 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+PR = "r0"
+
+inherit autotools 
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
+           file://compile-fix.patch;patch=1"
+
+EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
============================================================
--- packages/navit/navit_0.0.1.bb	87c4e6ce2cdf4c2270e9f3aa51f1441b78a4db82
+++ packages/navit/navit_0.0.1.bb	f26539d3ae16efb9541db714be3d65c0312fc4a8
@@ -1,13 +1,12 @@ DEPENDS = "glib-2.0 gtk+"
 DESCRIPTION = "Navit is a car navigation system with routing engine."
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+"
-PV = "0.0.1"
 PR = "r2"
 
 inherit autotools 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
-	file://compile-fix.patch;patch=1"
+           file://compile-fix.patch;patch=1"
 
 EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"