merge of '6d07e119d774985e157fc9a56bb59bfbe0dcec50'

     and '7604e2e8a0c76d28ec378a7800c3e1a42b335da5'

21 files changed, 1215 insertions, 9138 deletions

diff --git a/packages/atk/atk_1.19.3.bb b/packages/atk/atk_1.19.3.bb
index beef4ce97a..52136682d7 100644
--- a/packages/atk/atk_1.19.3.bb
+++ b/packages/atk/atk_1.19.3.bb
@@ -1,7 +1,5 @@
 require atk.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
 
 do_stage () {
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index 098939324a..cdfc28fb38 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -3,9 +3,9 @@ LICENSE = "BSD"
 DESCRIPTION = "A library for configuring and customizing font access."
 DEPENDS = "expat freetype freetype-native zlib"
 
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
-
-PR = "r0"
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
+PR = "r1"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
 FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -39,6 +39,7 @@ python do_unpack () {
 }
 
 do_stage () {
+	cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/
 	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/fontconfig
 	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index c3bbb0232a..3fa5d22a71 100644
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -52,7 +52,8 @@ do_stage () {
 
 	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
 	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
+        # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
+	cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/
 	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/gtk-webcore/midori/midori.desktop b/packages/gtk-webcore/midori/midori.desktop
deleted file mode 100644
index 683b1a343e..0000000000
--- a/packages/gtk-webcore/midori/midori.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Midori
-Comment=Webkit based browser
-Exec=midori
-Terminal=false
-Type=Application
-Categories=Application
diff --git a/packages/gtk-webcore/midori_0.0.6.bb b/packages/gtk-webcore/midori_0.0.6.bb
deleted file mode 100644
index ed0213964f..0000000000
--- a/packages/gtk-webcore/midori_0.0.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "webkit-gtk libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
-           file://midori.desktop"
-
-do_install_append() {
-        if  [ -f ${WORKDIR}/midori.desktop ]; then
-                install -d ${D}${datadir}/applications
-                install -m 0644 ${WORKDIR}/midori.desktop ${D}${datadir}/applications
-        fi
-
-}
-
diff --git a/packages/gtk-webcore/midori_0.0.8.bb b/packages/gtk-webcore/midori_0.0.8.bb
new file mode 100644
index 0000000000..23d0179375
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.8.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb
index 3cca30a6bb..74205da673 100644
--- a/packages/libgcrypt/libgcrypt_1.2.3.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.3.bb
@@ -3,6 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
+PR = "r1"
 
 # move libgcrypt-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
@@ -17,14 +18,5 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 ARM_INSTRUCTION_SET = "arm"
 
 do_stage() {
-	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
-	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
-
-	install -d ${STAGING_INCDIR}/
-	for X in gcrypt.h gcrypt-module.h
-	do
-		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
-	done
-
+	autotools_stage_all
 }
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 7579481005..41b0c13179 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -40,7 +40,7 @@ do_configure_prepend() {
         #
         # oabi / eabi support
         #
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+        if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
         else
diff --git a/packages/maemo3/hildon-1_svn.bb b/packages/maemo3/hildon-1_svn.bb
index c5c01792ca..5105472989 100644
--- a/packages/maemo3/hildon-1_svn.bb
+++ b/packages/maemo3/hildon-1_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 
 DEPENDS = "gconf-dbus esound gtk+"
 
-PV = "1.0.12+svnr${SRCREV}"
+PV = "1.0.17+svnr${SRCREV}"
 
 SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \
            file://buttonbox.patch;patch=1 "
diff --git a/packages/gtk-webcore/midori/.mtn2git_empty b/packages/maemo3/libhildonfm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gtk-webcore/midori/.mtn2git_empty
+++ b/packages/maemo3/libhildonfm/.mtn2git_empty
diff --git a/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff b/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
new file mode 100644
index 0000000000..8d91e1dd65
--- /dev/null
+++ b/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
@@ -0,0 +1,132 @@
+--- /tmp/hildon-file-selection.c	2007-10-02 10:08:17.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-selection.c	2007-10-02 11:26:58.292045000 +0200
+@@ -2036,6 +2036,7 @@
+     g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static void hildon_file_selection_navigation_pane_context(GtkWidget *
+                                                           widget,
+                                                           gpointer data)
+@@ -2052,6 +2053,7 @@
+     ULOG_DEBUG(__FUNCTION__);
+     g_signal_emit(data, signal_content_pane_context_menu, 0);
+ }
++#endif /* USE_MAEMO_GTK */
+ 
+ static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
+                                                           widget,
+@@ -2200,6 +2202,7 @@
+   }
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static gboolean
+ tap_and_hold_query (gpointer self, guint signal_id)
+ {
+@@ -2225,6 +2228,8 @@
+   return tap_and_hold_query (self, signal_navigation_pane_context_menu);
+ }
+ 
++#endif /* USE_MAEMO_GTK */
++
+ static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
+                                                         * self)
+ {
+@@ -2277,7 +2282,7 @@
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+                                   GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2286,6 +2291,7 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
++#endif /* USE_MAEMO_GTK */
+ 
+     g_signal_connect_object(tree, "notify::has-focus",
+                      G_CALLBACK(content_pane_focus), self, 0);
+@@ -2397,7 +2403,7 @@
+         (selection, "changed",
+          G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
+          self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+                                   GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2406,7 +2412,7 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+@@ -2492,7 +2498,7 @@
+     g_signal_connect_object(selection, "changed",
+                      G_CALLBACK(hildon_file_selection_selection_changed),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
+                                   NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
+@@ -2502,7 +2508,7 @@
+                      G_CALLBACK
+                      (hildon_file_selection_navigation_pane_context),
+                      self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+     g_signal_connect_object(self->priv->dir_tree, "key-press-event",
+                      G_CALLBACK
+                      (hildon_file_selection_on_navigation_pane_key), self, 0);
+--- /tmp/hildon-file-chooser-dialog.c	2007-10-02 10:14:05.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-chooser-dialog.c	2007-10-02 11:33:43.132045000 +0200
+@@ -191,7 +191,7 @@
+ 
+   return (first_digit << 4) | second_digit;
+ }
+-
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+                                             GtkInvalidInputType inv_type,
+                                             gpointer user_data)
+@@ -202,7 +202,7 @@
+                                     HCS("ckdg_ib_maximum_characters_reached"));
+   }
+ }
+-
++#endif /* USE_MAEMO_GTK */
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+                        int         len,
+@@ -1837,8 +1837,9 @@
+                               G_PARAM_READWRITE);
+     g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+ 
+-
++#ifdef USE_MAEMO_GTK
+     hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+ 
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1976,10 @@
+           g_signal_connect( priv->entry_name, "changed",
+                           G_CALLBACK( hildon_file_chooser_entry_changed ),
+                           self );
+-
++#ifdef USE_MAEMO_GTK
+     g_signal_connect(priv->entry_name, "invalid-input",
+                      G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif /* USE_MAEMO_GTK */
+     priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->image_location = gtk_image_new();
diff --git a/packages/maemo3/libhildonfm_1.9.41.bb b/packages/maemo3/libhildonfm_1.9.41.bb
new file mode 100644
index 0000000000..de1bb3d9e3
--- /dev/null
+++ b/packages/maemo3/libhildonfm_1.9.41.bb
@@ -0,0 +1,29 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_${PV}.tar.gz \
+           file://hildonfm-ifdef-maemogtk.diff;patch=1 \
+	   "
+
+inherit autotools pkgconfig lib_package
+
+S = "${WORKDIR}/1_${PV}"
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+        touch gtk-doc.make
+}
+
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo3/libhildonhelp_1.9.1.bb b/packages/maemo3/libhildonhelp_1.9.1.bb
index b04efe2660..43d4c15d2e 100644
--- a/packages/maemo3/libhildonhelp_1.9.1.bb
+++ b/packages/maemo3/libhildonhelp_1.9.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Nokia hildon help library"
 
