merge of '7c54b67a8bd06b0acd3de3732a00f6e1728ab4cf'

     and 'bc39d5cfbb7f6b7e9356ec6176bb1d920b167f96'

5 files changed, 9 insertions, 6 deletions

diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 6d02578df4..8993a6ae38 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -12,6 +12,7 @@ PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
index 7d65fc1f02..e0d4518a1e 100644
--- a/conf/distro/include/angstrom-uclinux-uclibc.inc
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -6,6 +6,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index e8783abb4d..f1e1ca110d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -83,6 +83,7 @@ SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
 SRCDATE_qemu-native ?= "20070613"
+SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2ca4762577..eb2195df3e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,8 +15,8 @@ SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
 SRCREV_pn-assassin ?= "93"
 SRCREV_pn-bfin-uclibc ?= "1857"
-SRCREV_pn-uclibc ?= "23129"
-SRCREV_pn-uclibc-initial ?= "23129"
+SRCREV_pn-uclibc ?= "23421"
+SRCREV_pn-uclibc-initial ?= "23421"
 SRCREV_pn-clutter-box2d = "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
@@ -31,8 +31,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "277"
 SRCREV_pn-diversity-nav ?= "340"
 SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "6625"
-SRCREV_pn-eglibc-initial ?= "6625"
+SRCREV_pn-eglibc ?= "6937"
+SRCREV_pn-eglibc-initial ?= "6937"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
@@ -93,7 +93,7 @@ SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27380"
+SRCREV_pn-mplayer ?= "27047"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-navit ?= "1096"
@@ -172,7 +172,6 @@ SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-tichy ?= "168"
-SRCREV_pn-tidy ?= "242"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 05853d3936..4df461910c 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -41,6 +41,7 @@ TARGET_FPU = "soft"
 
 # glib-2.0 builds require USE_NLS to be overridden
 USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
 
 INHERIT += "package_ipk debian"