Big refactoring by David Farning.

36 files changed, 3104 insertions, 0 deletions

diff --git a/sjhbuild/bundlemodule.py b/sjhbuild/bundlemodule.py
new file mode 100644
index 0000000..3a662c1
--- /dev/null
+++ b/sjhbuild/bundlemodule.py
@@ -0,0 +1,94 @@
+__metaclass__ = type
+
+import os
+
+from jhbuild.errors import BuildStateError
+from jhbuild.modtypes import Package, get_branch, register_module_type
+
+__all__ = [ 'BundleModule' ]
+
+class BundleModule(Package):
+    type = 'bundle'
+
+    STATE_CHECKOUT = 'checkout'
+    STATE_FORCE_CHECKOUT = 'force_checkout'
+    STATE_BUILD = 'build'
+    STATE_INSTALL = 'install'
+
+    def __init__(self, name, branch, dependencies=[], after=[]):
+        Package.__init__(self, name, dependencies, after)
+        self.branch = branch
+
+    def get_srcdir(self, buildscript):
+        return self.branch.srcdir
+
+    def get_builddir(self, buildscript):
+        return self.get_srcdir(buildscript)
+
+    def get_revision(self):
+        return self.branch.branchname
+
+    def do_start(self, buildscript):
+        pass
+    do_start.next_state = STATE_CHECKOUT
+    do_start.error_states = []
+
+    def skip_checkout(self, buildscript, last_state):
+        # skip the checkout stage if the nonetwork flag is set
+        return buildscript.config.nonetwork
+
+    def do_checkout(self, buildscript):
+        srcdir = self.get_srcdir(buildscript)
+        buildscript.set_action('Checking out', self)
+        self.branch.checkout(buildscript)
+        # did the checkout succeed?
+        if not os.path.exists(srcdir):
+            raise BuildStateError('source directory %s was not created'
+                                  % srcdir)
+    do_checkout.next_state = STATE_BUILD
+    do_checkout.error_states = [STATE_FORCE_CHECKOUT]
+
+    def skip_force_checkout(self, buildscript, last_state):
+        return False
+
+    def do_force_checkout(self, buildscript):
+        buildscript.set_action('Checking out', self)
+        self.branch.force_checkout(buildscript)
+    do_force_checkout.next_state = STATE_BUILD
+    do_force_checkout.error_states = [STATE_FORCE_CHECKOUT]
+
+    def skip_build(self, buildscript, last_state):
+        return buildscript.config.nobuild
+
+    def do_build(self, buildscript):
+        buildscript.set_action('Building', self)
+        srcdir = self.get_srcdir(buildscript)
+        builddir = self.get_builddir(buildscript)
+        python = os.environ.get('PYTHON', 'python')
+        cmd = [python, 'setup.py', 'build']
+        buildscript.execute(cmd, cwd=srcdir)
+    do_build.next_state = STATE_INSTALL
+    do_build.error_states = [STATE_FORCE_CHECKOUT]
+
+    def skip_install(self, buildscript, last_state):
+        return buildscript.config.nobuild
+
+    def do_install(self, buildscript):
+        buildscript.set_action('Installing', self)
+        srcdir = self.get_srcdir(buildscript)
+        builddir = self.get_builddir(buildscript)
+        python = os.environ.get('PYTHON', 'python')
+        cmd = [python, 'setup.py', 'install']
+        cmd.extend(['--prefix', buildscript.config.prefix])
+        buildscript.execute(cmd, cwd=srcdir)
+        buildscript.packagedb.add(self.name, self.get_revision() or '')
+    do_install.next_state = Package.STATE_DONE
+    do_install.error_states = []
+
+
+def parse_bundle(node, config, uri, repositories, default_repo):
+    id = node.getAttribute('id')
+    branch = get_branch(node, repositories, default_repo, config)
+    return BundleModule(id, branch)
+
+register_module_type('bundle', parse_bundle)
diff --git a/sjhbuild/config.py b/sjhbuild/config.py
new file mode 100644
index 0000000..d89d69b
--- /dev/null
+++ b/sjhbuild/config.py
@@ -0,0 +1,76 @@
+import os
+import sys
+
+import jhbuild.config
+
+import sysdeps
+
+class Config(jhbuild.config.Config):
+    def __init__(self, base_dir, rc_file):
+        self.base_dir = base_dir
+        jhbuild.config.Config.__init__(self, os.path.join(self.base_dir, 'sugar.jhbuildrc'))
+        self._setup()
+
+    def _setup(self):
+        self.autogenargs = ''
+
+        self.checkoutroot = os.path.join(self.base_dir, 'source')
+        self.tarballdir =   os.path.join(self.base_dir, 'source')
+        self.moduleset =    os.path.join(self.base_dir, 'sjhbuild/modulesets/sugar.modules')
+        
+        for package, source in sysdeps.get_packages():
+            if source and source not in self.skip:
+                self.skip.append(source)
+
+    def setup_env(self):
+        # Hack to replace the default prefix
+        if self.prefix == '/opt/gnome2':
+            self.prefix = os.path.join(self.base_dir, 'install')
+
+        #Hack to allow sugar-jhbuild to find its self again.
+
+        MY_PATH = os.getenv('PATH', 'Error')
+        os.environ["PATH"] = MY_PATH + ':' + self.base_dir
+        
+        jhbuild.config.Config.setup_env(self)
+
+        jhbuild.config.addpath('XDG_DATA_DIRS', '/usr/share')
+        jhbuild.config.addpath('XDG_DATA_DIRS', os.path.join(self.prefix, 'share'))
+
+        if self.use_lib64:
+            path = 'lib64/gtk-2.0/'
+        else:
+            path = 'lib/gtk-2.0/'
+        jhbuild.config.addpath('GTK_PATH', os.path.join(self.prefix, path))
+        jhbuild.config.addpath('GTK_DATA_PREFIX', self.prefix)
+
+        os.environ['SUGAR_PREFIX'] = self.prefix
+        os.environ['SUGAR_PATH'] = os.path.join(self.prefix, 'share', 'sugar')
+        os.environ['SUGAR_LOGGER_LEVEL'] = 'debug'
+
+        # Enable debug log of the Telepathy components
+        os.environ['GABBLE_DEBUG'] = 'all'
+        os.environ['SALUT_DEBUG'] = 'all'
+        os.environ['STREAM_ENGINE_DEBUG'] = 'all'
+
+        # We need to add the gtk-2.0 directory explicitly to
+        # the Python path since '.pth' files (here pygtk.pth)
+        # only work properly in system directories
+        pythonversion = 'python' + str(sys.version_info[0]) + '.' + \
+                                       str(sys.version_info[1])
+        if self.use_lib64:
+            pythonpath = os.path.join(self.prefix, 'lib64', pythonversion,
+                                      'site-packages', 'gtk-2.0')
+        else:
+            pythonpath = os.path.join(self.prefix, 'lib', pythonversion,
+                                      'site-packages', 'gtk-2.0')
+        jhbuild.config.addpath('PYTHONPATH', pythonpath)
+
+        python_lib = os.path.join(self.prefix, 'lib', 'python2.5', 'site-packages')
+        os.environ['PYTHON_LIB'] = python_lib
+
+        if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
+	    del os.environ['DBUS_SESSION_BUS_ADDRESS']
+
+        if not 'SUGAR_PROFILE' in os.environ:
+            os.environ['SUGAR_PROFILE'] = 'default'
diff --git a/sjhbuild/main.py b/sjhbuild/main.py
new file mode 100644
index 0000000..be988b9
--- /dev/null
+++ b/sjhbuild/main.py
@@ -0,0 +1,155 @@
+#!/usr/bin/env python
+# jhbuild - a build script for GNOME 1.x and 2.x
+# Copyright (C) 2001-2006  James Henstridge
+#
+#   main.py: parses command line arguments and starts the build
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+import sys, os, errno
+import optparse
+import traceback
+
+import gettext
+localedir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../mo'))
+gettext.install('jhbuild', localedir=localedir, unicode=True)
+import __builtin__
+__builtin__.__dict__['N_'] = lambda x: x
+
+import jhbuild.commands
+from jhbuild.errors import UsageError, FatalError
+from jhbuild.utils.cmds import get_output
+from jhbuild.moduleset import warn_local_modulesets
+
+import bundlemodule
+
+from config import Config
+
+if sys.platform == 'darwin':
+    # work around locale.getpreferredencoding() returning an empty string in
+    # Mac OS X, see http://bugzilla.gnome.org/show_bug.cgi?id=534650 and
+    # http://bazaar-vcs.org/DarwinCommandLineArgumentDecoding
+    sys.platform = 'posix'
+    try:
+        import locale
+    finally:
+        sys.platform = 'darwin'
+else:
+    import locale
+
+try:
+    _encoding = locale.getpreferredencoding()
+    assert _encoding
+except (locale.Error, AssertionError):
+    _encoding = 'ascii'
+
+def uencode(s):
+    if type(s) is unicode:
+        return s.encode(_encoding, 'replace')
+    else:
+        return s
+
+def uprint(*args):
+    '''Print Unicode string encoded for the terminal'''
+    for s in args[:-1]:
+        print uencode(s),
+    s = args[-1]
+    print uencode(s)
+
+__builtin__.__dict__['uprint'] = uprint
+__builtin__.__dict__['uencode'] = uencode
+
+def help_commands(option, opt_str, value, parser):
+    thisdir = os.path.abspath(os.path.dirname(__file__))
+    
+    # import all available commands
+    for fname in os.listdir(os.path.join(thisdir, 'commands')):
+        name, ext = os.path.splitext(fname)
+        if not ext == '.py':
+            continue
+        try:
+            __import__('jhbuild.commands.%s' % name)
+        except ImportError:
+            pass
+    
+    uprint(_('JHBuild commands are:'))
+    commands = [(x.name, x.doc) for x in jhbuild.commands.get_commands().values()]
+    commands.sort()
+    for name, description in commands:
+        uprint('  %-15s %s' % (name, description))
+    print
+    uprint(_('For more information run "jhbuild <command> --help"'))
+    parser.exit()
+
+def main(base_dir, args):
+    parser = optparse.OptionParser(
+        usage=_('%prog [ -f config ] command [ options ... ]'),
+        description=_('Build a set of modules from diverse repositories in correct dependency order (such as GNOME).'))
+    parser.disable_interspersed_args()
+    parser.add_option('--help-commands', action='callback',
+                      callback=help_commands,
+                      help=_('Information about available jhbuild commands'))
+    parser.add_option('-f', '--file', action='store', metavar='CONFIG',
+                      type='string', dest='configfile',
+                      default=os.environ.get("JHBUILDRC", os.path.join(os.environ['HOME'], '.jhbuildrc')),
+                      help=_('use a non default configuration file'))
+    parser.add_option('-m', '--moduleset', action='store', metavar='URI',
+                      type='string', dest='moduleset', default=None,
+                      help=_('use a non default module set'))
+    parser.add_option('--no-interact', action='store_true',
+                      dest='nointeract', default=False,
+                      help=_('do not prompt for input'))
+
+    options, args = parser.parse_args(args)
+
+    try:
+        config = Config(base_dir, options.configfile)
+    except FatalError, exc:
+        sys.stderr.write('sugar-jhbuild: %s\n' % exc.args[0].encode(_encoding, 'replace'))
+        sys.exit(1)
+
+    if options.moduleset: config.moduleset = options.moduleset
+    if options.nointeract: config.interact = False
+
+    if not args or args[0][0] == '-':
+        command = 'build' # default to cvs update + compile
+    else:
+        command = args[0]
+        args = args[1:]
+
+    warn_local_modulesets(config)
+
+    try:
+        rc = jhbuild.commands.run(command, config, args)
+    except UsageError, exc:
+        sys.stderr.write('sugar-jhbuild %s: %s\n' % (command, exc.args[0].encode(_encoding, 'replace')))
+        parser.print_usage()
+        sys.exit(1)
+    except FatalError, exc:
+        sys.stderr.write('sugar-jhbuild %s: %s\n' % (command, exc.args[0].encode(_encoding, 'replace')))
+        sys.exit(1)
+    except KeyboardInterrupt:
+        uprint(_('Interrupted'))
+        sys.exit(1)
+    except EOFError:
+        uprint(_('EOF'))
+        sys.exit(1)
+    except IOError, e:
+        if e.errno != errno.EPIPE:
+            raise
+        sys.exit(0)
+    if rc:
+        sys.exit(rc)
+
diff --git a/sjhbuild/modulesets/extra-activities.modules b/sjhbuild/modulesets/extra-activities.modules
new file mode 100644
index 0000000..60b4779
--- /dev/null
+++ b/sjhbuild/modulesets/extra-activities.modules
@@ -0,0 +1,96 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="git" name="dev.laptop.org"
+      href="git://dev.laptop.org/"/>
+  <repository type="git" name="dev.laptop.org/projects"
+      href="git://dev.laptop.org/projects/" />
+  <repository type="git" name="dev.laptop.org/mamamedia"
+      href="git://dev.laptop.org/mamamedia/" />
+  <repository type="svn" name="penguintv.sf.net"
+      href="https://penguintv.svn.sourceforge.net/svnroot/penguintv/" />
+  <bundle id="block-party-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="penguintv">
+    <branch repo="penguintv.sf.net" module="trunk" checkoutdir="penguintv" />
+  </bundle>
+  <bundle id="video-chat-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="connect-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="oficina">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="jukebox-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="hellomesh">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="gmail-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="cartoon-builder">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="jigsaw-puzzle">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="joke-machine">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="mamamedia-activity-center">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="mamamedia-teacher-center">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="poll-builder">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="slider-puzzle">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="story-builder">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="flipsticks">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="memorygame">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="analyze-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="acoustic-measure-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <metamodule id="meta-extra-activities">
+    <dependencies>
+      <dep package="block-party-activity"/>
+      <dep package="penguintv"/>
+      <dep package="video-chat-activity"/>
+      <dep package="connect-activity"/>
+      <dep package="oficina"/>
+      <dep package="jukebox-activity"/>
+      <dep package="hellomesh"/>
+      <dep package="gmail-activity"/>
+      <dep package="cartoon-builder"/>
+      <dep package="jigsaw-puzzle"/>
+      <dep package="joke-machine"/>
+      <dep package="mamamedia-activity-center"/>
+      <dep package="mamamedia-teacher-center"/>
+      <dep package="poll-builder"/>
+      <dep package="slider-puzzle"/>
+      <dep package="story-builder"/>
+      <dep package="flipsticks"/>
+      <dep package="memorygame"/>
+      <dep package="analyze-activity"/>
+      <dep package="acoustic-measure-activity"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/sjhbuild/modulesets/extra.modules b/sjhbuild/modulesets/extra.modules
new file mode 100644
index 0000000..4dde9e3
--- /dev/null
+++ b/sjhbuild/modulesets/extra.modules
@@ -0,0 +1,54 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <tarball id="libjingle" version="0.3.11">
+    <source href="http://downloads.sourceforge.net/tapioca-voip/libjingle-0.3.11.tar.gz"
+            size="613784" md5sum="f9602b2dbca1e13dfe0b15e9188b4442"/>
+    <dependencies/>
+    <patches>
+      <patch file="libjingle_ignore_invalid_sockets.patch" strip="1"/>
+      <patch file="libjingle_send_assert.patch" strip="1"/>
+      <patch file="libjingle_tcp_wouldblock.patch" strip="1"/>
+    </patches>
+  </tarball>
+  <tarball id="gst-plugins-farsight" version="0.12.8">
+    <source href="http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.8.tar.gz"
+            size="613984" md5sum="722c1fbabb3c561b2a69fa87056da680"/>
+    <dependencies>
+       <dep package="libjingle"/>
+    </dependencies>
+  </tarball>
+  <tarball id="farsight" version="0.1.28">
+    <source href="http://farsight.freedesktop.org/releases/farsight/farsight-0.1.28.tar.gz"
+            size="580714" md5sum="6439b749ecf83bb956a6c88a7843343e"/>
+    <dependencies>
+       <dep package="libjingle"/>
+       <dep package="gst-plugins-farsight"/>
+    </dependencies>
+  </tarball>
+  <tarball id="telepathy-stream-engine" version="0.5.3" autogenargs="--disable-seq-dias">
+    <source href="http://telepathy.freedesktop.org/releases/stream-engine/telepathy-stream-engine-0.5.3.tar.gz"
+            size="447762" md5sum="3dd96588590204d008d2421f7186f85c"/>
+    <dependencies>
+       <dep package="farsight"/>
+       <dep package="telepathy-glib"/>
+       <dep package="gst-ffmpeg"/>
+    </dependencies>
+  </tarball>
+  <tarball id="gst-ffmpeg" version="0.10.4">
+    <source href="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.4.tar.gz"
+            md5sum="6e71e37bf5c957264d4407c5f9f2a4bc" size="3594056"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+  <metamodule id="meta-extra">
+    <dependencies>
+      <dep package="libjingle"/>
+      <dep package="gst-plugins-farsight"/>
+      <dep package="farsight"/>
+      <dep package="telepathy-stream-engine"/>
+      <dep package="gst-ffmpeg"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
+
diff --git a/sjhbuild/modulesets/fructose.modules b/sjhbuild/modulesets/fructose.modules
new file mode 100644
index 0000000..f06b9ad
--- /dev/null
+++ b/sjhbuild/modulesets/fructose.modules
@@ -0,0 +1,71 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="git" name="git.sugarlabs.org" default="yes"
+      href="git://git.sugarlabs.org"/>
+  <repository type="git" name="dev.laptop.org"
+      href="git://dev.laptop.org/"/>
+  <repository type="git" name="dev.laptop.org/projects"
+      href="git://dev.laptop.org/projects/" />
+  <repository type="git" name="dev.laptop.org/users/sayamindu"
+     href="git://dev.laptop.org/users/sayamindu/" />
+  <bundle id="block-party-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="browse">
+    <branch module="browse/mainline.git" checkoutdir="browse"/>
+  </bundle>
+  <bundle id="pippy-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="chat">
+    <branch module="chat/mainline.git" checkoutdir="chat"/>
+  </bundle>
+  <bundle id="read">
+    <branch module="read/mainline.git" checkoutdir="read"/>
+  </bundle>
+  <bundle id="terminal">
+	  <branch module="terminal/mainline.git" checkoutdir="terminal" />
+  </bundle>
+  <bundle id="write">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <autotools id="etoys">
+    <branch repo="dev.laptop.org/projects" />
+  </autotools>
+  <bundle id="calculate">
+    <branch module="calculate/mainline.git" checkoutdir="calculate" />
+  </bundle>
+  <bundle id="log-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="pippy-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="imageviewer">
+    <branch module="imageviewer/mainline.git" checkoutdir="imageviewer" />
+  </bundle>
+  <bundle id="turtleart">
+    <branch module="turtleart/mainline.git" checkoutdir="turtleart"/>
+  </bundle>
+  <bundle id="jukebox">
+    <branch module="jukebox/mainline.git" checkoutdir="jukebox"/>
+  </bundle>
+
+  <metamodule id="meta-fructose">
+    <dependencies>
+      <dep package="etoys"/>
+      <dep package="read"/>
+      <dep package="browse"/>
+      <dep package="chat"/>
+      <dep package="write"/>
+      <dep package="terminal"/>
+      <dep package="calculate"/>
+      <dep package="log-activity"/>
+      <dep package="pippy-activity"/>
+      <dep package="imageviewer"/>
+      <dep package="turtleart"/>
+      <dep package="jukebox"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/sjhbuild/modulesets/glucose-external.modules b/sjhbuild/modulesets/glucose-external.modules
new file mode 100644
index 0000000..4278731
--- /dev/null
+++ b/sjhbuild/modulesets/glucose-external.modules
@@ -0,0 +1,140 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="git" name="dev.laptop.org/projects"
+      href="git://dev.laptop.org/projects/" />
+  <repository type="svn" name="svn.gnome.org"
+      href="http://svn.gnome.org/svn/"/>
+  <repository type="svn" name="squeakvm.org"
+        href="http://squeakvm.org/svn/squeak/branches/" trunk-path=""/>
+  <repository type="git" name="git.imendio.com"
+      href="git://git.imendio.com/projects/"/>
+  <repository type="svn" name="matchbox.o-hand.com"
+      href="http://svn.o-hand.com/repos/matchbox/"/>
+  <repository type="tarball" name="telepathy"
+      href="http://telepathy.freedesktop.org/releases/"/>
+  <repository type="tarball" name="xulrunner"
+      href="http://dev.laptop.org/pub/sugar/xulrunner/"/>
+  <repository type="git" name="dev.laptop.org/users/dsd"
+      href="git://dev.laptop.org/users/dsd/"/>
+  <tarball id="pygobject" version="2.14">
+    <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
+            md5sum="0e9e9300e81847f4f7266f49d3bebbaf" size="366808"/>
+    <patches>
+      <patch file="pygobject-pylint.patch" strip="0"/>
+    </patches>
+  </tarball>
+  <tarball id="libmatchbox" version="1.8" autogenargs="--enable-pango">
+    <source href="http://matchbox-project.org/sources/libmatchbox/1.8/libmatchbox-1.8.tar.bz2"
+            size="303304" md5sum="6bbd6b41f4fd78b7baa6157b303e5ac0"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+  <autotools id="matchbox-window-manager">
+    <branch repo="matchbox.o-hand.com" module="trunk/matchbox-window-manager"/>
+    <dependencies>
+      <dep package="libmatchbox"/>
+    </dependencies>
+  </autotools>
+  <autotools id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-install-strip --disable-tests --disable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" makeinstallargs="install SKIP_GRE_REGISTRATION=1">
+    <branch repo="xulrunner" module="xulrunner-1.9.0.2-source.tar.bz2" version="1.9"
+            size="36945924" md5sum="0a6c68a5ab5b065fef221b586b8a3b8a" checkoutdir="mozilla"/>
+    <dependencies>
+    </dependencies>
+   <patches>
+     <patch file="xulrunner-xds.patch" strip="0"/>
+     <patch file="xulrunner-no-native-theme.patch" strip="0"/>
+     <patch file="xulrunner-perms.patch" strip="0"/>
+   </patches>
+  </autotools>
+  <tarball id="abiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.5">
+    <source href="http://abisource.com/downloads/abiword/2.6.5/source/abiword-2.6.5.tar.gz"
+            size="9514729" md5sum="edce76a1da515dfc102a0e030f722002"/>
+    <patches>
+      <patch file="libabiword-2.5.2-defaultfont.patch" strip="1"/>
+      <patch file="libabiword-2.6.0.svn20071031-draghandles.patch" strip="1"/>
+      <patch file="libabiword-2.6.0.svn20071031-nohtmloptions.patch" strip="1"/>
+      <patch file="libabiword-2.6.0.svn20071106-noassertinput.patch" strip="1"/>
+    </patches>
+  </tarball>
+  <tarball id="abiword-plugins" autogenargs="--enable-libabiword --enable-debug --disable-all --enable-OpenDocument --enable-abicollab --with-abicollab-sugar-backend --enable-abicollab-record-always --enable-loadbindings --with-abiword=../abiword-2.6.5" makefile="GNUmakefile" version="2.6.5">
+    <source href="http://abisource.com/downloads/abiword/2.6.5/source/abiword-plugins-2.6.5.tar.gz"
+            size="1930003" md5sum="6e38e0efc40421591ae4cc0d5202a796"/>
+    <dependencies>
+      <dep package="abiword"/>
+    </dependencies>
+  </tarball>
+  <tarball id="pyabiword" version="0.6.1">
+    <source href="http://www.sugarlabs.org/~marco/jhbuild/pyabiword-0.6.1.tar.gz"
+            size="336871" md5sum="d0cfa7533fc30db236993131a513ec0d"/>
+    <dependencies>
+      <dep package="abiword"/>
+    </dependencies>
+  </tarball>
+  <autotools id="squeak">
+    <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+  <autotools id="hulahop">
+    <branch repo="dev.laptop.org/projects"/>
+    <dependencies>
+      <dep package="xulrunner"/>
+    </dependencies>
+  </autotools>
+  <autotools id="hippo-canvas">
+    <branch repo="svn.gnome.org"/>
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-gabble"
+             autogen-sh="configure">
+    <branch repo="telepathy"
+            version="0.7.16"
+            module="telepathy-gabble/telepathy-gabble-0.7.16.tar.gz"
+            size="1417532" md5sum="8a4be460b5d8233afa170f433ca116cc">
+      <patch file="telepathy-gabble-chmod-unix-socket.patch" strip="1"/>
+      <patch file="telepathy-gabble-olpc-no-dbus-uid-check.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-salut"
+             autogen-sh="configure" autogenargs="--enable-olpc">
+    <branch repo="telepathy"
+            version="0.3.7"
+            module="telepathy-salut/telepathy-salut-0.3.7.tar.gz"
+            size="1033259" md5sum="0019eb92a06edf4e61b7a4cb8bc88d40">
+       <patch file="telepathy-salut-chmod-unix-socket.patch" strip="1"/>
+       <patch file="telepathy-salut-olpc-no-dbus-uid-check.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-glib" autogen-sh="configure">
+    <branch repo="telepathy" version="0.7.22"
+            module="telepathy-glib/telepathy-glib-0.7.22.tar.gz"
+            size="2250849" md5sum="558d463816ca71955ca27fdcddf715c2" />
+  </autotools>
+  <distutils id="telepathy-python">
+    <branch module="telepathy-python/telepathy-python-0.15.6.tar.gz"
+            repo="telepathy" version="0.15.6"
+            size="165649" md5sum="b79886e73bf20eb7af300a6408e53fa6"/>
+    <dependencies>
+      <dep package="telepathy-gabble"/>
+    </dependencies>
+  </distutils>
+  <autotools id="sugar-evince" autogenargs="--disable-static --disable-binary --enable-embed --without-libgnome --disable-scrollkeeper --disable-schemas-install --disable-dvi --without-print --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics --disable-nautilus --without-keyring">
+    <branch repo="dev.laptop.org/users/dsd" />
+  </autotools>
+  <tarball id="GConf-dbus">
+    <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2"
+            version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/>
+    <patches>
+      <patch file="gconf-dbus-defaultpath.patch" strip="0"/>
+    </patches>
+  </tarball>
+</moduleset>
diff --git a/sjhbuild/modulesets/glucose.modules b/sjhbuild/modulesets/glucose.modules
new file mode 100644
index 0000000..d70b05f
--- /dev/null
+++ b/sjhbuild/modulesets/glucose.modules
@@ -0,0 +1,58 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="git" name="git.sugarlabs.org" default="yes"
+      href="git://git.sugarlabs.org"/>
+  <autotools id="sugar-base">
+    <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/>
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+  <autotools id="sugar-toolkit">
+    <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/>
+    <dependencies>
+      <dep package="pygobject"/>
+      <dep package="sugar-datastore"/>
+      <dep package="hippo-canvas"/>
+      <dep package="sugar-presence-service"/>
+    </dependencies>
+  </autotools> 
+  <autotools id="sugar">
+    <branch module="sugar/mainline.git" checkoutdir="sugar"/>
+    <dependencies>
+      <dep package="GConf-dbus"/>
+      <dep package="sugar-base"/>
+      <dep package="sugar-toolkit"/>
+      <dep package="sugar-artwork"/>
+      <dep package="matchbox-window-manager"/>
+    </dependencies>
+  </autotools>
+  <autotools id="sugar-presence-service">
+    <branch module="sugar-presence-service/mainline.git" checkoutdir="sugar-presence-service"/>
+    <dependencies>
+      <dep package="telepathy-gabble"/>
+      <dep package="telepathy-salut"/>
+      <dep package="telepathy-python"/>
+    </dependencies>
+  </autotools>
+  <autotools id="sugar-artwork">
+    <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+  <autotools id="sugar-datastore">
+    <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/>
+  </autotools>
+
+  <metamodule id="meta-glucose">
+    <dependencies>
+      <dep package="sugar"/>
+      <dep package="pyabiword"/>
+      <dep package="abiword-plugins"/>
+      <dep package="squeak"/>
+      <dep package="sugar-evince"/>
+      <dep package="hulahop"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/sjhbuild/modulesets/patches/astng-ignoredatadesc.patch b/sjhbuild/modulesets/patches/astng-ignoredatadesc.patch
new file mode 100644
index 0000000..c527419
--- /dev/null
+++ b/sjhbuild/modulesets/patches/astng-ignoredatadesc.patch
@@ -0,0 +1,11 @@
+--- builder.py.orig	2008-04-20 20:41:22.000000000 +0200
++++ builder.py	2008-04-20 20:41:31.000000000 +0200
+@@ -564,7 +564,7 @@
+                 object_build_methoddescriptor(node, member)
+             elif isdatadescriptor(member):
+                 assert isinstance(member, object)
+-                object_build_datadescriptor(node, member, name)
++                #object_build_datadescriptor(node, member, name)
+             elif isinstance(member, (int, long, float, str, unicode)) or member is None:
+                 attach_const_node(node, name, member)
+             else:
diff --git a/sjhbuild/modulesets/patches/gconf-dbus-defaultpath.patch b/sjhbuild/modulesets/patches/gconf-dbus-defaultpath.patch
new file mode 100644
index 0000000..f792566
--- /dev/null
+++ b/sjhbuild/modulesets/patches/gconf-dbus-defaultpath.patch
@@ -0,0 +1,11 @@
+--- gconf/default.path.in.orig	2008-10-11 13:12:47.000000000 +0200
++++ gconf/default.path.in	2008-10-11 13:13:30.000000000 +0200
+@@ -18,7 +18,7 @@
+ include "$(HOME)/.gconf.path"
+ 
+ # Give users a default storage location, ~/.gconf
+-xml:readwrite:$(HOME)/.gconf
++xml:readwrite:$(HOME)/.sugar/$(ENV_SUGAR_PROFILE)/gconf
+ 
+ # To read in any defaults settings that the Sys Admin may have created
+ # prior to a desktop system upgrade. The SysAdmin can stick default values
diff --git a/sjhbuild/modulesets/patches/gstreamer_system_clock_wait_jitter_block.patch b/sjhbuild/modulesets/patches/gstreamer_system_clock_wait_jitter_block.patch
new file mode 100644
index 0000000..754ec89
--- /dev/null
+++ b/sjhbuild/modulesets/patches/gstreamer_system_clock_wait_jitter_block.patch
@@ -0,0 +1,64 @@
+Index: gst/gstsystemclock.c
+===================================================================
+RCS file: /cvs/gstreamer/gstreamer/gst/gstsystemclock.c,v
+retrieving revision 1.46
+retrieving revision 1.47
+diff -u -r1.46 -r1.47
+--- gst/gstsystemclock.c	12 Mar 2007 15:27:05 -0000	1.46
++++ gst/gstsystemclock.c	22 Mar 2007 11:58:07 -0000	1.47
+@@ -424,6 +424,10 @@
+         /* else restart if we must */
+         if (!restart)
+           break;
++
++        /* this can happen if the entry got unlocked because of an async entry
++         * was added to the head of the async queue. */
++        GST_CAT_DEBUG (GST_CAT_CLOCK, "continue waiting for entry %p", entry);
+       }
+     }
+   } else if (diff == 0) {
+@@ -441,7 +445,7 @@
+   GstClockReturn ret;
+ 
+   GST_OBJECT_LOCK (clock);
+-  ret = gst_system_clock_id_wait_jitter_unlocked (clock, entry, jitter, FALSE);
++  ret = gst_system_clock_id_wait_jitter_unlocked (clock, entry, jitter, TRUE);
+   GST_OBJECT_UNLOCK (clock);
+ 
+   return ret;
+@@ -485,7 +489,7 @@
+ static GstClockReturn
+ gst_system_clock_id_wait_async (GstClock * clock, GstClockEntry * entry)
+ {
+-  GST_CAT_DEBUG (GST_CAT_CLOCK, "adding entry %p", entry);
++  GST_CAT_DEBUG (GST_CAT_CLOCK, "adding async entry %p", entry);
+ 
+   GST_OBJECT_LOCK (clock);
+ 
+@@ -503,7 +507,12 @@
+    * front, else the thread is just waiting for another entry and
+    * will get to this entry automatically. */
+   if (clock->entries->data == entry) {
+-    GST_CAT_DEBUG (GST_CAT_CLOCK, "send signal");
++    GST_CAT_DEBUG (GST_CAT_CLOCK, "async entry added to head, sending signal");
++    /* this will wake up _all_ entries waiting for the clock because we have
++     * only one cond for all entries (makes allocation faster). Entries that
++     * have not timed out will have their status set to BUSY and should continue
++     * to wait. In the case of the async ones, the new head entry should be
++     * taken and waited for. */
+     GST_CLOCK_BROADCAST (clock);
+   }
+   GST_OBJECT_UNLOCK (clock);
+@@ -528,8 +537,11 @@
+   GST_CAT_DEBUG (GST_CAT_CLOCK, "unscheduling entry %p", entry);
+ 
+   GST_OBJECT_LOCK (clock);
++  /* mark entry as unscheduled, then wake up all entries. The entries that did
++   * not timeout will be woken up but immediatly go to sleep again because their
++   * status would still be busy. */
+   entry->status = GST_CLOCK_UNSCHEDULED;
+-  GST_CAT_DEBUG (GST_CAT_CLOCK, "send signal");
++  GST_CAT_DEBUG (GST_CAT_CLOCK, "sending signal");
+   GST_CLOCK_BROADCAST (clock);
+   GST_OBJECT_UNLOCK (clock);
+ }
diff --git a/sjhbuild/modulesets/patches/libabiword-2.5.2-defaultfont.patch b/sjhbuild/modulesets/patches/libabiword-2.5.2-defaultfont.patch
new file mode 100644
index 0000000..d783f87
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libabiword-2.5.2-defaultfont.patch
@@ -0,0 +1,732 @@
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ 
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-am_ET libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-am_ET
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-am_ET	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-am_ET	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_EG libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_EG
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_EG	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_EG	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_SA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_SA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_SA	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_SA	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-bg_BG libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-bg_BG
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-bg_BG	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-bg_BG	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ca_ES libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ca_ES
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ca_ES	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ca_ES	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-cs_CZ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-cs_CZ
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-cs_CZ	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-cs_CZ	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-da_DK libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-da_DK
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-da_DK	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-da_DK	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_AT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_AT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_AT	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_AT	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_CH libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_CH
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_CH	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_CH	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_DE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_DE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_DE	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_DE	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-div_MV libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-div_MV
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-div_MV	2007-01-14 16:52:46.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-div_MV	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-el_GR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-el_GR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-el_GR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-el_GR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_AU libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_AU
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_AU	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_AU	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_CA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_CA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_CA	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_CA	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="216.000000" height="279.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_GB libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_GB
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_GB	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_GB	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_IE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_IE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_IE	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_IE	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_NZ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_NZ
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_NZ	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_NZ	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_ZA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_ZA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_ZA	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_ZA	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_AR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_AR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_AR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_AR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_ES libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_ES
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_ES	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_ES	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_IR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_IR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_IR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_IR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_MX libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_MX
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_MX	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_MX	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fa_IR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fa_IR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fa_IR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fa_IR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fi_FI libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fi_FI
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fi_FI	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fi_FI	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_BE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_BE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_BE	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_BE	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CA	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CA	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CH libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CH
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CH	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CH	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_FR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_FR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_FR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_FR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-gl_ES libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-gl_ES
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-gl_ES	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-gl_ES	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he_IL libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he_IL
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he_IL	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he_IL	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-hu_HU libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-hu_HU
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-hu_HU	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-hu_HU	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-it_IT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-it_IT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-it_IT	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-it_IT	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ja_JP libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ja_JP
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ja_JP	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ja_JP	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-lt_LT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-lt_LT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-lt_LT	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-lt_LT	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nb_NO libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nb_NO
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nb_NO	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nb_NO	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nl_NL libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nl_NL
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nl_NL	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nl_NL	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nn_NO libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nn_NO
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nn_NO	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nn_NO	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pl_PL libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pl_PL
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pl_PL	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pl_PL	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ps libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ps
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ps	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ps	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_BR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_BR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_BR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_BR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_PT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_PT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_PT	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_PT	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru_RU libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru_RU
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru_RU	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru_RU	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sk_SK libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sk_SK
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sk_SK	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sk_SK	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sl libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sl
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sl	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sl	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv_SE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv_SE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv_SE	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv_SE	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-syr libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-syr
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-syr	2007-01-14 16:52:46.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-syr	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr_TR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr_TR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr_TR	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr_TR	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-uk_UA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-uk_UA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-uk_UA	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-uk_UA	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ur_PK libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ur_PK
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ur_PK	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ur_PK	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-yi libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-yi
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-yi	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-yi	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_CN libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_CN
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_CN	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_CN	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_TW libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_TW
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_TW	2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_TW	2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff --git a/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071031-draghandles.patch b/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071031-draghandles.patch
new file mode 100644
index 0000000..7e47270
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071031-draghandles.patch
@@ -0,0 +1,12 @@
+diff -u -r libabiword-2.6.0.svn20071031.orig/src/text/fmt/xp/fp_FrameContainer.h libabiword-2.6.0.svn20071031/src/text/fmt/xp/fp_FrameContainer.h
+--- libabiword-2.6.0.svn20071031.orig/src/text/fmt/xp/fp_FrameContainer.h	2007-10-31 19:19:23.000000000 +0100
++++ libabiword-2.6.0.svn20071031/src/text/fmt/xp/fp_FrameContainer.h	2007-10-31 19:21:40.000000000 +0100
+@@ -41,7 +41,7 @@
+ class fl_DocSectionLayout;
+ class fl_BlockLayout;
+ 
+-#define FRAME_HANDLE_SIZE 6
++#define FRAME_HANDLE_SIZE 20
+ 
+ class ABI_EXPORT fp_FrameContainer : public fp_VerticalContainer
+ {
diff --git a/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071031-nohtmloptions.patch b/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071031-nohtmloptions.patch
new file mode 100644
index 0000000..cf885cb
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071031-nohtmloptions.patch
@@ -0,0 +1,12 @@
+diff -u -r libabiword-2.6.0.svn20071031.orig/src/wp/impexp/xp/ie_exp_HTML.h libabiword-2.6.0.svn20071031/src/wp/impexp/xp/ie_exp_HTML.h
+--- libabiword-2.6.0.svn20071031.orig/src/wp/impexp/xp/ie_exp_HTML.h	2007-10-31 19:19:23.000000000 +0100
++++ libabiword-2.6.0.svn20071031/src/wp/impexp/xp/ie_exp_HTML.h	2007-10-31 19:19:44.000000000 +0100
+@@ -39,7 +39,7 @@
+ 
+ /* Define if the [P/X]HTML export options dialog is implemented
+  */
+-#define HTML_DIALOG_OPTIONS
++//#define HTML_DIALOG_OPTIONS
+ 
+ /* Define if the tables are supported
+  */
diff --git a/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071106-noassertinput.patch b/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071106-noassertinput.patch
new file mode 100644
index 0000000..1c1bef0
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libabiword-2.6.0.svn20071106-noassertinput.patch
@@ -0,0 +1,19 @@
+diff -u -r libabiword-2.6.0.svn20071106.orig/src/af/util/unix/ut_unixAssert.cpp libabiword-2.6.0.svn20071106/src/af/util/unix/ut_unixAssert.cpp
+--- libabiword-2.6.0.svn20071106.orig/src/af/util/unix/ut_unixAssert.cpp	2007-01-17 00:17:27.000000000 +0100
++++ libabiword-2.6.0.svn20071106/src/af/util/unix/ut_unixAssert.cpp	2007-11-09 12:00:35.000000000 +0100
+@@ -32,6 +32,7 @@
+ 	printf("\n");
+ 	printf("**** (%d) Assert ****\n", ++count);
+ 	printf("**** (%d) %s at %s:%d ****\n", count,szMsg,szFile,iLine);
++#if 0
+ 	while (1)
+ 	{
+ 		printf("**** (%d) Continue ? (y/n) [y] : ", count);
+@@ -58,6 +59,7 @@
+ 			break;						// ?? ask them again
+ 		}
+ 	}
++#endif
+ }
+ 
+ #endif // NDEBUG
diff --git a/sjhbuild/modulesets/patches/libdbus_marshal.patch b/sjhbuild/modulesets/patches/libdbus_marshal.patch
new file mode 100644
index 0000000..8fc163e
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libdbus_marshal.patch
@@ -0,0 +1,185 @@
+diff -ur dbus-1.0.2.orig/dbus/dbus-message.c dbus-1.0.2/dbus/dbus-message.c
+--- dbus-1.0.2.orig/dbus/dbus-message.c	2006-12-11 19:21:18.000000000 +0000
++++ dbus-1.0.2/dbus/dbus-message.c	2007-04-05 19:41:29.000000000 +0100
+@@ -3890,6 +3890,110 @@
+     }
+ }
+ 
++/**
++ * Turn a DBusMessage into the marshalled form as described in the D-Bus
++ * specification.
++ *
++ * Generally, this function is only useful for encapsulating D-Bus messages in
++ * a different protocol.
++ *
++ * @param msg the DBusMessage
++ * @param marshalled_data_p the location to save the marshalled form to
++ * @param len_p the location to save the length of the marshalled form to
++ * @returns #FALSE if there was not enough memory
++ */
++dbus_bool_t
++dbus_message_marshal (DBusMessage  *msg,
++                      char        **marshalled_data_p,
++                      int          *len_p)
++{
++  DBusString tmp;
++
++  _dbus_return_val_if_fail (msg != NULL, FALSE);
++  _dbus_return_val_if_fail (marshalled_data_p != NULL, FALSE);
++  _dbus_return_val_if_fail (len_p != NULL, FALSE);
++
++  if (!_dbus_string_init (&tmp))
++    return FALSE;
++
++  if (!_dbus_string_copy (&(msg->header.data), 0, &tmp, 0))
++    goto fail;
++
++  *len_p = _dbus_string_get_length (&tmp);
++
++  if (!_dbus_string_copy (&(msg->body), 0, &tmp, *len_p))
++    goto fail;
++
++  *len_p = _dbus_string_get_length (&tmp);
++
++  if (!_dbus_string_steal_data (&tmp, marshalled_data_p))
++    goto fail;
++
++  _dbus_string_free (&tmp);
++  return TRUE;
++
++ fail:
++  _dbus_string_free (&tmp);
++  return FALSE;
++}
++
++/**
++ * Demarshal a D-Bus message from the format described in the D-Bus
++ * specification.
++ *
++ * Generally, this function is only useful for encapsulating D-Bus messages in
++ * a different protocol.
++ *
++ * @param str the marshalled DBusMessage
++ * @param len the length of str
++ * @param error the location to save errors to
++ * @returns #NULL if there was an error
++ */
++DBusMessage *
++dbus_message_demarshal (const char *str,
++                        int         len,
++                        DBusError  *error)
++{
++  DBusMessageLoader *loader;
++  DBusString *buffer;
++  DBusMessage *msg;
++
++  _dbus_return_val_if_fail (str != NULL, NULL);
++
++  loader = _dbus_message_loader_new ();
++
++  if (loader == NULL)
++    return NULL;
++
++  _dbus_message_loader_get_buffer (loader, &buffer);
++  _dbus_string_append_len (buffer, str, len);
++  _dbus_message_loader_return_buffer (loader, buffer, len);
++
++  if (!_dbus_message_loader_queue_messages (loader))
++    goto fail_oom;
++
++  if (_dbus_message_loader_get_is_corrupted (loader))
++    goto fail_corrupt;
++
++  msg = _dbus_message_loader_pop_message (loader);
++
++  if (!msg)
++    goto fail_oom;
++
++  _dbus_message_loader_unref (loader);
++  return msg;
++
++ fail_corrupt:
++  dbus_set_error (error, DBUS_ERROR_INVALID_ARGS, "Message is corrupted");
++  _dbus_message_loader_unref (loader);
++  return NULL;
++
++ fail_oom:
++  _DBUS_SET_OOM (error);
++  _dbus_message_loader_unref (loader);
++  return NULL;
++}
++
+ /** @} */
+ 
+ /* tests in dbus-message-util.c */
+diff -ur dbus-1.0.2.orig/dbus/dbus-message.h dbus-1.0.2/dbus/dbus-message.h
+--- dbus-1.0.2.orig/dbus/dbus-message.h	2006-12-11 19:21:14.000000000 +0000
++++ dbus-1.0.2/dbus/dbus-message.h	2007-04-05 19:07:39.000000000 +0100
+@@ -210,8 +210,15 @@
+ void*       dbus_message_get_data           (DBusMessage      *message,
+                                              dbus_int32_t      slot);
+ 
+-int dbus_message_type_from_string (const char *type_str);
+-const char * dbus_message_type_to_string (int type);
++int         dbus_message_type_from_string (const char *type_str);
++const char* dbus_message_type_to_string   (int type);
++
++dbus_bool_t  dbus_message_marshal   (DBusMessage  *msg,
++                                     char        **marshalled_data_p,
++                                     int          *len_p);
++DBusMessage* dbus_message_demarshal (const char *str,
++                                     int         len,
++                                     DBusError  *error);
+ 
+ /** @} */
+ 
+diff -ur dbus-1.0.2.orig/dbus/dbus-message-util.c dbus-1.0.2/dbus/dbus-message-util.c
+--- dbus-1.0.2.orig/dbus/dbus-message-util.c	2006-12-11 19:21:06.000000000 +0000
++++ dbus-1.0.2/dbus/dbus-message-util.c	2007-04-05 19:52:41.000000000 +0100
+@@ -1222,6 +1222,46 @@
+ 
+   verify_test_message (message);
+ 
++    {
++      /* Marshal and demarshal the message. */
++
++      DBusMessage *message2;
++      DBusError error;
++      char *marshalled = NULL;
++      int len = 0;
++
++      dbus_error_init (&error);
++
++      if (!dbus_message_marshal (message, &marshalled, &len))
++        _dbus_assert_not_reached ("failed to marshal message");
++
++      _dbus_assert (len != 0);
++      _dbus_assert (marshalled != NULL);
++
++      message2 = dbus_message_demarshal (marshalled, len, &error);
++
++      _dbus_assert (message2 != NULL);
++      _dbus_assert (!dbus_error_is_set (&error));
++      verify_test_message (message2);
++
++      dbus_message_unref (message2);
++      dbus_free (marshalled);
++
++      /* Demarshal invalid message. */
++
++      message2 = dbus_message_demarshal ("invalid", 7, &error);
++      _dbus_assert (message2 == NULL);
++      _dbus_assert (dbus_error_is_set (&error));
++      dbus_error_free (&error);
++
++      /* Demarshal invalid (empty) message. */
++
++      message2 = dbus_message_demarshal ("", 0, &error);
++      _dbus_assert (message2 == NULL);
++      _dbus_assert (dbus_error_is_set (&error));
++      dbus_error_free (&error);
++    }
++
+   dbus_message_unref (message);
+   _dbus_message_loader_unref (loader);
+ 
diff --git a/sjhbuild/modulesets/patches/libjingle_ignore_invalid_sockets.patch b/sjhbuild/modulesets/patches/libjingle_ignore_invalid_sockets.patch
new file mode 100644
index 0000000..30af0a5
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libjingle_ignore_invalid_sockets.patch
@@ -0,0 +1,21 @@
+diff -rN -up old-libjingle/talk/base/physicalsocketserver.cc new-libjingle/talk/base/physicalsocketserver.cc
+--- old-libjingle/talk/base/physicalsocketserver.cc     2007-05-01 17:02:49.000000000 +0100
++++ new-libjingle/talk/base/physicalsocketserver.cc     2007-05-01 17:02:49.000000000 +0100
+@@ -885,6 +885,8 @@ bool PhysicalSocketServer::Wait(int cmsW
+         if (!process_io && (pdispatcher != signal_wakeup_))
+           continue;
+         int fd = pdispatcher->GetDescriptor();
++        if (fd == INVALID_SOCKET)
++          continue;
+         if (fd > fdmax)
+           fdmax = fd;
+         uint32 ff = pdispatcher->GetRequestedEvents();
+@@ -919,6 +921,8 @@ bool PhysicalSocketServer::Wait(int cmsW
+       for (unsigned i = 0; i < dispatchers_.size(); i++) {
+         Dispatcher *pdispatcher = dispatchers_[i];
+         int fd = pdispatcher->GetDescriptor();
++        if (fd == INVALID_SOCKET)
++          continue;
+         uint32 ff = 0;
+         if (FD_ISSET(fd, &fdsRead)) {
+           FD_CLR(fd, &fdsRead);
diff --git a/sjhbuild/modulesets/patches/libjingle_send_assert.patch b/sjhbuild/modulesets/patches/libjingle_send_assert.patch
new file mode 100644
index 0000000..9d3a7d3
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libjingle_send_assert.patch
@@ -0,0 +1,17 @@
+diff -Nur libjingle0.3-0.3.11/talk/p2p/base/p2psocket.cc libjingle0.3-0.3.11.new/talk/p2p/base/p2psocket.cc
+--- libjingle0.3-0.3.11/talk/p2p/base/p2psocket.cc	2007-04-25 16:45:58.000000000 +0100
++++ libjingle0.3-0.3.11.new/talk/p2p/base/p2psocket.cc	2007-05-01 16:53:55.000000000 +0100
+@@ -477,8 +477,12 @@
+   }
+   int sent = best_connection_->Send(data, len);
+   if (sent <= 0) {
+-    assert(sent < 0);
+     error_ = best_connection_->GetError();
++
++    if (error_ == EWOULDBLOCK) {
++      // This means the best_connection_ is not writable, let's resort
++      RequestSort();
++    }
+   }
+   return sent;
+ }
diff --git a/sjhbuild/modulesets/patches/libjingle_tcp_wouldblock.patch b/sjhbuild/modulesets/patches/libjingle_tcp_wouldblock.patch
new file mode 100644
index 0000000..a89e0a7
--- /dev/null
+++ b/sjhbuild/modulesets/patches/libjingle_tcp_wouldblock.patch
@@ -0,0 +1,15 @@
+diff -Nur libjingle0.3-0.3.11/talk/p2p/base/tcpport.cc libjingle0.3-0.3.11.new/talk/p2p/base/tcpport.cc
+--- libjingle0.3-0.3.11/talk/p2p/base/tcpport.cc	2007-04-25 16:45:58.000000000 +0100
++++ libjingle0.3-0.3.11.new/talk/p2p/base/tcpport.cc	2007-05-01 17:19:29.000000000 +0100
+@@ -211,7 +211,10 @@
+ 
+ int TCPConnection::Send(const void* data, size_t size) {
+   if (write_state() != STATE_WRITABLE)
+-    return 0;
++  {
++    error_ = EWOULDBLOCK;
++    return SOCKET_ERROR;
++  }
+ 
+   int sent = socket_->Send(data, size);
+   if (sent < 0) {
diff --git a/sjhbuild/modulesets/patches/poppler-build.patch b/sjhbuild/modulesets/patches/poppler-build.patch
new file mode 100644
index 0000000..d0591ea
--- /dev/null
+++ b/sjhbuild/modulesets/patches/poppler-build.patch
@@ -0,0 +1,11 @@
+--- poppler-glib.pc.in.old	2007-11-02 10:34:39.000000000 +0100
++++ poppler-glib.pc.in	2007-11-02 10:35:21.000000000 +0100
+@@ -6,7 +6,7 @@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @VERSION@
+-Requires: @PC_REQUIRES@ gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@
++Requires: @PC_REQUIRES@ gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@ poppler
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
diff --git a/sjhbuild/modulesets/patches/pygobject-pylint.patch b/sjhbuild/modulesets/patches/pygobject-pylint.patch
new file mode 100644
index 0000000..8e4ff97
--- /dev/null
+++ b/sjhbuild/modulesets/patches/pygobject-pylint.patch
@@ -0,0 +1,16 @@
+Index: gobject/gobjectmodule.c
+===================================================================
+--- gobject/gobjectmodule.c     (revision 776)
++++ gobject/gobjectmodule.c     (working copy)
+@@ -3611,7 +3611,10 @@
+         return;
+     descr = PyObject_New(PyObject, &PyGPropsDescr_Type);
+     PyDict_SetItemString(PyGObject_Type.tp_dict, "props", descr);
+-
++    PyDict_SetItemString(PyGObject_Type.tp_dict, "__module__",
++                        o=PyString_FromString("gobject._gobject"));
++    Py_DECREF(o);
++ 
+     REGISTER_GTYPE(d, PyGInterface_Type, "GInterface", G_TYPE_INTERFACE);
+     PyDict_SetItemString(PyGInterface_Type.tp_dict, "__doc__",
+                         pyg_object_descr_doc_get());
diff --git a/sjhbuild/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch b/sjhbuild/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch
new file mode 100644
index 0000000..bb16883
--- /dev/null
+++ b/sjhbuild/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch
@@ -0,0 +1,14 @@
+diff -rN -u old-telepathy-gabble-rainbow/src/tube-stream.c new-telepathy-gabble-rainbow/src/tube-stream.c
+--- old-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
++++ new-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
+@@ -650,6 +650,9 @@
+               "Error binding socket: %s", g_strerror (errno));
+           return FALSE;
+         }
++
++      /* Everyone can use the socket */
++      chmod (addr.sun_path, 0777);
+     }
+   else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
+     {
+
diff --git a/sjhbuild/modulesets/patches/telepathy-gabble-olpc-no-dbus-uid-check.patch b/sjhbuild/modulesets/patches/telepathy-gabble-olpc-no-dbus-uid-check.patch
new file mode 100644
index 0000000..f7e69f0
--- /dev/null
+++ b/sjhbuild/modulesets/patches/telepathy-gabble-olpc-no-dbus-uid-check.patch
@@ -0,0 +1,32 @@
+diff -rN -up old-telepathy-gabble/src/tube-dbus.c new-telepathy-gabble/src/tube-dbus.c
+--- old-telepathy-gabble/src/tube-dbus.c	2007-11-15 13:39:37.923570564 -0500
++++ new-telepathy-gabble/src/tube-dbus.c	2007-11-15 13:39:37.923570564 -0500
+@@ -216,6 +216,14 @@ out:
+   return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ 
++static dbus_bool_t
++allow_all_connections (DBusConnection *conn,
++                       unsigned long uid,
++                       void *data)
++{
++  return TRUE;
++}
++
+ static void
+ new_connection_cb (DBusServer *server,
+                    DBusConnection *conn,
+@@ -243,6 +251,13 @@
+   dbus_connection_ref (conn);
+   dbus_connection_setup_with_g_main (conn, NULL);
+   dbus_connection_add_filter (conn, filter_cb, tube, NULL);
++
++  /* OLPC have a security system making applications running under
++   * a different uid than Gabble. So we have to explicitely allow connections
++   * from all uid. */
++  dbus_connection_set_unix_user_function (conn, allow_all_connections,
++      NULL, NULL);
++
+   priv->dbus_conn = conn;
+ 
+   /* We may have received messages to deliver before the local connection is
diff --git a/sjhbuild/modulesets/patches/telepathy-salut-chmod-unix-socket.patch b/sjhbuild/modulesets/patches/telepathy-salut-chmod-unix-socket.patch
new file mode 100644
index 0000000..b6ba1b0
--- /dev/null
+++ b/sjhbuild/modulesets/patches/telepathy-salut-chmod-unix-socket.patch
@@ -0,0 +1,15 @@
+diff --git a/src/tube-stream.c b/src/tube-stream.c
+index 290bde6..bbc69a2 100644
+--- a/src/tube-stream.c
++++ b/src/tube-stream.c
+@@ -736,6 +736,10 @@ tube_stream_open (SalutTubeStream *self,
+           g_free (path);
+           return FALSE;
+         }
++
++      /* Everyone can use the socket */
++      chmod (path, 0777);
++
+       g_free (path);
+     }
+   else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
diff --git a/sjhbuild/modulesets/patches/telepathy-salut-olpc-no-dbus-uid-check.patch b/sjhbuild/modulesets/patches/telepathy-salut-olpc-no-dbus-uid-check.patch
new file mode 100644
index 0000000..d876cd8
--- /dev/null
+++ b/sjhbuild/modulesets/patches/telepathy-salut-olpc-no-dbus-uid-check.patch
@@ -0,0 +1,33 @@
+diff -rN -up old-telepathy-salut/src/tube-dbus.c new-telepathy-salut/src/tube-dbus.c
+--- old-telepathy-salut/src/tube-dbus.c	2007-11-15 13:33:51.902677010 -0500
++++ new-telepathy-salut/src/tube-dbus.c	2007-11-15 13:33:51.902677010 -0500
+@@ -252,6 +252,14 @@ out:
+   return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ 
++static dbus_bool_t
++allow_all_connections (DBusConnection *conn,
++                       unsigned long uid,
++                       void *data)
++{
++  return TRUE;
++}
++
+ static void
+ new_connection_cb (DBusServer *server,
+                    DBusConnection *conn,
+@@ -270,6 +278,13 @@ new_connection_cb (DBusServer *server,
+   dbus_connection_ref (conn);
+   dbus_connection_setup_with_g_main (conn, NULL);
+   dbus_connection_add_filter (conn, filter_cb, tube, NULL);
++
++  /* OLPC have a security system making applications running under
++   * a different uid than Salut. So we have to explicitely allow connections
++   * from all uid. */
++  dbus_connection_set_unix_user_function (conn, allow_all_connections,
++      NULL, NULL);
++
+   priv->dbus_conn = conn;
+ }
+ 
+
diff --git a/sjhbuild/modulesets/patches/xulrunner-no-native-theme.patch b/sjhbuild/modulesets/patches/xulrunner-no-native-theme.patch
new file mode 100644
index 0000000..85c2fdf
--- /dev/null
+++ b/sjhbuild/modulesets/patches/xulrunner-no-native-theme.patch
@@ -0,0 +1,99 @@
+--- /tmp/nsNativeThemeGTK.cpp	2008-04-07 12:17:50.000000000 +0200
++++ widget/src/gtk2/nsNativeThemeGTK.cpp	2008-04-07 12:26:13.000000000 +0200
+@@ -1273,93 +1273,19 @@
+     return PR_FALSE;
+ 
+   switch (aWidgetType) {
+-  case NS_THEME_BUTTON:
+-  case NS_THEME_BUTTON_FOCUS:
+-  case NS_THEME_RADIO:
+-  case NS_THEME_RADIO_SMALL:
+-  case NS_THEME_CHECKBOX:
+-  case NS_THEME_CHECKBOX_SMALL:
+-  case NS_THEME_TOOLBOX: // N/A
+-  case NS_THEME_TOOLBAR:
+-  case NS_THEME_TOOLBAR_BUTTON:
+-  case NS_THEME_TOOLBAR_DUAL_BUTTON: // so we can override the border with 0
+-  case NS_THEME_TOOLBAR_BUTTON_DROPDOWN:
+-  case NS_THEME_TOOLBAR_SEPARATOR:
+-  case NS_THEME_TOOLBAR_GRIPPER:
+-  case NS_THEME_STATUSBAR:
+-  case NS_THEME_STATUSBAR_PANEL:
+-  case NS_THEME_STATUSBAR_RESIZER_PANEL:
+-  case NS_THEME_RESIZER:
+-  case NS_THEME_LISTBOX:
+-    // case NS_THEME_LISTBOX_LISTITEM:
+-  case NS_THEME_TREEVIEW:
+-    // case NS_THEME_TREEVIEW_TREEITEM:
+-  case NS_THEME_TREEVIEW_TWISTY:
+-    // case NS_THEME_TREEVIEW_LINE:
+-    // case NS_THEME_TREEVIEW_HEADER:
+-  case NS_THEME_TREEVIEW_HEADER_CELL:
+-  case NS_THEME_TREEVIEW_HEADER_SORTARROW:
+-  case NS_THEME_TREEVIEW_TWISTY_OPEN:
+-    case NS_THEME_PROGRESSBAR:
+-    case NS_THEME_PROGRESSBAR_CHUNK:
+-    case NS_THEME_PROGRESSBAR_VERTICAL:
+-    case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
+-    case NS_THEME_TAB:
+-    // case NS_THEME_TAB_PANEL:
+-    case NS_THEME_TAB_PANELS:
+-    case NS_THEME_TAB_SCROLLARROW_BACK:
+-    case NS_THEME_TAB_SCROLLARROW_FORWARD:
+-  case NS_THEME_TOOLTIP:
+-  case NS_THEME_SPINNER:
+-  case NS_THEME_SPINNER_UP_BUTTON:
+-  case NS_THEME_SPINNER_DOWN_BUTTON:
+-  case NS_THEME_SPINNER_TEXTFIELD:
+-    // case NS_THEME_SCROLLBAR:  (n/a for gtk)
+-    // case NS_THEME_SCROLLBAR_SMALL: (n/a for gtk)
+   case NS_THEME_SCROLLBAR_BUTTON_UP:
+   case NS_THEME_SCROLLBAR_BUTTON_DOWN:
+   case NS_THEME_SCROLLBAR_BUTTON_LEFT:
+-  case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
+   case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
+   case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
+   case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
+   case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
+-    // case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL:  (n/a for gtk)
+-    // case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL:  (n/a for gtk)
+-  case NS_THEME_TEXTFIELD:
+-  case NS_THEME_TEXTFIELD_MULTILINE:
+-    // case NS_THEME_TEXTFIELD_CARET:
+-  case NS_THEME_DROPDOWN_TEXTFIELD:
+-  case NS_THEME_SCALE_HORIZONTAL:
+-  case NS_THEME_SCALE_THUMB_HORIZONTAL:
+-  case NS_THEME_SCALE_VERTICAL:
+-  case NS_THEME_SCALE_THUMB_VERTICAL:
+-    // case NS_THEME_SCALE_THUMB_START:
+-    // case NS_THEME_SCALE_THUMB_END:
+-    // case NS_THEME_SCALE_TICK:
+-  case NS_THEME_CHECKBOX_CONTAINER:
+-  case NS_THEME_RADIO_CONTAINER:
+-  case NS_THEME_CHECKBOX_LABEL:
+-  case NS_THEME_RADIO_LABEL:
+-  case NS_THEME_MENUBAR:
+-  case NS_THEME_MENUPOPUP:
+-  case NS_THEME_MENUITEM:
+-  case NS_THEME_MENUARROW:
+-  case NS_THEME_MENUSEPARATOR:
+-  case NS_THEME_CHECKMENUITEM:
+-  case NS_THEME_RADIOMENUITEM:
+-  case NS_THEME_SPLITTER:
+-  case NS_THEME_WINDOW:
+-  case NS_THEME_DIALOG:
+-  case NS_THEME_DROPDOWN:
+-  case NS_THEME_DROPDOWN_TEXT:
+     return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
+-
+-  case NS_THEME_DROPDOWN_BUTTON:
++    //case NS_THEME_DROPDOWN_BUTTON:
+     // "Native" dropdown buttons cause padding and margin problems, but only
+     // in HTML so allow them in XUL.
+-    return (!aFrame || aFrame->GetContent()->IsNodeOfType(nsINode::eXUL)) &&
+-           !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
++    //return (!aFrame || aFrame->GetContent()->IsNodeOfType(nsINode::eXUL)) &&
++    //       !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
+ 
+   }
+ 
diff --git a/sjhbuild/modulesets/patches/xulrunner-perms.patch b/sjhbuild/modulesets/patches/xulrunner-perms.patch
new file mode 100644
index 0000000..524d5aa
--- /dev/null
+++ b/sjhbuild/modulesets/patches/xulrunner-perms.patch
@@ -0,0 +1,220 @@
+--- modules/plugin/base/src/nsPluginHostImpl.cpp.old	2007-12-22 14:00:39.000000000 +0100
++++ modules/plugin/base/src/nsPluginHostImpl.cpp	2007-12-22 14:01:41.000000000 +0100
+@@ -5573,7 +5573,7 @@
+   if (NS_FAILED(rv))
+     return rv;
+ 
+-  rv = localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0600, &fd);
++  rv = localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0660, &fd);
+   if (NS_FAILED(rv))
+     return rv;
+ 
+--- modules/libpref/src/nsPrefService.cpp.old	2007-12-22 14:02:25.000000000 +0100
++++ modules/libpref/src/nsPrefService.cpp	2007-12-22 14:02:42.000000000 +0100
+@@ -501,7 +501,7 @@
+   rv = NS_NewSafeLocalFileOutputStream(getter_AddRefs(outStreamSink),
+                                        aFile,
+                                        -1,
+-                                       0600);
++                                       0660);
+   if (NS_FAILED(rv)) 
+       return rv;
+   rv = NS_NewBufferedOutputStream(getter_AddRefs(outStream), outStreamSink, 4096);
+--- security/nss/lib/softoken/legacydb/keydb.c.old	2007-12-22 14:03:34.000000000 +0100
++++ security/nss/lib/softoken/legacydb/keydb.c	2007-12-22 14:04:12.000000000 +0100
+@@ -832,7 +832,7 @@
+     if (appName) {
+ 	handle->db = rdbopen( appName, prefix, "key", NO_CREATE, &status);
+     } else {
+-	handle->db = dbopen( dbname, NO_CREATE, 0600, DB_HASH, 0 );
++	handle->db = dbopen( dbname, NO_CREATE, 0660, DB_HASH, 0 );
+     }
+     /* if create fails then we lose */
+     if ( handle->db == NULL ) {
+@@ -853,7 +853,7 @@
+      */
+     if (appName) {
+         NSSLOWKEYDBHandle *updateHandle;
+-	updatedb = dbopen( dbname, NO_RDONLY, 0600, DB_HASH, 0 );
++	updatedb = dbopen( dbname, NO_RDONLY, 0660, DB_HASH, 0 );
+ 	if (!updatedb) {
+ 	    goto noupdate;
+ 	}
+@@ -892,7 +892,7 @@
+      */
+     updname = (*namecb)(cbarg, 2);
+     if ( updname != NULL ) {
+-	handle->updatedb = dbopen( updname, NO_RDONLY, 0600, DB_HASH, 0 );
++	handle->updatedb = dbopen( updname, NO_RDONLY, 0660, DB_HASH, 0 );
+         PORT_Free( updname );
+ 
+ 	if ( handle->updatedb ) {
+@@ -940,7 +940,7 @@
+     if (appName) {
+ 	db = rdbopen( appName, prefix, "key", openflags, NULL);
+     } else {
+-	db = dbopen( dbname, openflags, 0600, DB_HASH, 0 );
++	db = dbopen( dbname, openflags, 0660, DB_HASH, 0 );
+     }
+ 
+     return db;
+@@ -2080,7 +2080,7 @@
+ 	handle->db= 
+ 	    rdbopen(handle->appname, handle->dbname, "key", NO_CREATE, NULL);
+     } else {
+-	handle->db = dbopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
++	handle->db = dbopen( handle->dbname, NO_CREATE, 0660, DB_HASH, 0 );
+     }
+     if (handle->db == NULL) {
+ 	/* set an error code */
+--- security/nss/lib/softoken/legacydb/pcertdb.c.old	2007-12-22 14:04:53.000000000 +0100
++++ security/nss/lib/softoken/legacydb/pcertdb.c	2007-12-22 14:05:33.000000000 +0100
+@@ -3998,7 +3998,7 @@
+ 
+     tmpname = (* namecb)(cbarg, version);	/* get v6 db name */
+     if ( tmpname ) {
+-	updatedb = dbopen( tmpname, NO_RDONLY, 0600, DB_HASH, 0 );
++	updatedb = dbopen( tmpname, NO_RDONLY, 0660, DB_HASH, 0 );
+ 	PORT_Free(tmpname);
+     }
+     return updatedb;
+@@ -4016,7 +4016,7 @@
+     if (appName) {
+ 	handle->permCertDB=rdbopen( appName, prefix, "cert", NO_CREATE, &status);
+     } else {
+-	handle->permCertDB=dbsopen(certdbname, NO_CREATE, 0600, DB_HASH, 0);
++	handle->permCertDB=dbsopen(certdbname, NO_CREATE, 0660, DB_HASH, 0);
+     }
+ 
+     /* if create fails then we lose */
+@@ -4042,7 +4042,7 @@
+     /* rv must already be Success here because of previous if statement */
+     /* try to upgrade old db here */
+     if (appName &&
+-       (updatedb = dbsopen(certdbname, NO_RDONLY, 0600, DB_HASH, 0)) != NULL) {
++       (updatedb = dbsopen(certdbname, NO_RDONLY, 0660, DB_HASH, 0)) != NULL) {
+ 	rv = UpdateV8DB(handle, updatedb);
+     } else if ((updatedb = nsslowcert_openolddb(namecb,cbarg,7)) != NULL) {
+ 	rv = UpdateV7DB(handle, updatedb);
+@@ -4107,7 +4107,7 @@
+     if (appName) {
+ 	handle->permCertDB = rdbopen( appName, prefix, "cert", openflags, NULL);
+     } else {
+-	handle->permCertDB = dbsopen( certdbname, openflags, 0600, DB_HASH, 0 );
++	handle->permCertDB = dbsopen( certdbname, openflags, 0660, DB_HASH, 0 );
+     }
+ 
+     /* check for correct version number */
+--- security/nss/lib/softoken/legacydb/pk11db.c	2007-06-13 02:24:57.000000000 +0200
++++ security/nss/lib/softoken/legacydb/pk11db.c.old	2007-12-22 14:06:55.000000000 +0100
+@@ -543,7 +543,7 @@
+ 		PORT_Free(secname);
+ 		return pkcs11db;
+ 	    }
+-	    updatedb = dbopen(dbName, NO_RDONLY, 0600, DB_HASH, 0);
++	    updatedb = dbopen(dbName, NO_RDONLY, 0660, DB_HASH, 0);
+ 	    if (updatedb) {
+ 		db_Copy(pkcs11db,updatedb);
+ 		(*updatedb->close)(updatedb);
+@@ -558,14 +558,14 @@
+     }
+   
+     /* I'm sure we should do more checks here sometime... */
+-    pkcs11db = dbopen(dbName, readOnly ? NO_RDONLY : NO_RDWR, 0600, DB_HASH, 0);
++    pkcs11db = dbopen(dbName, readOnly ? NO_RDONLY : NO_RDWR, 0660, DB_HASH, 0);
+ 
+     /* didn't exist? create it */
+     if (pkcs11db == NULL) {
+ 	 if (readOnly) 
+ 	     return NULL;
+ 
+-	 pkcs11db = dbopen( dbName, NO_CREATE, 0600, DB_HASH, 0 );
++	 pkcs11db = dbopen( dbName, NO_CREATE, 0660, DB_HASH, 0 );
+ 	 if (pkcs11db) 
+ 	     (* pkcs11db->sync)(pkcs11db, 0);
+     }
+--- netwerk/cache/src/nsDiskCacheBlockFile.cpp.old	2007-12-22 14:11:31.000000000 +0100
++++ netwerk/cache/src/nsDiskCacheBlockFile.cpp	2007-12-22 14:11:45.000000000 +0100
+@@ -59,7 +59,7 @@
+     mBlockSize = blockSize;
+     
+     // open the file - restricted to user, the data could be confidential
+-    nsresult rv = blockFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00600, &mFD);
++    nsresult rv = blockFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00660, &mFD);
+     if (NS_FAILED(rv))  return rv;  // unable to open or create file
+     
+     // allocate bit map buffer
+--- netwerk/cache/src/nsDiskCacheDeviceSQL.cpp.old	2007-12-22 14:37:48.000000000 +0100
++++ netwerk/cache/src/nsDiskCacheDeviceSQL.cpp	2007-12-22 14:38:21.000000000 +0100
+@@ -374,7 +374,7 @@
+       rv = file->SetNativeLeafName(nsDependentCString(leaf));
+       if (NS_FAILED(rv))
+         return nsnull;
+-      rv = file->Create(nsIFile::NORMAL_FILE_TYPE, 00600);
++      rv = file->Create(nsIFile::NORMAL_FILE_TYPE, 00660);
+       if (NS_FAILED(rv) && rv != NS_ERROR_FILE_ALREADY_EXISTS)
+         return nsnull;
+       if (NS_SUCCEEDED(rv))
+@@ -1105,7 +1105,7 @@
+   nsCOMPtr<nsIOutputStream> out;
+   NS_NewLocalFileOutputStream(getter_AddRefs(out), binding->mDataFile,
+                               PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
+-                              00600);
++                              00660);
+   if (!out)
+     return NS_ERROR_UNEXPECTED;
+ 
+--- netwerk/cache/src/nsDiskCacheStreams.cpp.old	2007-12-22 14:37:28.000000000 +0100
++++ netwerk/cache/src/nsDiskCacheStreams.cpp	2007-12-22 14:38:06.000000000 +0100
+@@ -666,8 +666,8 @@
+                                                   getter_AddRefs(mLocalFile));
+     if (NS_FAILED(rv))  return rv;
+     
+-    // create PRFileDesc for input stream - the 00600 is just for consistency
+-    rv = mLocalFile->OpenNSPRFileDesc(flags, 00600, fd);
++    // create PRFileDesc for input stream - the 00660 is just for consistency
++    rv = mLocalFile->OpenNSPRFileDesc(flags, 00660, fd);
+     if (NS_FAILED(rv))  return rv;  // unable to open file
+ 
+     return NS_OK;
+--- /tmp/sqlite3.c	2008-04-07 14:31:32.000000000 +0200
++++ db/sqlite3/src/sqlite3.c	2008-04-07 14:32:49.000000000 +0200
+@@ -15768,7 +15768,7 @@
+ ** Default permissions when creating a new file
+ */
+ #ifndef SQLITE_DEFAULT_FILE_PERMISSIONS
+-# define SQLITE_DEFAULT_FILE_PERMISSIONS 0644
++# define SQLITE_DEFAULT_FILE_PERMISSIONS 0664
+ #endif
+ 
+ /* 
+--- /tmp/nsDiskCacheMap.cpp	2008-04-07 14:27:11.000000000 +0200
++++ netwerk/cache/src/nsDiskCacheMap.cpp	2008-04-07 14:28:43.000000000 +0200
+@@ -78,7 +78,7 @@
+     NS_ENSURE_SUCCESS(rv, rv);
+ 
+     // open the file - restricted to user, the data could be confidential
+-    rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00600, &mMapFD);
++    rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00660, &mMapFD);
+     NS_ENSURE_SUCCESS(rv, NS_ERROR_FILE_CORRUPTED);
+ 
+     PRBool cacheFilesExist = CacheFilesExist();
+@@ -676,7 +676,7 @@
+ 
+         PRFileDesc * fd = nsnull;
+         // open the file - restricted to user, the data could be confidential
+-        rv = file->OpenNSPRFileDesc(PR_RDONLY, 00600, &fd);
++        rv = file->OpenNSPRFileDesc(PR_RDONLY, 00660, &fd);
+         NS_ENSURE_SUCCESS(rv, nsnull);
+         
+         PRInt32 fileSize = PR_Available(fd);
+@@ -826,8 +826,8 @@
+         // open the file
+         PRFileDesc * fd;
+         // open the file - restricted to user, the data could be confidential
+-        rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_TRUNCATE | PR_CREATE_FILE, 00600, &fd);
++        rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_TRUNCATE | PR_CREATE_FILE, 00660, &fd);
+         NS_ENSURE_SUCCESS(rv, rv);
+ 
+         // write the file
+ 
diff --git a/sjhbuild/modulesets/patches/xulrunner-xds.patch b/sjhbuild/modulesets/patches/xulrunner-xds.patch
new file mode 100644
index 0000000..cb7eb28
--- /dev/null
+++ b/sjhbuild/modulesets/patches/xulrunner-xds.patch
@@ -0,0 +1,310 @@
+Index: content/base/src/nsContentAreaDragDrop.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/content/base/src/nsContentAreaDragDrop.cpp,v
+retrieving revision 1.69
+diff -u -r1.69 nsContentAreaDragDrop.cpp
+--- content/base/src/nsContentAreaDragDrop.cpp	8 Jul 2007 07:08:07 -0000	1.69
++++ content/base/src/nsContentAreaDragDrop.cpp	16 Sep 2007 20:11:36 -0000
+@@ -855,9 +855,6 @@
+     return NS_ERROR_NO_INTERFACE;
+   }
+ 
+-  rv = inDestFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+   // we rely on the fact that the WPB is refcounted by the channel etc,
+   // so we don't keep a ref to it. It will die when finished.
+   nsCOMPtr<nsIWebBrowserPersist> persist =
+@@ -921,21 +918,32 @@
+     if (targetFilename.IsEmpty())
+       return NS_ERROR_FAILURE;
+ 
+-    // get the target directory from the kFilePromiseDirectoryMime
+-    // flavor
+-    nsCOMPtr<nsISupports> dirPrimitive;
++    nsCOMPtr<nsIFile> file;
++
++    nsCOMPtr<nsISupports> fullpathPrimitive;
+     dataSize = 0;
+-    aTransferable->GetTransferData(kFilePromiseDirectoryMime,
+-                                   getter_AddRefs(dirPrimitive), &dataSize);
+-    nsCOMPtr<nsILocalFile> destDirectory = do_QueryInterface(dirPrimitive);
+-    if (!destDirectory)
+-      return NS_ERROR_FAILURE;
++    aTransferable->GetTransferData(kFilePromiseFullpathMime,
++                                   getter_AddRefs(fullpathPrimitive), &dataSize);
++    file = do_QueryInterface(fullpathPrimitive);
++    if (!file) {
++      // get the target directory from the kFilePromiseDirectoryMime
++      // flavor
++      nsCOMPtr<nsISupports> dirPrimitive;
++      dataSize = 0;
++      aTransferable->GetTransferData(kFilePromiseDirectoryMime,
++                                     getter_AddRefs(dirPrimitive), &dataSize);
++      nsCOMPtr<nsILocalFile> destDirectory = do_QueryInterface(dirPrimitive);
++      if (!destDirectory)
++        return NS_ERROR_FAILURE;
+ 
+-    nsCOMPtr<nsIFile> file;
+-    rv = destDirectory->Clone(getter_AddRefs(file));
+-    NS_ENSURE_SUCCESS(rv, rv);
++      rv = destDirectory->Clone(getter_AddRefs(file));
++      NS_ENSURE_SUCCESS(rv, rv);
+ 
+-    file->Append(targetFilename);
++      file->Append(targetFilename);
++
++      rv = file->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
++      NS_ENSURE_SUCCESS(rv, rv);
++    }
+ 
+     // now save the file
+     rv = SaveURIToFile(sourceURLString, file);
+Index: widget/public/nsITransferable.idl
+===================================================================
+RCS file: /cvsroot/mozilla/widget/public/nsITransferable.idl,v
+retrieving revision 1.12
+diff -u -r1.12 nsITransferable.idl
+--- widget/public/nsITransferable.idl	12 Jun 2006 17:30:22 -0000	1.12
++++ widget/public/nsITransferable.idl	16 Sep 2007 20:12:24 -0000
+@@ -70,6 +70,7 @@
+ #define kFilePromiseMime            "application/x-moz-file-promise"
+ // a synthetic flavor, put into the transferable once we know the destination directory of a file drag
+ #define kFilePromiseDirectoryMime   "application/x-moz-file-promise-dir"
++#define kFilePromiseFullpathMime    "application/x-moz-file-promise-fullpath"
+ 
+ %}
+ 
+Index: widget/src/gtk2/nsDragService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
+retrieving revision 1.19
+diff -u -r1.19 nsDragService.cpp
+--- widget/src/gtk2/nsDragService.cpp	7 Aug 2007 15:18:38 -0000	1.19
++++ widget/src/gtk2/nsDragService.cpp	16 Sep 2007 20:12:26 -0000
+@@ -60,11 +60,16 @@
+ #include "gfxASurface.h"
+ #include "nsImageToPixbuf.h"
+ 
++#define XDS_ATOM   gdk_atom_intern("XdndDirectSave0", FALSE)
++#define TEXT_ATOM  gdk_atom_intern("text/plain", FALSE)
++#define MAX_XDS_ATOM_VAL_LEN 4096
++
+ static PRLogModuleInfo *sDragLm = NULL;
+ 
+ static const char gMimeListType[] = "application/x-moz-internal-item-list";
+ static const char gMozUrlType[] = "_NETSCAPE_URL";
+ static const char gTextUriListType[] = "text/uri-list";
++static const char gDirectSaveType[] = "XdndDirectSave0";
+ 
+ static void
+ invisibleSourceDragEnd(GtkWidget        *aWidget,
+@@ -79,6 +84,11 @@
+                            guint32           aTime,
+                            gpointer          aData);
+ 
++void
++invisibleSourceDragBegin(GtkWidget        *aWidget,
++                         GdkDragContext   *aContext,
++                         gpointer          aData);
++
+ nsDragService::nsDragService()
+ {
+     // We have to destroy the hidden widget before the event loop stops
+@@ -96,6 +106,8 @@
+     // from our drag source
+     gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_data_get",
+                        GTK_SIGNAL_FUNC(invisibleSourceDragDataGet), this);
++    gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_begin",
++                       GTK_SIGNAL_FUNC(invisibleSourceDragBegin), this);
+     gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_end",
+                        GTK_SIGNAL_FUNC(invisibleSourceDragEnd), this);
+ 
+@@ -989,6 +1001,21 @@
+                                    id %ld\n", urlTarget->target, urlAtom));
+                             targetArray.AppendElement(urlTarget);
+                         }
++                        // XdndDirectSave
++                        if (strcmp(flavorStr, kFilePromiseMime) == 0) {
++                            // get the atom for the unicode string
++                            GdkAtom directsaveAtom =
++                              gdk_atom_intern(gDirectSaveType, FALSE);
++                            GtkTargetEntry *directsaveTarget =
++                             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
++                            directsaveTarget->target = g_strdup(gDirectSaveType);
++                            directsaveTarget->flags = 0;
++                            directsaveTarget->info = GPOINTER_TO_UINT(directsaveAtom);
++                            PR_LOG(sDragLm, PR_LOG_DEBUG,
++                                   ("automatically adding target %s with \
++                                   id %ld\n", directsaveTarget->target, directsaveAtom));
++                            targetArray.AppendElement(directsaveTarget);
++                        }
+                     }
+                 } // foreach flavor in item
+             } // if valid flavor list
+@@ -1024,6 +1051,52 @@
+ }
+ 
+ void
++nsDragService::SourceBeginDrag(GdkDragContext *context)
++{
++    nsCOMPtr<nsISupports> genericItem;
++    mSourceDataItems->GetElementAt(0, getter_AddRefs(genericItem));
++    nsCOMPtr<nsITransferable> transferable(do_QueryInterface(genericItem));
++
++    nsresult rv;
++    nsCOMPtr<nsISupportsArray> flavorList;
++    rv = transferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
++    NS_ENSURE_SUCCESS(rv,);
++
++    PRUint32 cnt;
++    flavorList->Count(&cnt);
++
++    for (PRUint32 i = 0; i < cnt; ++i) {
++        nsCOMPtr<nsISupports> genericWrapper;
++        flavorList->GetElementAt(i, getter_AddRefs(genericWrapper));
++        nsCOMPtr<nsISupportsCString> currentFlavor(do_QueryInterface(genericWrapper, &rv));
++        NS_ENSURE_SUCCESS(rv,);
++
++        nsXPIDLCString flavorStr;
++        currentFlavor->ToString(getter_Copies(flavorStr));
++        if (strcmp(flavorStr, kFilePromiseDestFilename) == 0) {
++            PRUint32 dataSize = 0;
++            nsCOMPtr<nsISupports> tmp;
++            transferable->GetTransferData(kFilePromiseDestFilename,
++                                          getter_AddRefs(tmp), &dataSize);
++            nsCOMPtr<nsISupportsString> fileName = do_QueryInterface(tmp, &rv);
++            NS_ENSURE_SUCCESS(rv,);
++
++            nsAutoString filenameStr;
++            fileName->GetData(filenameStr);
++
++            nsCString filenameCStr;
++            CopyUTF16toUTF8(filenameStr, filenameCStr);
++
++            gdk_property_change(context->source_window,
++                                XDS_ATOM, TEXT_ATOM,
++                                8, GDK_PROP_MODE_REPLACE,
++                                (guchar *)filenameCStr.get(),
++                                filenameCStr.Length());
++        }
++    }
++}
++
++void
+ nsDragService::SourceEndDrag(void)
+ {
+     // this just releases the list of data items that we provide
+@@ -1106,6 +1179,8 @@
+                              guint32           aTime)
+ {
+     PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SourceDataGet"));
++    nsresult rv;
++
+     GdkAtom atom = (GdkAtom)aInfo;
+     nsXPIDLCString mimeFlavor;
+     gchar *typeName = 0;
+@@ -1134,6 +1209,7 @@
+         // we can convert it.
+         PRBool needToDoConversionToPlainText = PR_FALSE;
+         const char* actualFlavor = mimeFlavor;
++printf("%s\n", actualFlavor);
+         if (strcmp(mimeFlavor,kTextMime) == 0) {
+             actualFlavor = kUnicodeMime;
+             needToDoConversionToPlainText = PR_TRUE;
+@@ -1150,16 +1226,60 @@
+             actualFlavor = gTextUriListType;
+             needToDoConversionToPlainText = PR_TRUE;
+         }
++        else if (strcmp(mimeFlavor, gTextUriListType) == 0) {
++            actualFlavor = gTextUriListType;
++            needToDoConversionToPlainText = PR_TRUE;
++        }
++        else if (strcmp(mimeFlavor, gDirectSaveType) == 0) {
++            guchar *propText;
++            gint propLen;
++
++            if (!gdk_property_get(aContext->source_window,
++                                 XDS_ATOM, TEXT_ATOM,
++                                 0, MAX_XDS_ATOM_VAL_LEN,
++                                 FALSE, NULL, NULL, &propLen,
++                                 (unsigned char **)&propText))
++                return;
++
++            /* Zero-terminate the string */
++            propText = (guchar *)g_realloc(propText, propLen + 1);
++            propText[propLen] = '\0';
++
++            char *fullpath;
++            fullpath = g_filename_from_uri((gchar *)propText, NULL, NULL);
++            if (!fullpath)
++                return;
++
++            nsCOMPtr<nsILocalFile> file;
++            rv = NS_NewNativeLocalFile(nsDependentCString(fullpath),
++                                       PR_FALSE, getter_AddRefs(file));
++            NS_ENSURE_SUCCESS(rv,);
++
++            item->SetTransferData(kFilePromiseFullpathMime, file,
++                                  sizeof(nsILocalFile*));
++
++            actualFlavor = kFilePromiseMime;
++
++            g_free(fullpath);
++        }
+         else
+             actualFlavor = mimeFlavor;
+ 
+         PRUint32 tmpDataLen = 0;
+         void    *tmpData = NULL;
+-        nsresult rv;
+         nsCOMPtr<nsISupports> data;
+         rv = item->GetTransferData(actualFlavor,
+                                    getter_AddRefs(data),
+                                    &tmpDataLen);
++
++        if (strcmp(actualFlavor, kFilePromiseMime) == 0) {
++            const char *result = NS_SUCCEEDED(rv) ? "S" : "F";
++            gtk_selection_data_set(aSelectionData,
++                                   aSelectionData->target,
++                                   8, (guchar *)result, 1);
++            return;
++        }
++
+         if (NS_SUCCEEDED(rv)) {
+             nsPrimitiveHelpers::CreateDataFromPrimitive (actualFlavor, data,
+                                                          &tmpData, tmpDataLen);
+@@ -1224,6 +1344,18 @@
+ 
+ /* static */
+ void
++invisibleSourceDragBegin(GtkWidget        *aWidget,
++                         GdkDragContext   *aContext,
++                         gpointer          aData)
++{
++    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleDragBegin"));
++    nsDragService *dragService = (nsDragService *)aData;
++    // The drag has ended.  Release the hostages!
++    dragService->SourceBeginDrag(aContext);
++}
++
++/* static */
++void
+ invisibleSourceDragEnd(GtkWidget        *aWidget,
+                        GdkDragContext   *aContext,
+                        gpointer          aData)
+Index: widget/src/gtk2/nsDragService.h
+===================================================================
+RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.h,v
+retrieving revision 1.4
+diff -u -r1.4 nsDragService.h
+--- widget/src/gtk2/nsDragService.h	12 Apr 2007 04:37:40 -0000	1.4
++++ widget/src/gtk2/nsDragService.h	16 Sep 2007 20:12:26 -0000
+@@ -101,6 +101,7 @@
+     // This is called when the drag started with the invisible widget
+     // finishes.  It's called from within the drag service code but from
+     // a callback - it needs to be public.
++    void           SourceBeginDrag(GdkDragContext *context);
+     void           SourceEndDrag(void);
+     void           SourceDataGet(GtkWidget        *widget,
+                                  GdkDragContext   *context,
diff --git a/sjhbuild/modulesets/sugar.modules b/sjhbuild/modulesets/sugar.modules
new file mode 100644
index 0000000..cc18300
--- /dev/null
+++ b/sjhbuild/modulesets/sugar.modules
@@ -0,0 +1,18 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <include href="tools.modules"/>
+  <include href="glucose-external.modules"/>
+  <include href="glucose.modules"/>
+  <include href="fructose.modules"/>
+  <include href="extra.modules"/>
+  <include href="extra-activities.modules"/>
+  <metamodule id="meta-sugar">
+    <dependencies>
+      <dep package="meta-tools"/>
+      <dep package="meta-glucose"/>
+      <dep package="meta-fructose"/> 
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/sjhbuild/modulesets/tools.modules b/sjhbuild/modulesets/tools.modules
new file mode 100644
index 0000000..3600f6b
--- /dev/null
+++ b/sjhbuild/modulesets/tools.modules
@@ -0,0 +1,34 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="tarball" name="logilab"
+      href="ftp://ftp.logilab.fr/pub/"/>
+  <distutils id="pylint">
+    <branch repo="logilab" version="0.15.2"
+            module="pylint/pylint-0.15.2.tar.gz"
+            size="208732" md5sum="98f3917fc4d0855c8f0eab9761533835"/>
+    <dependencies>
+      <dep package="logilab-astng"/>
+    </dependencies>
+  </distutils>
+  <distutils id="logilab-common">
+    <branch repo="logilab" version="0.35.2"
+            module="common/logilab-common-0.35.2.tar.gz"
+            size="162108" md5sum="88391b08f48812361eb594f05d7d930b"/>
+  </distutils>
+  <distutils id="logilab-astng">
+    <branch repo="logilab" version="0.17.3"
+            module="astng/logilab-astng-0.17.3.tar.gz"
+            size="66296" md5sum="d36cd2e705760ee16df375ff83963f5c">
+      <patch file="astng-ignoredatadesc.patch" strip="0"/>
+    </branch>
+    <dependencies>
+      <dep package="logilab-common"/>
+    </dependencies>
+  </distutils>
+  <metamodule id="meta-tools">
+    <dependencies>
+      <dep package="pylint"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/sjhbuild/sysdeps.py b/sjhbuild/sysdeps.py
new file mode 100644
index 0000000..b398cff
--- /dev/null
+++ b/sjhbuild/sysdeps.py
@@ -0,0 +1,91 @@
+import os
+import subprocess
+
+from xml.dom import minidom
+
+scripts_dir = os.path.dirname(__file__)
+base_dir = os.path.dirname(scripts_dir)
+
+def get_distribution():
+    if 'SJH_DISTRIBUTION' in os.environ:
+        return os.environ['SJH_DISTRIBUTION'].split('-')
+
+    # Fedora
+    if os.path.exists('/etc/fedora-release'):
+        name = 'fedora'
+
+        f = open('/etc/fedora-release')
+        full_name = f.read()
+        f.close()
+
+        if 'Rawhide' in full_name:
+            version = 'rawhide'
+        else:
+            version = full_name.split(' ')[2]
+
+        return name, version
+
+    # Debian and Ubuntu
+    try:
+        out, err = subprocess.Popen(['lsb_release', '-is'],
+                                    stdout=subprocess.PIPE).communicate()
+        name = out.strip().lower()
+
+        out, err = subprocess.Popen(['lsb_release', '-rs'],
+                                    stdout=subprocess.PIPE).communicate()
+        version = out.strip()
+
+        if name == 'debian' and version == 'testing':
+            version = 'unstable'
+
+        return name, version
+    except OSError:
+        pass
+
+    return None, None
+
+def check_package(package):
+    name, version = get_distribution()
+    if name == 'fedora':
+        ret = subprocess.call(['rpm', '--quiet', '-q', package])
+        return ret == 0
+    elif name in ['ubuntu', 'debian']:
+        cmd = ["dpkg-query", "-f='${status}'", "-W", package]
+        out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()
+        return out.find('install ok installed') != -1
+
+    return None
+
+def parse_dependencies():
+    name, version = get_distribution()
+    if name is None or version is None:
+        return None
+
+    filename = os.path.join(base_dir, 'config', 'sysdeps',
+                            '%s-%s.xml' % (name, version))
+
+    if not os.path.exists(filename):
+        return None
+
+    return minidom.parse(filename)
+
+def get_packages():
+    document = parse_dependencies()
+    if document is None:
+        return []
+
+    packages = []
+    root = document.childNodes[0]
+
+    for node in root.childNodes:
+        if node.nodeType == node.ELEMENT_NODE:
+            if node.nodeName == 'package':
+                name = node.getAttribute('name')
+                if node.hasAttribute('source'):
+                    source = node.getAttribute('source')
+                else:
+                    source = None
+
+                packages.append((name, source))
+
+    return packages
diff --git a/sjhbuild/sysdeps/debian-unstable.xml b/sjhbuild/sysdeps/debian-unstable.xml
new file mode 100644
index 0000000..0971c58
--- /dev/null
+++ b/sjhbuild/sysdeps/debian-unstable.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="libwnck-dev"/>
+  <package name="python-cairo-dev"/>
+  <package name="automake1.9"/>
+  <package name="libpoppler-glib-dev"/>
+  <package name="libtool"/>
+  <package name="libsqlite3-dev"/>
+  <package name="libnspr4-dev"/>
+  <package name="docbook-xsl"/>
+  <package name="intltool"/>
+  <package name="librsvg2-dev"/>
+  <package name="gtk-doc-tools"/>
+  <package name="libglade2-dev"/>
+  <package name="icon-naming-utils"/>
+  <package name="cdbs"/>
+  <package name="devscripts"/>
+  <package name="quilt"/>
+  <package name="patchutils"/>
+  <package name="python-dev"/>
+  <package name="python-central"/>
+  <package name="debhelper"/>
+  <package name="libglib2.0-dev"/>
+  <package name="python-gtk2-dev"/>
+  <package name="gettext"/>
+  <package name="shared-mime-info"/>
+  <package name="python-empy"/>
+  <package name="libgconf2-dev"/>
+  <package name="libgsf-1-dev"/>
+  <package name="libenchant-dev"/>
+  <package name="libwv-dev"/>
+  <package name="libboost-dev"/>
+  <package name="libgnomevfs2-dev"/>
+  <package name="gcc"/>
+  <package name="g++"/>
+  <package name="libgtk2.0-dev"/>
+  <package name="python-gtk2-dev"/>
+  <package name="libcroco3-dev"/>
+  <package name="libfribidi-dev"/>
+  <package name="libxt-dev"/>
+  <package name="gnome-doc-utils"/>
+  <package name="libexpat1-dev"/>
+  <package name="gettext"/>
+  <package name="zlib1g-dev"/>
+  <package name="gnome-common"/>
+  <package name="python-numpy"/>
+  <package name="xserver-xephyr"/>
+  <package name="make"/>
+  <package name="librsvg2-dev"/>
+  <package name="python-cjson"/>
+  <package name="subversion"/>
+  <package name="libglade2-dev"/>
+  <package name="libidl-dev"/>
+  <package name="libgconf2-dev"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="x11-utils"/>
+  <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
+  <package name="python-dbus"/>
+  <package name="libdbus-1-dev"/>
+  <package name="libdbus-glib-1-dev"/>
+  <package name="libloudmouth1-dev"/>
+  <package name="libavahi-gobject-dev"/>
+  <package name="python-avahi"/>
+  <package name="libsoup2.2-dev"/>
+  <package name="libpoppler-glib-dev"/>
+</dependencies>
diff --git a/sjhbuild/sysdeps/fedora-10.xml b/sjhbuild/sysdeps/fedora-10.xml
new file mode 100644
index 0000000..190db8c
--- /dev/null
+++ b/sjhbuild/sysdeps/fedora-10.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="intltool"/>
+  <package name="libtool"/>
+  <package name="python-devel"/>
+  <package name="gcc"/>
+  <package name="gcc-c++"/>
+  <package name="gtk2-devel"/>
+  <package name="pygtk2-devel"/>
+  <package name="libcroco-devel"/>
+  <package name="libgsf-devel"/>
+  <package name="enchant-devel"/>
+  <package name="fribidi-devel"/>
+  <package name="boost-devel"/>
+  <package name="libXt-devel"/>
+  <package name="gnome-doc-utils"/>
+  <package name="expat-devel"/>
+  <package name="gettext-devel"/>
+  <package name="wv-devel"/>
+  <package name="zlib-devel"/>
+  <package name="gnome-common"/>
+  <package name="numpy"/>
+  <package name="gnome-python2-libwnck"/>
+  <package name="xorg-x11-server-Xephyr"/>
+  <package name="make"/>
+  <package name="gnome-python2-rsvg"/>
+  <package name="python-cjson"/>
+  <package name="subversion"/>
+  <package name="GConf2-devel"/>
+  <package name="libglade2-devel"/>
+  <package name="popt-devel"/>
+  <package name="gnome-vfs2-devel"/>
+  <package name="librsvg2-devel"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="xorg-x11-utils"/>
+  <package name="dejavu-fonts"/>
+  <package name="gstreamer-python"/>
+  <package name="icon-slicer"/>
+  <package name="pygtksourceview"/>
+  <package name="alsa-lib-devel"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xapian-core-libs"/>
+  <package name="gnome-python2-gconf"/>
+  <package name="dbus-python"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="loudmouth-devel"/>
+  <package name="libsoup22-devel"/>
+  <package name="poppler-glib-devel"/>
+
+  <package name="avahi"
+           source="avahi"/>
+  <package name="avahi-gobject-devel"
+           source="avahi"/>
+  <package name="avahi-tools"
+           source="avahi"/>
+  <package name="pygobject2"
+           source="pygobject"/>
+  <package name="libmatchbox"
+           source="libmatchbox"/>
+  <package name="matchbox-window-manager"
+           source="matchbox-window-manager"/>
+  <package name="xulrunner-python-devel"
+           source="xulrunner"/>
+  <package name="xulrunner-python"
+           source="xulrunner"/>
+  <package name="xulrunner-devel-unstable"
+           source="xulrunner"/>
+  <package name="hippo-canvas-python"
+           source="hippo-canvas"/>
+  <package name="pyabiword"
+           source="pyabiword"/>
+  <package name="libabiword"
+           source="abiword"/>
+  <package name="libabiword"
+           source="abiword-plugins"/>
+  <package name="hippo-canvas-python"
+           source="hippo-canvas"/>
+</dependencies>
diff --git a/sjhbuild/sysdeps/fedora-rawhide.xml b/sjhbuild/sysdeps/fedora-rawhide.xml
new file mode 100644
index 0000000..190db8c
--- /dev/null
+++ b/sjhbuild/sysdeps/fedora-rawhide.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="intltool"/>
+  <package name="libtool"/>
+  <package name="python-devel"/>
+  <package name="gcc"/>
+  <package name="gcc-c++"/>
+  <package name="gtk2-devel"/>
+  <package name="pygtk2-devel"/>
+  <package name="libcroco-devel"/>
+  <package name="libgsf-devel"/>
+  <package name="enchant-devel"/>
+  <package name="fribidi-devel"/>
+  <package name="boost-devel"/>
+  <package name="libXt-devel"/>
+  <package name="gnome-doc-utils"/>
+  <package name="expat-devel"/>
+  <package name="gettext-devel"/>
+  <package name="wv-devel"/>
+  <package name="zlib-devel"/>
+  <package name="gnome-common"/>
+  <package name="numpy"/>
+  <package name="gnome-python2-libwnck"/>
+  <package name="xorg-x11-server-Xephyr"/>
+  <package name="make"/>
+  <package name="gnome-python2-rsvg"/>
+  <package name="python-cjson"/>
+  <package name="subversion"/>
+  <package name="GConf2-devel"/>
+  <package name="libglade2-devel"/>
+  <package name="popt-devel"/>
+  <package name="gnome-vfs2-devel"/>
+  <package name="librsvg2-devel"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="xorg-x11-utils"/>
+  <package name="dejavu-fonts"/>
+  <package name="gstreamer-python"/>
+  <package name="icon-slicer"/>
+  <package name="pygtksourceview"/>
+  <package name="alsa-lib-devel"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xapian-core-libs"/>
+  <package name="gnome-python2-gconf"/>
+  <package name="dbus-python"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="loudmouth-devel"/>
+  <package name="libsoup22-devel"/>
+  <package name="poppler-glib-devel"/>
+
+  <package name="avahi"
+           source="avahi"/>
+  <package name="avahi-gobject-devel"
+           source="avahi"/>
+  <package name="avahi-tools"
+           source="avahi"/>
+  <package name="pygobject2"
+           source="pygobject"/>
+  <package name="libmatchbox"
+           source="libmatchbox"/>
+  <package name="matchbox-window-manager"
+           source="matchbox-window-manager"/>
+  <package name="xulrunner-python-devel"
+           source="xulrunner"/>
+  <package name="xulrunner-python"
+           source="xulrunner"/>
+  <package name="xulrunner-devel-unstable"
+           source="xulrunner"/>
+  <package name="hippo-canvas-python"
+           source="hippo-canvas"/>
+  <package name="pyabiword"
+           source="pyabiword"/>
+  <package name="libabiword"
+           source="abiword"/>
+  <package name="libabiword"
+           source="abiword-plugins"/>
+  <package name="hippo-canvas-python"
+           source="hippo-canvas"/>
+</dependencies>
diff --git a/sjhbuild/sysdeps/olpc-4.xml b/sjhbuild/sysdeps/olpc-4.xml
new file mode 100644
index 0000000..5afef5a
--- /dev/null
+++ b/sjhbuild/sysdeps/olpc-4.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="intltool"/>
+  <package name="libtool"/>
+  <package name="python-devel"/>
+  <package name="gcc"/>
+  <package name="gcc-c++"/>
+  <package name="gtk2-devel"/>
+  <package name="pygtk2-devel"/>
+  <package name="libcroco-devel"/>
+  <package name="libgsf-devel"/>
+  <package name="enchant-devel"/>
+  <package name="fribidi-devel"/>
+  <package name="boost-devel"/>
+  <package name="libXt-devel"/>
+  <package name="gnome-doc-utils"/>
+  <package name="expat-devel"/>
+  <package name="gettext-devel"/>
+  <package name="wv-devel"/>
+  <package name="zlib-devel"/>
+  <package name="gnome-common"/>
+  <package name="numpy"/>
+  <package name="gnome-python2-libwnck"/>
+  <package name="xorg-x11-server-Xephyr"/>
+  <package name="make"/>
+  <package name="gnome-python2-rsvg"/>
+  <package name="python-cjson"/>
+  <package name="subversion"/>
+  <package name="GConf2-devel"/>
+  <package name="libglade2-devel"/>
+  <package name="popt-devel"/>
+  <package name="gnome-vfs2-devel"/>
+  <package name="librsvg2-devel"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="xorg-x11-utils"/>
+  <package name="dejavu-fonts"/>
+  <package name="gstreamer-python"/>
+  <package name="icon-slicer"/>
+  <package name="pygtksourceview"/>
+  <package name="alsa-lib-devel"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xapian-core-libs"/>
+  <package name="gnome-python2-gconf"/>
+  <package name="dbus-python"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="loudmouth-devel"/>
+  <package name="libsoup22-devel"/>
+
+  <package name="avahi"
+           source="avahi"/>
+  <package name="avahi-gobject-devel"
+           source="avahi"/>
+  <package name="avahi-tools"
+           source="avahi"/>
+  <package name="pygobject2"
+           source="pygobject"/>
+  <package name="libmatchbox"
+           source="libmatchbox"/>
+  <package name="matchbox-window-manager"
+           source="matchbox-window-manager"/>
+  <package name="xulrunner-python-devel"
+           source="xulrunner"/>
+  <package name="xulrunner-python"
+           source="xulrunner"/>
+  <package name="xulrunner-devel-unstable"
+           source="xulrunner"/>
+  <package name="hippo-canvas-python"
+           source="hippo-canvas"/>
+  <package name="pyabiword"
+           source="pyabiword"/>
+  <package name="libabiword"
+           source="abiword"/>
+  <package name="libabiword"
+           source="abiword-plugins"/>
+  <package name="hippo-canvas-python"
+           source="hippo-canvas"/>
+</dependencies>
diff --git a/sjhbuild/sysdeps/ubuntu-8.10.xml b/sjhbuild/sysdeps/ubuntu-8.10.xml
new file mode 100644
index 0000000..e9e9380
--- /dev/null
+++ b/sjhbuild/sysdeps/ubuntu-8.10.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="intltool"/>
+  <package name="libtool"/>
+  <package name="python-dev"/>
+  <package name="gcc"/>
+  <package name="g++"/>
+  <package name="libgtk2.0-dev"/>
+  <package name="python-gtk2-dev"/>
+  <package name="python-cairo-dev"/>
+  <package name="libcroco3-dev"/>
+  <package name="libgsf-1-dev"/>
+  <package name="libenchant-dev"/>
+  <package name="libfribidi-dev"/>
+  <package name="libboost-dev"/>
+  <package name="libxt-dev"/>
+  <package name="gnome-doc-utils"/>
+  <package name="libexpat1-dev"/>
+  <package name="gettext"/>
+  <package name="libwv-dev"/>
+  <package name="zlib1g-dev"/>
+  <package name="gnome-common"/>
+  <package name="python-numpy"/>
+  <package name="libwnck-dev"/>
+  <package name="xserver-xephyr"/>
+  <package name="make"/>
+  <package name="librsvg2-dev"/>
+  <package name="python-cjson"/>
+  <package name="automake1.9"/>
+  <package name="subversion"/>
+  <package name="gtk-doc-tools"/>
+  <package name="libglade2-dev"/>
+  <package name="libidl-dev"/>
+  <package name="libgconf2-dev"/>
+  <package name="libgnomevfs2-dev"/>
+  <package name="libpoppler-glib-dev"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="x11-utils"/>
+  <package name="icon-slicer"/>
+  <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
+  <package name="python-gtksourceview2"/>
+  <package name="python-gconf"/>
+  <package name="python-dbus"/>
+  <package name="libdbus-1-dev"/>
+  <package name="libdbus-glib-1-dev"/>
+  <package name="libloudmouth1-dev"/>
+  <package name="libavahi-gobject-dev"/>
+  <package name="python-avahi"/>
+  <package name="libpoppler-dev"/>
+  <package name="python-gobject"
+	   source="pygobject"/>
+  <package name="xulrunner-1.9-dev"
+	   source="xulrunner"/>
+  <package name="libsoup2.2-dev"/>
+  <package name="libglib2.0-dev"/>
+  <package name="libpoppler-glib-dev"/>
+</dependencies>