merge of '87df0f67fea2eb35bb2d9bb5d84173bacece8d99'

     and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'

91 files changed, 6620 insertions, 224 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1d56493342..7c445a7604 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -124,10 +124,10 @@ Recipes:    mx31ads-kernel*
 
 Person:     Marcin Juszkiewicz
 Mail:       hrw@openembedded.org
-Website:    http://www.hrw.one.pl/
-Machines:   collie, tosa, progear
-Distros:    OpenZaurus, celinux-test
-Interests:  WiFi, Opie, Qtopia fonts, Native SDK
+Website:    http://blog.haerwu.biz/
+Machines:   collie, tosa, progear, alix
+Distros:    Poky, OpenZaurus, Ångström
+Interests:  WiFi, Native SDK
 Recipes:    linux, hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps
 Recipes:    linux-rp, gammu
 Recipes:    ttf-fonts/* 
@@ -213,3 +213,7 @@ Recipes:    lcdproc, libol, mailx, mysql, musicpd, openntpd, qc-usb
 Recipes:    radlib, scsi-idle, rng-tools, slugos-init, syslog-ng
 Recipes:    vsftpd, zd1211
 
+Person:     Henning Heinold 'woglinde'
+Mail:       heinold@inf.fu-berlin.de
+Machines:   simpad
+Recipes:    classpath-minimal, midpath, cacao-clcd
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass
index 7241ae3e7a..101f621303 100644
--- a/classes/seppuku.bbclass
+++ b/classes/seppuku.bbclass
@@ -335,16 +335,23 @@ python seppuku_eventhandler() {
         (bug_open, bug_number) = seppuku_find_bug_report(debug_file, opener, query, product, component, bugname)
         print >> debug_file, "Bug is open: %s and bug number: %s" % (bug_open, bug_number)
 
-        # The bug is present and still open, no need to attach an error log
+        # The bug is present and still open, attach an error log
         if bug_number and bug_open:
             print >> debug_file, "The bug is known as '%s'" % bug_number
+            if file:
+                if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file):
+                     print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number
+                else:
+                     print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number)
+            else:
+                     print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number
             return NotHandled
 
         if bug_number and not bug_open:
             if not seppuku_reopen_bug(poster, reopen, product, component, bug_number, bugname, text):
-                print >> debug_file, "Failed to reopen the bug report"
+                print >> debug_file, "Failed to reopen the bug #%s" % bug_number
             else:
-                print >> debug_file, "Reopened the bug report"
+                print >> debug_file, "Reopened the bug #%s" % bug_number
         else:	
             bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text)
             if not bug_number:
@@ -354,11 +361,11 @@ python seppuku_eventhandler() {
 
         if bug_number and file:
             if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file):
-                print >> debug_file, "Failed to attach the build log"
+                print >> debug_file, "Failed to attach the build log for bug #%" % bug_number
             else:
                 print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number)
         else:
-            print >> debug_file, "Not trying to create an attachment"
+            print >> debug_file, "Not trying to create an attachment for bug #%" % bug_number
 
     return NotHandled
 }
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 5a57482b5d..d0e732bcc9 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -71,6 +71,8 @@ FEED_ARCH_devkitidp-pxa255 = "armv5te"
 FEED_ARCH_e680 		= "armv5te"
 FEED_ARCH_er0100 	= "armv5te"
 FEED_ARCH_gumstix 	= "armv5te"
+FEED_ARCH_gumstix-verdex = "armv5te"
+FEED_ARCH_gumstix-connex = "armv5te"
 FEED_ARCH_h1910 	= "armv5te"
 FEED_ARCH_h2200 	= "armv5te"
 FEED_ARCH_h3900 	= "armv5te"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 72f652df55..75d078e02f 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -136,7 +136,7 @@ SRCDATE_oprofile ?= "20061011"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
-SRCDATE_qemu-native ?= "20060723"
+SRCDATE_qemu-native ?= "20070613"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
diff --git a/conf/machine/gumstix-connex.conf b/conf/machine/gumstix-connex.conf
new file mode 100644
index 0000000000..5110e86aff
--- /dev/null
+++ b/conf/machine/gumstix-connex.conf
@@ -0,0 +1,2 @@
+require conf/machine/include/gumstix.inc
+
diff --git a/conf/machine/gumstix-verdex.conf b/conf/machine/gumstix-verdex.conf
new file mode 100644
index 0000000000..f08e3bafad
--- /dev/null
+++ b/conf/machine/gumstix-verdex.conf
@@ -0,0 +1,4 @@
+require conf/machine/include/gumstix.inc
+
+PACKAGE_EXTRA_ARCHS += " iwmmxt "
+
diff --git a/conf/machine/gumstix.conf b/conf/machine/include/gumstix.inc
index 9d51cdcead..9d51cdcead 100644
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/include/gumstix.inc
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 96177361fb..76a203a84f 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -9,11 +9,11 @@ import sys
 import time
 
 VERSION = "2.5.1"
-# increase when touching python-core
-BASEREV = 0
+# increase when touching python-core, this should be the same ml version as in python_2.5.1.bb
+BASEREV = 1
 
 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-__version__ = "20070815"
+__version__ = "20070823"
 
 class MakefileMaker:
 
diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
index 3a4756094f..bca7a46919 100644
--- a/packages/classpath/classpath-minimal_0.95.bb
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -5,6 +5,7 @@ PRIORITY = "optional"
 LICENSE = "Classpath"
 PROVIDES = "classpath"
 RPROVIDES = "classpath"
+PR = "r1"
 
 S = "${WORKDIR}/classpath-${PV}"
 
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index 52d7d86473..c932d21bdc 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
-DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv"
 PR = "r5"
 
 # The RESOLUTION is defined at compile time which makes
diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/freetype/freetype-2.3.5/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gsm/files/fic-gta01/.mtn2git_empty
+++ b/packages/freetype/freetype-2.3.5/.mtn2git_empty
diff --git a/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch
new file mode 100644
index 0000000000..ae504dcb0b
--- /dev/null
+++ b/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch
@@ -0,0 +1,26 @@
+Index: freetype-2.3.1/builds/unix/configure.raw
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.raw
++++ freetype-2.3.1/builds/unix/configure.raw
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
+Index: freetype-2.3.1/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.ac
++++ freetype-2.3.1/builds/unix/configure.ac
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
diff --git a/packages/freetype/freetype-native_2.3.5.bb b/packages/freetype/freetype-native_2.3.5.bb
new file mode 100644
index 0000000000..b5e8b307cd
--- /dev/null
+++ b/