opie-taskbar: move to new style staging. Bump PR.

4 files changed, 41 insertions, 43 deletions

diff --git a/recipes/opie-taskbar/opie-taskbar.inc b/recipes/opie-taskbar/opie-taskbar.inc
index d969df9438..6ebd42ed33 100644
--- a/recipes/opie-taskbar/opie-taskbar.inc
+++ b/recipes/opie-taskbar/opie-taskbar.inc
@@ -15,49 +15,47 @@ S = "${WORKDIR}/launcher"
 inherit opie
 
 do_configure_prepend() {
-	ln -s ${WORKDIR}/calibrate ${S}/calibrate
-	ln -s ${WORKDIR}/mediummount ${S}/mediummount
-}
-
-do_stage() {
-    install obexinterface.h ${STAGING_INCDIR}/
-
+        ln -s ${WORKDIR}/calibrate ${S}/calibrate
+        ln -s ${WORKDIR}/mediummount ${S}/mediummount
 }
 
 SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
 PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
 
 do_install() {
-	install -d ${D}${bindir}
-	for i in ${SECTIONS}
-	do
-		install -d ${D}${palmtopdir}/apps/$i/
-		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/
-	done
-	install -d ${D}${palmtopdir}/pics/launcher
-	install -d ${D}${palmtopdir}/pics/logo
-	install -d ${D}${palmtopdir}/pics/RoH/star/
-	install -d ${D}${palmtopdir}/etc/colors
-	install -d ${D}${palmtopdir}/etc/skel
-	install -d ${D}${sysconfdir}
-
-	install -m 0755 ${S}/qpe ${D}${bindir}/qpe
-	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/
-
-	for p in ${PICS}
-	do
-		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p
-	done
-
-	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/
-	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
-
-	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
+        install -d ${D}${bindir}
+        for i in ${SECTIONS}
+        do
+                install -d ${D}${palmtopdir}/apps/$i/
+                install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/
+        done
+        install -d ${D}${palmtopdir}/pics/launcher
+        install -d ${D}${palmtopdir}/pics/logo
+        install -d ${D}${palmtopdir}/pics/RoH/star/
+        install -d ${D}${palmtopdir}/etc/colors
+        install -d ${D}${palmtopdir}/etc/skel
+        install -d ${D}${sysconfdir}
+
+        install -m 0755 ${S}/qpe ${D}${bindir}/qpe
+        install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/
+        install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/
+
+        for p in ${PICS}
+        do
+                install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p
+        done
+
+        install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/
+        install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
+
+        install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
+        install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
 
         install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
         install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
+
+        install -d ${D}${includedir}
+        install obexinterface.h ${D}${includedir}/
 }
 
 FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.3.bb b/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
index 8dfb6a05e8..919859cde3 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -11,7 +11,7 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            file://nomax.patch;striplevel=3 \
            file://no-builtin-qss-startup.patch \
            file://kbdlocks-runtime.patch \
-	   file://restart-from-bindir.patch \
+           file://restart-from-bindir.patch \
            file://server-pro-old.patch \
-	   file://firstuse-path.patch \
+           file://firstuse-path.patch \
           "
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
index bd0c3fa6fc..232d762fc8 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -11,8 +11,8 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            file://nomax.patch;striplevel=3 \
            file://no-builtin-qss-startup.patch \
            file://kbdlocks-runtime.patch \
-	   file://restart-from-bindir.patch \
+           file://restart-from-bindir.patch \
            file://server-pro-1.2.4.patch \
-	   file://firstuse-path.patch \
+           file://firstuse-path.patch \
            file://force-firstuse-calibrate.patch \
           "
diff --git a/recipes/opie-taskbar/opie-taskbar_cvs.bb b/recipes/opie-taskbar/opie-taskbar_cvs.bb
index c4a289c5e5..8f455ddc24 100644
--- a/recipes/opie-taskbar/opie-taskbar_cvs.bb
+++ b/recipes/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -12,8 +12,8 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://nomax.patch;striplevel=3 \
            file://no-builtin-qss-startup.patch \
            file://kbdlocks-runtime.patch \
-	   file://restart-from-bindir.patch \
+           file://restart-from-bindir.patch \
            file://server-pro-cvs.patch \
-	   file://firstuse-path.patch \
+           file://firstuse-path.patch \
           "