6 files changed, 36 insertions, 23 deletions
diff --git a/recipes/fbprogress/fbprogress_1.1.bb b/recipes/fbprogress/fbprogress_1.1.bb
index 8d603b8a3e..855d1ca3d4 100644
--- a/recipes/fbprogress/fbprogress_1.1.bb
+++ b/recipes/fbprogress/fbprogress_1.1.bb
@@ -3,8 +3,8 @@ AUTHOR = "Angel Roman"
 HOMEPAGE = "http://www.buglabs.net/"
 LICENSE = "GPL"
 DEPENDS = "freetype zlib virtual/kernel"
-SRCREV = "9118"
-PR = "r1"
+SRCREV = "9405"
+PR = "r2"
 
 SRC_URI = "svn://svn.buglabs.net/bug/trunk;module=com.buglabs.bug.native.fbprogress;proto=svn \
            file://fbprogress-init"
@@ -13,14 +13,17 @@ S = "${WORKDIR}/com.buglabs.bug.native.fbprogress"
 
 inherit update-rc.d
 
-EXTRA_OEMAKE = "BUG_LINUX_SRC=${STAGING_KERNEL_DIR}"
+TARGET_CXXFLAGS += "-I${STAGING_INCDIR}/freetype2 -I${STAGING_KERNEL_DIR}/include"
+TARGET_LDFLAGS  += "-L${STAGING_LIBDIR} -lfreetype -lz"
 
 do_install() {
-  install -d ${D}/${sysconfdir}/fbprogress
-  install -m 0644 ${S}/images/* ${D}/${sysconfdir}/fbprogress/
-  install -d ${D}${layout_bindir}
-  install -m 0755 fbprogress ${D}${layout_bindir}
-  install -m 0755 fbprogress.sh ${D}${layout_bindir}
+  install -d ${D}/${datadir}/fbprogress
+  install -m 0644 ${S}/images/* ${D}/${datadir}/fbprogress/
+
+  install -d ${D}${bindir}
+  install -m 0755 fbprogress ${D}${bindir}
+  install -m 0755 fbprogress.sh ${D}${bindir}
+
   install -d ${D}/${sysconfdir}/init.d
   install -m 0755 ${WORKDIR}/fbprogress-init ${D}/${sysconfdir}/init.d/fbprogress
 }
diff --git a/recipes/gnome/gnome-bluetooth_git.bb b/recipes/gnome/gnome-bluetooth_git.bb
index de11874fab..23c4ca92ac 100644
--- a/recipes/gnome/gnome-bluetooth_git.bb
+++ b/recipes/gnome/gnome-bluetooth_git.bb
@@ -11,12 +11,13 @@ SRC_URI = "git://git.gnome.org/gnome-bluetooth;protocol=git \
 
 S = "${WORKDIR}/git"
 
-SRCREV = "097aef044ced5937dd7e288bfee58b6138939117"
+SRCREV = "93fd8de2cc717b96ad719ab2fb5ed38b8a0fc707"
 PV = "2.27.5"
+PR = "r2"
 PR_append = "+gitr${SRCREV}"
 
-DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring"
-RRECOMMENDS_${PN} += "obexd obex-data-server"
+DEPENDS = "obexd gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring"
+RRECOMMENDS_${PN} += "obexd"
 RCONFLICTS_${PN} = "bluez-gnome"
 
 do_configure_prepend() {
diff --git a/recipes/gnome/gnote_0.5.0.bb b/recipes/gnome/gnote_0.5.0.bb
new file mode 100644
index 0000000000..cc11022b7c
--- /dev/null
+++ b/recipes/gnome/gnote_0.5.0.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Note taking application"
+LICENSE = "GPL"
+
+DEPENDS = "libpcre libgnomeui gconf-dbus gtkmm boost"
+
+inherit gnome
+
+FILES_${PN}-dbg += "${libdir}/gnote/*/*/.debug"
diff --git a/recipes/kakasi/kakasi-native_2.3.4.bb b/recipes/kakasi/kakasi-native_2.3.4.bb
index 86a4c81b44..18f0061cfe 100644
--- a/recipes/kakasi/kakasi-native_2.3.4.bb
+++ b/recipes/kakasi/kakasi-native_2.3.4.bb
@@ -2,8 +2,6 @@ require kakasi.inc
 
 inherit native
 
-S = "${WORKDIR}/kakasi-${PV}"
-
 do_stage() {
         install src/mkkanwa ${STAGING_BINDIR}
 }
diff --git a/recipes/libpcre/libpcre_7.6.bb b/recipes/libpcre/libpcre_7.6.bb
index eb5af03db0..aa038c6e95 100644
--- a/recipes/libpcre/libpcre_7.6.bb
+++ b/recipes/libpcre/libpcre_7.6.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r3"
+PR = "r4"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://pcre-cross.patch;patch=1"
@@ -17,7 +17,6 @@ inherit autotools binconfig
 
 PARALLEL_MAKE = ""
 
-LEAD_SONAME = "libpcre.so"
 CFLAGS_append = " -D_REENTRANT"
 CXXFLAGS_powerpc += "-lstdc++"
 EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8"
@@ -40,13 +39,19 @@ do_compile () {
 }
 
 do_stage () {
-	oe_libinstall -a -so libpcre ${STAGING_LIBDIR}
-	oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
-	install -m 0644 pcre.h ${STAGING_INCDIR}/
-	install -m 0644 pcreposix.h ${STAGING_INCDIR}/
-        install -d ${STAGING_BINDIR_NATIVE}
+	autotools_stage_all
+	install -d ${STAGING_BINDIR_NATIVE}
 	install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/
 }
 
-FILES_${PN} = "${libdir}/lib*.so.*"
+python populate_packages_prepend () {
+	pcre_libdir = bb.data.expand('${libdir}', d)
+	pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+	do_split_packages(d, pcre_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev', allow_links=True)
+	do_split_packages(d, pcre_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, pcre_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.*', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True)
+}
+
+FILES_${PN} = "${libdir}/libpcre.so.*"
 FILES_${PN}-dev += "${bindir}/*"
diff --git a/recipes/uim/uim-native_1.3.1.bb b/recipes/uim/uim-native_1.3.1.bb
index f23f6bd945..3404a36ab5 100644
--- a/recipes/uim/uim-native_1.3.1.bb
+++ b/recipes/uim/uim-native_1.3.1.bb
@@ -3,6 +3,4 @@ DEPENDS = "gtk+ anthy intltool-native"
 inherit native autotools pkgconfig
 PR = "r2"
 
-S = "${WORKDIR}/uim-${PV}"
-
 EXTRA_OECONF += "--disable-xim"