From: Andrea Adami <andrea.adami@gmail.com>
Date: Mon, 11 Oct 2010 21:54:45 +0000 (+0200)
Subject: libqpe-opie: remove superfluous do_stage (). Bump PR.
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb515879ab62d805b3ec712dfd9748e994263ac;p=openembedded.git

libqpe-opie: remove superfluous do_stage (). Bump PR.
---

diff --git a/recipes/libqpe/libqpe-opie.inc b/recipes/libqpe/libqpe-opie.inc
index 5795e5c765..b3b78a3e13 100644
--- a/recipes/libqpe/libqpe-opie.inc
+++ b/recipes/libqpe/libqpe-opie.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "uicmoc-native virtual/libqte2"
 PROVIDES = "virtual/libqpe1"
-INC_PR = "r7"
+INC_PR = "r8"
 S = "${WORKDIR}/library"
 
 inherit palmtop
@@ -24,44 +24,39 @@ do_compile() {
                  ${STAGING_INCDIR}/opie \
                  ${STAGING_INCDIR}/opie2 \
                  ${STAGING_INCDIR}/qtopia/private
-	for i in ${S}/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	for i in ${S}/backend/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
-	oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
-}
-
-do_stage() {
-	oe_libinstall -so libqpe ${STAGING_LIBDIR}
-	# include files already done during do_compile
+        for i in ${S}/*.h
+        do
+                install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+                install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+                install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+        done
+        for i in ${S}/backend/*.h
+        do
+                install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+                install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+                install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+        done
+        rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
+        oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
 }
 
 do_install() {
-	oe_libinstall -so libqpe ${D}${libdir}
+        oe_libinstall -so libqpe ${D}${libdir}
 
         install -d ${D}${includedir}/qpe \
                ${D}${includedir}/qtopia/private
 
-	for i in ${S}/*.h
-	do
-		install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
-		install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
-		install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
-	done
-	for i in ${S}/backend/*.h
-	do
-		install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
-		install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
-		install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
-	done
-	rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
+        for i in ${S}/*.h
+        do
+                install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
+                install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
+                install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
+        done
+        for i in ${S}/backend/*.h
+        do
+                install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
+                install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
+                install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
+        done
+        rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
 }
diff --git a/recipes/libqpe/libqpe-opie_1.2.3.bb b/recipes/libqpe/libqpe-opie_1.2.3.bb
index 2b50fca6e7..323bc62802 100644
--- a/recipes/libqpe/libqpe-opie_1.2.3.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.3.bb
@@ -9,4 +9,3 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
            file://citytime-path.patch \
            file://fix-sd-card-path.patch \
           "
-
diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb
index 7c4e2312a8..26414d3b81 100644
--- a/recipes/libqpe/libqpe-opie_1.2.4.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.4.bb
@@ -9,6 +9,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
            file://citytime-path-2.patch \
            file://no-include-pro.patch \
            file://unhide_lnkproperties_destructor.patch \
-	   file://double_name.patch \
+           file://double_name.patch \
           "