packages: various .debug packaging fixes

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

2 files changed, 13 insertions, 6 deletions

diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 5b1e472de7..1b842d74ca 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -9,16 +9,19 @@ EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
                ${datadir}/applications \
                ${libdir}/matchbox/desktop/*.so \
                ${datadir}/matchbox-desktop \
                ${datadir}/pixmaps \
                ${sysconfdir}/matchbox"
 
-FILES_${PN}-dev = "${libdir}/matchbox-desktop \
-                   ${includedir}/matchbox-desktop \
-                   ${datadir}/matchbox/desktop/modules/*a"
+FILES_${PN}-dev += "${libdir}/matchbox-desktop \
+                    ${includedir}/matchbox-desktop \
+                    ${libdir}/matchbox/desktop/*.*a \
+                    ${datadir}/matchbox/desktop/modules/*a"
+
+FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
 
 do_stage() {
                 install -d ${STAGING_INCDIR}/matchbox-desktop/
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 6f2365c016..3d041bfe21 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -13,17 +13,21 @@ S = ${WORKDIR}/${PN}
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
                ${datadir}/applications \
                ${libdir}/matchbox/desktop/*.so \
                ${datadir}/matchbox-desktop \
                ${datadir}/pixmaps \
                ${sysconfdir}/matchbox"
 
-FILES_${PN}-dev = "${libdir}/matchbox-desktop \
+FILES_${PN}-dev += "${libdir}/matchbox-desktop \
                    ${includedir}/matchbox-desktop \
+                   ${libdir}/matchbox/desktop/*.*a \
                    ${datadir}/matchbox/desktop/modules/*a"
 
+FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
+                                      
+
 do_stage() {
         install -d ${STAGING_INCDIR}/matchbox-desktop/
         install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/matchbox-desktop/