merge of '5281adaea9fd65292934a8ed7fa0e871e220ca7f'

     and 'db972685a453721f344867c46d01ba28142c82bf'

92 files changed, 4303 insertions, 869 deletions

diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb
index 92c861f49c..a7857c562d 100644
--- a/packages/automake/automake-native_1.10.bb
+++ b/packages/automake/automake-native_1.10.bb
@@ -1,3 +1,5 @@
 PV := "${PV}"
 
 require automake-native.inc
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index 097b8eba13..8a8766cbf8 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
 SECTION = "console"
 PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} libusb dbus cups"
+DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} libusb dbus cups"
 PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
diff --git a/packages/gimp/gimp.inc b/packages/gimp/gimp.inc
new file mode 100644
index 0000000000..7a75f7d619
--- /dev/null
+++ b/packages/gimp/gimp.inc
@@ -0,0 +1,38 @@
+DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "x11/graphics"
+LICENSE = "GPL"
+
+DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
+                 file://configure-libwmf.patch;patch=1"
+
+inherit autotools pkgconfig
+
+FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
+                   ${libdir}/gimp/2.0/plug-ins/.debug"
+
+#Don't laugh, this just builds a threaded gimp
+EXTRA_OECONF = " --disable-gtktest \
+                --disable-print \
+                --disable-python \
+                --enable-mp \
+                --without-libwmf"
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
+
+do_stage() {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/mime-info \
+		${datadir}/application-registry "
+
+FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
+                    ${libdir}/gimp/2.0/modules/.debug"
+
diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb
index 10242e23df..3719e2d5e5 100644
--- a/packages/gimp/gimp_2.2.10.bb
+++ b/packages/gimp/gimp_2.2.10.bb
@@ -1,21 +1,4 @@
-DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = 	"http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE =	"GPL"
+require gimp.inc
 PR = "r1"
 
-SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2"
-
-DEPENDS =	"gtk+ jpeg libpng libexif"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = 	" --disable-gtktest \
-		--without-libtiff \
-		--disable-print \
-		--enable-mp"
-
-do_configure_append() {
-    find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
 
diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb
index f43140eca4..b06687c06d 100644
--- a/packages/gimp/gimp_2.3.10.bb
+++ b/packages/gimp/gimp_2.3.10.bb
@@ -1,35 +1,3 @@
-DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL"
-PR = "r2"
-
-DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
-                 file://configure-libwmf.patch;patch=1"
-
-inherit autotools pkgconfig
-
-FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
-                   ${libdir}/gimp/2.0/plug-ins/.debug"
-
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = " --disable-gtktest \
-                --disable-print \
-                --disable-python \
-                --enable-mp \
-                --without-libwmf"
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
-
-
-FILES_${PN} += "${datadir}/icons \
-                ${datadir}/mime-info \
-		${datadir}/application-registry "
-
-FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
-                    ${libdir}/gimp/2.0/modules/.debug"
+require gimp.inc
+PR = "r3"
 
diff --git a/packages/gimp/gimp_2.3.19.bb b/packages/gimp/gimp_2.3.19.bb
new file mode 100644
index 0000000000..64d8d30e3a
--- /dev/null
+++ b/packages/gimp/gimp_2.3.19.bb
@@ -0,0 +1,2 @@
+require gimp.inc
+
diff --git a/packages/gimp/gimp_2.3.7.bb b/packages/gimp/gimp_2.3.7.bb
index 59bc63d5ae..7e72e74695 100644
--- a/packages/gimp/gimp_2.3.7.bb
+++ b/packages/gimp/gimp_2.3.7.bb
@@ -1,20 +1,2 @@
-DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = 	"http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE =	"GPL"
+require gimp.inc
 PR = "r1"
-
-SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
-
-DEPENDS =	"sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = 	" --disable-gtktest \
-		--disable-print \
-		--disable-python \
-		--enable-mp"
-
-do_configure_append() {
-	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb
index 03d88ed522..7e72e74695 100644
--- a/packages/gimp/gimp_2.3.8.bb
+++ b/packages/gimp/gimp_2.3.8.bb
@@ -1,22 +1,2 @@
-DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = 	"http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE =	"GPL"
+require gimp.inc
 PR = "r1"
-
-SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
-                 file://configure-libwmf.patch;patch=1"
-
-DEPENDS =	"sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = 	" --disable-gtktest \
-		--disable-print \
-		--disable-python \
-		--enable-mp \
-		--without-libwmf"
-
-do_configure_append() {
-	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index ae6a085e74..e8e755d139 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
-PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-*"
 
 libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
 
diff --git a/packages/gnome/li