[oe-commits] Andrea Adami : opie-pickboard: convert to new-style staging. Bump PR.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2a2dde323c4908ea9cf44f80ef68e2813f5624ba
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2a2dde323c4908ea9cf44f80ef68e2813f5624ba

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Mon Oct 11 00:15:44 2010 +0200

opie-pickboard: convert to new-style staging. Bump PR.

---

 recipes/opie-pickboard/opie-pickboard.inc      |   10 ++++++----
 recipes/opie-pickboard/opie-pickboard_1.2.3.bb |    2 +-
 recipes/opie-pickboard/opie-pickboard_1.2.4.bb |    2 +-
 recipes/opie-pickboard/opie-pickboard_cvs.bb   |    2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/recipes/opie-pickboard/opie-pickboard.inc b/recipes/opie-pickboard/opie-pickboard.inc
index 2b81a50..2f84359 100644
--- a/recipes/opie-pickboard/opie-pickboard.inc
+++ b/recipes/opie-pickboard/opie-pickboard.inc
@@ -25,10 +25,12 @@ ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 
-do_stage() {
-	install -m 0755 libqpickboard.so ${STAGING_LIBDIR}/
-	install pickboardcfg.h ${STAGING_INCDIR}/
-	install pickboardpicks.h ${STAGING_INCDIR}/
+do_install() {
+        install -d ${D}${libdir}/
+        install -d ${D}${includedir}/
+        install -m 0755 libqpickboard.so ${D}${libdir}/
+        install pickboardcfg.h ${D}${includedir}/
+        install pickboardpicks.h ${D}${includedir}/
 }
 
 # FILES plugins/inputmethods/libqpickboard.so*
diff --git a/recipes/opie-pickboard/opie-pickboard_1.2.3.bb b/recipes/opie-pickboard/opie-pickboard_1.2.3.bb
index 6640c12..cd6f934 100644
--- a/recipes/opie-pickboard/opie-pickboard_1.2.3.bb
+++ b/recipes/opie-pickboard/opie-pickboard_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/recipes/opie-pickboard/opie-pickboard_1.2.4.bb b/recipes/opie-pickboard/opie-pickboard_1.2.4.bb
index 6640c12..cd6f934 100644
--- a/recipes/opie-pickboard/opie-pickboard_1.2.4.bb
+++ b/recipes/opie-pickboard/opie-pickboard_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/recipes/opie-pickboard/opie-pickboard_cvs.bb b/recipes/opie-pickboard/opie-pickboard_cvs.bb
index 368f265..ce10fa8 100644
--- a/recipes/opie-pickboard/opie-pickboard_cvs.bb
+++ b/recipes/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"