From cc66d8a96f38c3a90bcf9d8a1abdcb983f8d01b0 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 10 Oct 2010 23:59:38 +0200
Subject: [PATCH] libopietooth: convert to new-style staging. Bump PR.

---
 recipes/libopietooth/libopietooth1.inc      | 10 ++--------
 recipes/libopietooth/libopietooth1_1.2.3.bb |  2 +-
 recipes/libopietooth/libopietooth1_1.2.4.bb |  2 +-
 recipes/libopietooth/libopietooth1_cvs.bb   |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/recipes/libopietooth/libopietooth1.inc b/recipes/libopietooth/libopietooth1.inc
index 2ceae495c3..9f1815f484 100644
--- a/recipes/libopietooth/libopietooth1.inc
+++ b/recipes/libopietooth/libopietooth1.inc
@@ -4,18 +4,12 @@ PRIORITY = "optional"
 DEPENDS = "libopie2"
 LICENSE = "LGPL"
 
-
 S = "${WORKDIR}/lib"
 
 inherit opie
 
-do_stage() {
-    install -d ${STAGING_INCDIR}/opietooth/
-    install -m 0644 *.h ${STAGING_INCDIR}/opietooth/
-    oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
-}
-
 do_install() {
     oe_libinstall -so libopietooth1 ${D}${libdir}
+    install -d ${D}${includedir}/opietooth/
+    install -m 0644 *.h ${D}${includedir}/opietooth/
 }
-
diff --git a/recipes/libopietooth/libopietooth1_1.2.3.bb b/recipes/libopietooth/libopietooth1_1.2.3.bb
index cb625ff687..6bdf6de53e 100644
--- a/recipes/libopietooth/libopietooth1_1.2.3.bb
+++ b/recipes/libopietooth/libopietooth1_1.2.3.bb
@@ -1,4 +1,4 @@
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
-PR = "r0"
+PR = "r1"
 
 require libopietooth1.inc
diff --git a/recipes/libopietooth/libopietooth1_1.2.4.bb b/recipes/libopietooth/libopietooth1_1.2.4.bb
index cb625ff687..6bdf6de53e 100644
--- a/recipes/libopietooth/libopietooth1_1.2.4.bb
+++ b/recipes/libopietooth/libopietooth1_1.2.4.bb
@@ -1,4 +1,4 @@
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
-PR = "r0"
+PR = "r1"
 
 require libopietooth1.inc
diff --git a/recipes/libopietooth/libopietooth1_cvs.bb b/recipes/libopietooth/libopietooth1_cvs.bb
index d58832315e..3a7b48b5ae 100644
--- a/recipes/libopietooth/libopietooth1_cvs.bb
+++ b/recipes/libopietooth/libopietooth1_cvs.bb
@@ -1,5 +1,5 @@
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 require libopietooth1.inc
-- 
2.39.5