-DEPENDS = "libart libpng jpeg libxml2 gtkhtml-3.8 libosso"
+DEPENDS = "libart-lgpl libpng jpeg libxml2 gtkhtml-3.8 libosso"
 
 PR = "r0"
 
diff --git a/packages/mono/README b/packages/mono/README
index 39479308b2..c3043faee3 100644
--- a/packages/mono/README
+++ b/packages/mono/README
@@ -1,10 +1,39 @@
-Mono in OE is still very much a work in progress.
-1.2.4 
-  - is reported to work on MIPS.  
-  - has floating point problems on ARM
+Notes on Mono support in OE.
+
+===============================
+Cross Compiling Mono
+
+Cross compiling mono requires a two stage build because the mono mcs directory
+cannot be built while cross compiling (http://www.mono-project.com/Mono:ARM).
+The recommended way to cross compile mono is to 
+
+ 1. do a complete build on the host system, and install.  
+ 2. cross compile mono which will only build the native target code and 
+    overlay the target binaries on the host install.  
+
+The MCS build (step 1) is implemented by the mono-mcs-intermediate* recipe.
+This recipe is very similiar to the native build, except it uses standard
+install prefixes and the install directory is tar'd up, and placed in staging
+for use by the cross build.
+
+During the mono cross build, the first step during the install is to untar
+the install results of the mcs-intermediate build.  The cross build install
+then proceeds to overlay the native binaries in the install directory.
+
+================================
+mono.bbclass
+
+Has a helper function for the list that maps file patterns to package
+names and assemblies (see below). Also has a function mono_do_clilibs
+and inserts that function into PACKAGEFUNCS. This function calls
+mono_find_provides_and_requires which finds out (through calls to
+monodis --assembly and monodis --assemblyref) which assemblies are
+provided and required by a particular package. mono_do_clilibs then
+puts the information about provided assemblies into
+${STAGING_DIR}/clilibs/${packagename}.list and information about the
+required packages into ${PKGDEST}/{packagename}.clilibdeps where it
+will later be picked up by the modified read_shlibdeps.
+
 
-1.2.5
-  - tested on ARM EABI.  Floating point issues have been worked around.
 
-There is still a lot of packaging work that needs done to package the mono dll's for installation.
 
diff --git a/packages/mono/collect-paths.py b/packages/mono/collect-paths.py
new file mode 100644
index 0000000000..a49b76e5aa
--- /dev/null
+++ b/packages/mono/collect-paths.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+
+## This utility takes the debian directory from an unpacked debian mono source tree
+## (e.g. apt-get source mono), parses the *.install files and generates python source
+## for a list of dictionaries that describe the individual packages and their contents
+## The output will look like
+##debian_mono_file_table = [
+##        {       'name': 'libmono-peapi1.0-cil',
+##                'patterns': [
+##                                '/usr/lib/mono/gac/PEAPI/1.0.*/',
+##                                '/usr/lib/mono/1.0/PEAPI.dll'
+##                        ],
+##                'assemblies': [
+##                                ('PEAPI', '1.0.*')
+##                        ]
+##        },
+##        {       'name': 'mono-mjs',
+##                'patterns': [
+##                                '/usr/bin/mjs',
+##                                '/usr/lib/mono/1.0/mjs.exe*'
+##                        ]
+##        },
+##....
+
+
+import os, sys, re
+
+def collect_paths(dir):
+    paths = {}
+    
+    os.chdir(dir)
+    for filename in os.listdir("."):
+        if filename.endswith(".install"):
+            fp = file(filename, "r")
+            lines = fp.readlines()
+            fp.close()
+            
+            contents = []
+            for line in lines:
+                lineparts = line.strip().split()
+                if lineparts[0].startswith("debian/tmp"):
+                    pattern = lineparts[0][ len("debian/tmp"): ]
+                    if len(lineparts) == 2:
+                        if not pattern.startswith(lineparts[1]):
+                            print >>sys.stderr, "Warning: Apparently I don't fully understand the format in file %s" % filename
+                    elif len(lineparts) > 2:
+                        print >>sys.stderr, "Warning: Apparently I don't fully understand the format in file %s" % filename
+                    
+                    contents.append( pattern )
+                else:
+                    print >>sys.stderr, "Note: Ignoring %s in %s" % (lineparts, filename)
+                
+            paths[ filename[ :-len(".install") ] ] = contents
+    
+    return paths
+
+def collect_packages(paths):
+    gac_re = re.compile(r'/usr/lib/mono/gac/(?P<assembly>[^/]+)/(?P<version>[^/]+)/?')
+    
+    # These packages should be populated first (e.g. because their files will otherwise end up
+    # in other packages)
+    PACKAGES_FIRST = ("mono-jit", "mono-gac", "mono-mjs", "mono-gmcs", "mono-utils", "mono-doc")
+    # These should be populated last (because their spec is very broad)
+    PACKAGES_LAST = ("mono-mcs", "libmono-system1.0-cil", "libmono-system2.0-cil", "libmono1.0-cil", "libmono2.0-cil")
+    first = []
+    last = []
+    packages = paths.keys()
+    for packagename in PACKAGES_FIRST + PACKAGES_LAST:
+        if packagename in packages:
+            packages.remove(packagename)
+            if packagename in PACKAGES_FIRST:
+                first.append(packagename)
+            else:
+                last.append(packagename)
+    packagenames = first + packages + last
+    
+    packages = []
+    for name in packagenames:
+        patterns = paths[ name ]
+        package = { "name": name,
+            "patterns": patterns}
+        
+        provided_assemblies = []
+        for pattern in patterns:
+            match = gac_re.match(pattern)
+            if match:
+                provided_assemblies.append( (match.group("assembly"), match.group("version")) )
+            if pattern == "/usr/lib/mono/1.0/mscorlib.dll*":
+                provided_assemblies.append( ("mscorlib", "1.0.*" ) )
+            elif pattern == "/usr/lib/mono/2.0/mscorlib.dll*":
+                provided_assemblies.append( ("mscorlib", "2.0.*" ) )
+        
+        if len(provided_assemblies) > 0:
+            package["assemblies"] = provided_assemblies
+        
+        packages.append(package)
+    
+    return packages
+
+if __name__ == "__main__":
+    packages = collect_packages( collect_paths(".") )
+    
+    if False: # Human-friendly
+        for package in packages:
+            print "Package: %s" % package["name"]
+            if package.has_key("provided_assemblies"):
+                print "Provides: \t%s" % ( "\n\t\t".join( [" ".join(e) for e in package["assemblies"] ] ) )
+            print "Patterns: \t\t%s" % ( "\n\t\t\t".join(package["patterns"]) )
+            print
+    else:
+        print "# This is a generated file, please do not edit directly"
+        print "# Use collect-paths.py instead. -- Henryk <henryk@openmoko.org>"
+        print "debian_mono_file_table = ["
+        print ",\n".join( 
+            [ 
+                "\t{\t%s\n\t}" % ",\n\t\t".join( 
+                    [
+                        "%r: %r" % (key, value)
+                        for key, value in package.items()
+                        if not isinstance(value, (list,tuple))
+                    ] + [
+                        "%r: [\n\t\t\t\t%s\n\t\t\t]" % (key, ",\n\t\t\t\t".join( [
+                                "%r"%(e,) for e in value
+                            ])
+                        )
+                        for key, value in package.items()
+                        if isinstance(value, (list,tuple))
+                    ]
+
+                )
+                for package in packages 
+            ]
+        )
+        print "]"
+    
diff --git a/packages/mono/mono-mcs-intermediate_1.2.5.1.bb b/packages/mono/mono-mcs-intermediate_1.2.5.1.bb
new file mode 100644
index 0000000000..07f9387e2a
--- /dev/null
+++ b/packages/mono/mono-mcs-intermediate_1.2.5.1.bb
@@ -0,0 +1,59 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.2.5.inc
+PR = "r0"
+DEPENDS = "mono-native glib-2.0-native"
+
+SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
+
+# Inherit native to set up compiler and paths ...
+inherit native
+# ... but override the target prefix
+prefix = "/usr"
+exec_prefix = "/usr"
+sysconfdir = "/etc"
+# TODO: Where does the mono package get
+# these paths from? Use the same source.
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
+
+do_stage() {
+	true
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
+
+do_package() {
+	true
+}
+
+do_populate_staging() {
+	cd ${D}
+	rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz
+	tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz .
+	install -d ${STAGING_DIR}/share/mono-mcs
+	cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/
+}
+
+do_package_write_ipk() {
+	true
+}
+
+do_package_write() {
+	true
+}
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index e1f3f1b6a5..53a671cd74 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -1,19 +1,145 @@
 require mono_1.2.5.inc
 
-DEPENDS = "mono-native glib-2.0"
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://configure.patch;patch=1"
 
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
 do_install_append() {
-	install -d ${D}${libdir}/mono/1.0/
-	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
 }
 
-EXTRA_OECONF += " --disable-mcs-build "
+inherit mono
+PACKAGES = "${@" ".join([e["name"] for e in mono_get_file_table(bb.data.getVar('PV', d, 1), d) if e.has_key("name")])}"
 
-PACKAGES =+ "mono-dll"
-FILES_mono-dll = "${libdir}/mono/1.0/"
+FILES_mono-doc_append = " /usr/share/libgc-mono/ "
 
+FILES_mono = "" # Apparently this gets ignored, so I'm setting it again below
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
 
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev = "/usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg = "/usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+python populate_packages_prepend () {
+	def fillin_packages():
+		# A lot of this code can probably be replaced with less code and some
+		# calls to do_split_packages
+		import bb, sys, os, glob, commands
+		
+		PV = bb.data.getVar('PV', d, 1)
+		
+		file_table = mono_get_file_table(PV, d)
+		packages_to_add = []
+		
+		D = bb.data.getVar('D', d, 1)
+		if not D: return
+		D = D + "/"
+		
+		def classify_files(files):
+			normal, dev, dbg, doc = [], [], [], []
+			for filename in files:
+				if filename.endswith(".mdb"):
+					dbg.append(filename)
+				elif os.path.basename( os.path.dirname( filename ) ) == ".debug":
+					dbg.append(filename)
+				elif filename.endswith(".pc"):
+					dev.append(filename)
+				else:
+					normal.append(filename)
+			return normal, dev, dbg, doc
+		
+		def will_strip(filename):
+			# From package.bbclass function runstrip
+			pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1)
+			ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, filename))
+			if "not stripped" in result:
+				return True
+			else:
+				return False
+
+		def append(name, value):
+			oldvalue = bb.data.getVar(name, d, 1) or ""
+			newvalue = " ".join([oldvalue, value])
+			bb.data.setVar(name, newvalue, d)
+		
+		already_covered = []
+		for package in file_table:
+			pn = package["name"]
+			if package.has_key("patterns"):
+				files = []
+				for pattern in package["patterns"]:
+					matching = glob.glob( D + pattern )
+					for filename in matching:
+						if os.path.isdir(filename):
+							for dirpath, dirnames, filenames in os.walk(filename):
+								for f in filenames:
+									debugname = os.path.join(dirpath, ".debug", f)
+									fullname =  os.path.join(dirpath, f)
+									files.append(fullname)
+									if will_strip(fullname):
+										files.append(debugname)
+						else:
+						    files.append(filename)
+				
+				# Remove the D prefix
+				files = [ e[len(D):] for e in files ]
+				
+				# Remove files that have already been placed in other packages
+				files = [ e for e in files if not e in already_covered ]
+				already_covered.extend( files )
+				
+				if pn.endswith("-dev") or pn.endswith("-dbg") or pn.endswith("-doc"):
+					normal, dev, dbg, doc = files, [], [], []
+				else:
+					normal, dev, dbg, doc = classify_files(files)
+				
+				for extension, filelist in [ ("",normal), ("-dev", dev), ("-dbg", dbg), ("-doc", doc)]:
+					if len(filelist) > 0:
+						packagename = pn + extension
+						append("FILES_%s" % packagename, " ".join(filelist))
+						bb.debug(2, "%s\n\t%s" %( packagename, "\n\t".join( filelist ) ))
+						if not packagename in packages_to_add:
+							packages_to_add.append(packagename)
+				
+			else:
+				packages_to_add.append(pn)
+		
+		# mono is just a stub package
+		bb.data.setVar("FILES_mono", "", d)
+		
+		bb.data.setVar("PACKAGES", " ".join(packages_to_add), d)
+	fillin_packages()
+}
diff --git a/packages/mono/mono_files.py b/packages/mono/mono_files.py
new file mode 100644
index 0000000000..6e673743c3
--- /dev/null
+++ b/packages/mono/mono_files.py
@@ -0,0 +1,605 @@
+# This is a generated file, please do not edit directly
+# Use collect-paths.py instead. -- Henryk <henryk@openmoko.org>
+debian_mono_file_table = [
+	{	'name': 'mono-jit',
+		'patterns': [
+				'/usr/bin/mono'
+			]
+	},
+	{	'name': 'mono-gac',
+		'patterns': [
+				'/usr/bin/gacutil',
+				'/usr/lib/mono/1.0/gacutil.exe'
+			]
+	},
+	{	'name': 'mono-mjs',
+		'patterns': [
+				'/usr/bin/mjs',
+				'/usr/lib/mono/1.0/mjs.exe*'
+			]
+	},
+	{	'name': 'mono-gmcs',
+		'patterns': [
+				'/usr/bin/gmcs',
+				'/usr/bin/wsdl2',
+				'/usr/bin/monop2',
+				'/usr/bin/ilasm2',
+				'/usr/bin/resgen2',
+				'/usr/bin/mono-api-info2',
+				'/usr/bin/mono-service2',
+				'/usr/bin/mkbundle2',
+				'/usr/bin/xbuild',
+				'/usr/bin/sgen',
+				'/usr/bin/al2',
+				'/usr/bin/httpcfg',
+				'/usr/lib/mono/2.0/*.exe*',
+				'/usr/lib/mono/2.0/xbuild.rsp',
+				'/usr/lib/mono/2.0/MSBuild/',
+				'/usr/lib/mono/2.0/Microsoft.Build.xsd',
+				'/usr/lib/mono/2.0/Microsoft.CSharp.targets',
+				'/usr/lib/mono/2.0/Microsoft.Common.tasks',
+				'/usr/lib/mono/2.0/Microsoft.Common.targets',
+				'/usr/lib/mono/2.0/Microsoft.VisualBasic.targets'
+			]
+	},
+	{	'name': 'mono-utils',
+		'patterns': [
+				'/usr/bin/pedump',
+				'/usr/bin/monodis',
+				'/usr/bin/monograph',
+				'/usr/bin/mono-find-provides',
+				'/usr/bin/mono-find-requires'
+			]
+	},
+	{	'name': 'libmono-peapi1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/PEAPI/1.0.*/',
+				'/usr/lib/mono/1.0/PEAPI.dll'
+			],
+		'assemblies': [
+				('PEAPI', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-cairo1.0-cil',