merge of '3eb18746718ae49add6982f56d77aef7a4f18d50'

     and '8b3597c2174798b0e22b0c752ade70a447dd991a'

diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb
index 2df5c32..5b9161c 100644 (file)
--- a/packages/zroadmap/zroadmap_1.0.12.bb
+++ b/packages/zroadmap/zroadmap_1.0.12.bb
@@ -46,7 +46,7 @@ do_install() {
        install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps
        install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
        install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/
+        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
        install -d ${D}${palmtopdir}/share/roadmap/
         install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/
        install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/

diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb
index a9a8bd8..fd9cc5e 100644 (file)
--- a/packages/zroadmap/zroadmap_cvs.bb
+++ b/packages/zroadmap/zroadmap_cvs.bb
@@ -47,7 +47,7 @@ do_install() {
        install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
        install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
        install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/
+        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
        install -d ${D}${palmtopdir}/share/roadmap/
         install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
        install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/