merge of '79d76f976ca74f71f538f5c81a1e25b14ffe43f6'

     and 'b9ffe3b2fa4c42424206977c6be342c1305c83e7'

26 files changed, 70 insertions, 52 deletions

diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index c89aa79afd..95b788ef8e 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -28,6 +28,6 @@ do_stage() {
 PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
 FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so*"
-FILES_alsa-server = "${bindir}"
+FILES_alsa-server = "${bindir}/*"
 FILES_alsa-conf = "${datadir}"
 FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/"
diff --git a/packages/db/db_4.2.52.bb b/packages/db/db_4.2.52.bb
index 544f199427..05565287f5 100644
--- a/packages/db/db_4.2.52.bb
+++ b/packages/db/db_4.2.52.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -45,7 +45,7 @@ PACKAGES += " ${PN}-bin"
 
 # Package contents
 FILES_${PN} = "${libdir}/libdb-4*so*"
-FILES_${PN}-bin = "${bindir}"
+FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
 # same time) as the db3 package
diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb
index cf1bd00acd..3c14b9eb96 100644
--- a/packages/db/db_4.3.29.bb
+++ b/packages/db/db_4.3.29.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -45,7 +45,7 @@ PACKAGES += " ${PN}-bin"
 
 # Package contents
 FILES_${PN} = "${libdir}/libdb-4*so*"
-FILES_${PN}-bin = "${bindir}"
+FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
 # same time) as the db3 package
diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb
index 7ac88061b5..bcc4e01048 100644
--- a/packages/flac/flac_1.1.0.bb
+++ b/packages/flac/flac_1.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
 LICENSE = "BSD GPL"
 SECTION = "libs"
 DEPENDS = "libogg"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
 	   file://disable-xmms-plugin.patch;patch=1 \
@@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
 		--without-id3lib"
 
 PACKAGES += "libflac libflac++ liboggflac liboggflac++"
-FILES_${PN} = "${bindir}"
+FILES_${PN} = "${bindir}/*"
 FILES_libflac = "${libdir}/libFLAC.so.*"
 FILES_libflac++ = "${libdir}/libFLAC++.so.*"
 FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
index cbfaaa0ff5..293455f2e1 100644
--- a/packages/flac/flac_1.1.2.bb
+++ b/packages/flac/flac_1.1.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
 LICENSE = "BSD GPL"
 SECTION = "libs"
 DEPENDS = "libogg"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
 	   file://disable-xmms-plugin.patch;patch=1 \
@@ -21,7 +21,7 @@ EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
 		--without-id3lib"
 
 PACKAGES += "libflac libflac++ liboggflac liboggflac++"
-FILES_${PN} = "${bindir}"
+FILES_${PN} = "${bindir}/*"
 FILES_libflac = "${libdir}/libFLAC.so.*"
 FILES_libflac++ = "${libdir}/libFLAC++.so.*"
 FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
diff --git a/packages/lame/lame_3.96.1.bb b/packages/lame/lame_3.96.1.bb
index b732a8cb23..edb4265f13 100644
--- a/packages/lame/lame_3.96.1.bb
+++ b/packages/lame/lame_3.96.1.bb
@@ -1,7 +1,7 @@
 SECTION = "console/utils"
 DESCRIPTION = "Not an MP3 encoder"
 LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
 	file://no-gtk1.patch;patch=1"
@@ -11,7 +11,7 @@ inherit autotools
 PACKAGES += "libmp3lame libmp3lame-dev"
 FILES_${PN} = "${bindir}/lame"
 FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
-FILES_libmp3lame-dev = "${includedir} ${libdir}"
+FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
 FILES_${PN}-dev = ""
 
 do_configure() {
diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb
index eec4d6506d..0a10054eb3 100644
--- a/packages/libfakekey/libfakekey_svn.bb
+++ b/packages/libfakekey/libfakekey_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
 DEPENDS = "libxtst"
 SECTION = "x11/wm"
-PR="r1"
+PR="r2"
 PV = "0.0+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
@@ -11,10 +11,6 @@ S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
-FILES_${PN} = "${libdir} \
-	       ${datadir}/applications \
-	       ${datadir}/pixmaps"
-
 do_stage () {
 	   install -d ${STAGING_INCDIR}/fakekey	
            install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey
diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb
index c29053832b..a2a19b254c 100644
--- a/packages/libgpg-error/libgpg-error_1.0.bb
+++ b/packages/libgpg-error/libgpg-error_1.0.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "GPG-Error library"
 SECTION = "libs"
 PRIORITY = "optional"
@@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \
 
 # move libgpg-error-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
+FILES_${PN}-dev += "${bindir}/*"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
index 85dee09a72..f0dc8f09e4 100644
--- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
@@ -3,10 +3,12 @@ LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 
+PR = "r1"
+
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz"
 S = "${WORKDIR}/mb-applet-input-manager-${PV}"
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
  
diff --git a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
index d5f0d24540..11eb87636a 100644
--- a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
+++ b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
@@ -3,10 +3,12 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
+PR = "r1"
+
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz"
 S = "${WORKDIR}/mb-applet-startup-monitor-${PV}"
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
  
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 5e9748c4d9..17f1f09005 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \
            file://mb-desktop-multi-category-matching.patch;patch=1"
@@ -11,17 +11,21 @@ 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 \
+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/
diff --git a/packages/matchbox-desktop/matchbox-desktop_svn.bb b/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 6f2365c016..86a91d5846 100644
--- a/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -5,6 +5,8 @@ SECTION = "x11/wm"
 PV = "0.9.1+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
+PR = "r1"
+
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
@@ -13,17 +15,20 @@ 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/
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index df0489569a..de709f340b 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -14,7 +14,7 @@ inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--disable-cairo"
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
 	       ${datadir}/applications \
 	       ${datadir}/pixmaps \
 		${datadir}/matchbox-keyboard"
diff --git a/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb b/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
index 1023a6aa72..b10f6c3479 100644
--- a/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
+++ b/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
@@ -3,10 +3,12 @@ LICENSE = "GPL"
 DEPENDS = "gtk+"
 SECTION = "x11/wm"
 
+PR = "r1"
+
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
 
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 0855da8f4c..44bbae6870 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -3,6 +3,8 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
+PR = "r1"
+
 inherit autotools pkgconfig gettext
 
 CFLAGS += "-D_GNU_SOURCE"
@@ -18,7 +20,7 @@ EXTRA_OECONF_append_mnci = " --enable-small-icons "
 EXTRA_OECONF_append_integral13 = " --enable-small-icons "
 PACKAGE_ARCH = "${MACHINE}"
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
 	       ${datadir}/applications \
 	       ${datadir}/pixmaps"
 
diff --git a/packages/matchbox-stroke/matchbox-stroke_svn.bb b/packages/matchbox-stroke/matchbox-stroke_svn.bb
index 9bbbe89027..ead214407b 100644
--- a/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -3,7 +3,8 @@ LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11/wm"
 PV = "0.0+svn${SRCDATE}"
-PR="r1"
+
+PR="r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
@@ -12,7 +13,7 @@ S = ${WORKDIR}/${PN}
 
 inherit autotools pkgconfig gettext
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
 	       ${datadir}/applications \
 	       ${datadir}/pixmaps \
 		${datadir}/matchbox-stroke"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index aad37abc3f..8c87711950 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PR="r0"
+PR="r1"
 
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
@@ -13,7 +13,7 @@ S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
 inherit autotools pkgconfig update-alternatives
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
 	       ${sysconfdir}/matchbox \
 	       ${datadir}/themes/blondie/matchbox \
diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb
index 00bea89603..a933668692 100644
--- a/packages/matchbox-wm/matchbox-wm_1.0.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.0.bb
@@ -3,7 +3,8 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PR="r1"
+
+PR="r2"
 
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \
@@ -13,7 +14,7 @@ S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
 inherit autotools pkgconfig update-alternatives
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
 	       ${sysconfdir}/matchbox \
 	       ${datadir}/themes/blondie/matchbox \
diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb
index 8e28d0c041..275a556d3c 100644
--- a/packages/matchbox-wm/matchbox-wm_1.1.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.1.bb
@@ -3,7 +3,8 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PR="r0"
+
+PR="r1"
 
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \
@@ -13,7 +14,7 @@ S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
 inherit autotools pkgconfig update-alternatives
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
 	       ${sysconfdir}/matchbox \
 	       ${datadir}/themes/blondie/matchbox \
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index 95d24b5b95..381be22652 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PV = "0.9.5+svn${SRCDATE}"
-PR = "r2"
+PV = "1.1+svn${SRCDATE}"
+PR = "r3"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
@@ -19,7 +19,7 @@ ALTERNATIVE_LINK = "${bindir}/x-window-manager"
 ALTERNATIVE_PATH = "${bindir}/matchbox-session"
 ALTERNATIVE_PRIORITY = "10"
 
-FILES_${PN} = "${bindir} \
+FILES_${PN} = "${bindir}/* \
                ${datadir}/matchbox \
                ${sysconfdir}/matchbox \
                ${datadir}/themes/blondie/matchbox \
diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
index 49e41b9fd8..3380a4e00c 100644
--- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
+++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://libmpeg2.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "libs"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/libsdl"
 
@@ -16,7 +16,7 @@ EXTRA_OECONF = "--enable-shared"
 
 PACKAGES = "mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
 
-FILES_${PN} = "${bindir}"
+FILES_${PN} = "${bindir}/*"
 FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
 FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
 FILES_libmpeg2-dev = "${libdir}/libmpeg2.so \
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index 74730e18db..8a16eb71fc 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r0"
+PR = "r1"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
@@ -21,7 +21,7 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
 
 LIBV = "1.4.0"
 
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index 907d813d00..86807e56ea 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/packages/pango/pango_1.12.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r0"
+PR = "r1"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
 
 LIBV = "1.5.0"
 
diff --git a/packages/pango/pango_1.13.3.bb b/packages/pango/pango_1.13.3.bb
index b882365735..934edc6c58 100644
--- a/packages/pango/pango_1.13.3.bb
+++ b/packages/pango/pango_1.13.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft xt gtk-doc ca
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r0"
+PR = "r1"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
 
 LIBV = "1.5.0"
 
diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb
index 19fc1d7a92..29362cad90 100644
--- a/packages/pango/pango_1.14.0.bb
+++ b/packages/pango/pango_1.14.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft xt gtk-doc ca
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r0"
+PR = "r1"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
 
 LIBV = "1.5.0"
 
diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb
index 738ebd2354..b81c6c3e16 100644
--- a/packages/settings-daemon/settings-daemon_svn.bb
+++ b/packages/settings-daemon/settings-daemon_svn.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
 LICENSE = "GPL"
 DEPENDS = "gconf xst glib-2.0"
-SECTION = "gpe"
+SECTION = "x11"
+
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://70settings-daemon"
@@ -10,7 +12,7 @@ S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
-FILES_${PN} = 	"${bindir} ${sysconfdir}"
+FILES_${PN} = 	"${bindir}/* ${sysconfdir}"
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d