Re-arrange packaging and stage the headers

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1198 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 6 insertions, 3 deletions

diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
index 82dc31c459..f2854c0833 100644
--- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
@@ -3,6 +3,7 @@ PRIORITY = "optional"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 PV = "0.0+svn${SRCDATE}"
 DEPENDS = "gtk+ startup-notification apmd"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
@@ -10,10 +11,12 @@ EXTRA_OECONF = "--enable-startup-notification --disable-libnotify"
 
 S = ${WORKDIR}/${PN}
 
-FILES_${PN} += "${libdir}/matchbox-panel/*.so.* \
+FILES_${PN} += "${libdir}/matchbox-panel/*.so \
                 ${datadir}/matchbox-panel/battery/*.png"
-FILES_${PN}-dev += "${libdir}/matchbox-panel/*.so ${libdir}/matchbox-panel/*.la \
-                   ${libdir}/matchbox-panel/*.a"
+FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
 
 inherit autotools pkgconfig
 
+do_stage() {
+        autotools_stage_all
+}