diff --git a/.gitignore b/.gitignore
index ccbb9b7d..c8ac9607 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 config.py
 repo/
+logs/
 built/
 build/
 build_*/
diff --git a/README b/README
index f10a9a3c..e3824d51 100644
--- a/README
+++ b/README
@@ -21,18 +21,27 @@ To be able to auto-build packages, you're going to need:
 
 *Linux
 *Python
-*A fully functional Android SDK with all SDK platforms and tools
-*The Android NDK
+*Android SDK with all SDK platforms (for all API versions) and tools
+*Android NDK
 *Ant
 *Ant Contrib Tasks (Debian package ant-contrib)
 *Maven (Debian package maven2)
 *JavaCC (Debian package javacc)
+*JDK (Debian package openjdk-6-jdk and openjdk-7-jdk)
 *VCS clients: svn, git, hg, bzr
 *A keystore for holding release keys. (Safe, secure and well backed up!)
 
 You then need to create a config.py (copy config.sample.py and follow the
 instructions) to specify the locations of some of these things.
 
+==Building Apps==
+
+Run
+
+  ./build.py -p goo.TeaTimer
+
+to test building apk files. They will be put in the repo directory.
+
 =MetaData=
 
 Information used by update.py to compile the public index comes from two
@@ -91,7 +100,11 @@ The type of repository - for automatic building from source. If this is not
 specified, automatic building is disabled for this application. Possible
 values are:
 
-  git, svn, hg, bzr
+  git, git-svn, svn, hg, bzr
+ 
+The git-svn option connects to an SVN repository, and you specify the URL in
+exactly the same way, but git is used as a back-end. This is preferable for
+performance reasons.
 
 ==Repo==
 
@@ -99,7 +112,7 @@ The repository location. Usually a git: or svn: URL.
 
 For a Subversion repo that requires authentication, you can precede the repo
 URL with username:password@ and those parameters will be passed as --username
-and --password to the SVN checkout command.
+and --password to the SVN checkout command. (Doesn't work for git-svn).
 
 ==Build Version==
 
@@ -125,9 +138,7 @@ configuration to the build. These are:
 
  subdir=<path>   - Specifies to build from a subdirectory of the checked out
                    source code. Normally this directory is changed to before
-                   building, but there is a special case for SVN repositories
-                   where the URL is specified with a * at the end. See the
-                   documentation for the Repo field for more information.
+                   building.
  bindir=<path>   - Normally the build output (apk) is expected to be in the
                    bin subdirectory below the ant build files. If the project
                    is configured to put it elsewhere, that can be specified
diff --git a/build.py b/build.py
index a7b09139..b69020b5 100755
--- a/build.py
+++ b/build.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # build.py - part of the FDroid server tools
-# Copyright (C) 2010-11, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -36,13 +36,14 @@ from common import VCSException
 #Read configuration...
 execfile('config.py')
 
-
 # Parse command line...
 parser = OptionParser()
 parser.add_option("-v", "--verbose", action="store_true", default=False,
                   help="Spew out even more information than normal")
 parser.add_option("-p", "--package", default=None,
                   help="Build only the specified package")
+parser.add_option("-s", "--stop", action="store_true", default=False,
+                  help="Make the build stop on exceptions")
 (options, args) = parser.parse_args()
 
 # Get all apps...
@@ -51,6 +52,11 @@ apps = common.read_metadata(options.verbose)
 failed_apps = {}
 build_succeeded = []
 
+log_dir = 'logs'
+if not os.path.isdir(log_dir):
+    print "Creating log directory"
+    os.makedirs(log_dir)
+
 output_dir = 'repo'
 if not os.path.isdir(output_dir):
     print "Creating output directory"
@@ -68,13 +74,13 @@ if not os.path.isdir(build_dir):
 
 for app in apps:
 
-    if app['disabled']:
+    if app['Disabled']:
         print "Skipping %s: disabled" % app['id']
     elif not app['builds']:
         print "Skipping %s: no builds specified" % app['id']
 
-    if (app['disabled'] is None and app['repo'] != '' 
-            and app['repotype'] != '' and (options.package is None or
+    if (app['Disabled'] is None and app['Repo'] != '' 
+            and app['Repo Type'] != '' and (options.package is None or
             options.package == app['id']) and len(app['builds']) > 0):
 
         print "Processing " + app['id']
@@ -82,7 +88,7 @@ for app in apps:
         build_dir = 'build/' + app['id']
 
         # Set up vcs interface and make sure we have the latest code...
-        vcs = common.getvcs(app['repotype'], app['repo'], build_dir)
+        vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
 
         refreshed_source = False
 
@@ -102,233 +108,21 @@ for app in apps:
                 else:
                     print "..building version " + thisbuild['version']
 
-                    if not refreshed_source:
-                        vcs.refreshlocal()
-                        refreshed_source = True
-
-                    # Optionally, the actual app source can be in a subdirectory...
-                    if thisbuild.has_key('subdir'):
-                        root_dir = os.path.join(build_dir, thisbuild['subdir'])
-                    else:
-                        root_dir = build_dir
-
-                    # Get a working copy of the right revision...
-                    if options.verbose:
-                        print "Resetting repository to " + thisbuild['commit']
-                    vcs.reset(thisbuild['commit'])
-
-                    # Initialise submodules if requred...
-                    if thisbuild.get('submodules', 'no')  == 'yes':
-                        vcs.initsubmodules()
-
-                    # Generate (or update) the ant build file, build.xml...
-                    if (thisbuild.get('update', 'yes') == 'yes' and
-                        not thisbuild.has_key('maven')):
-                        parms = [os.path.join(sdk_path, 'tools', 'android'),
-                                'update', 'project', '-p', '.']
-                        parms.append('--subprojects')
-                        if thisbuild.has_key('target'):
-                            parms.append('-t')
-                            parms.append(thisbuild['target'])
-                        if subprocess.call(parms, cwd=root_dir) != 0:
-                            raise BuildException("Failed to update project")
-
-                    # If the app has ant set up to sign the release, we need to switch
-                    # that off, because we want the unsigned apk...
-                    for propfile in ('build.properties', 'default.properties'):
-                        if os.path.exists(os.path.join(root_dir, propfile)):
-                            if subprocess.call(['sed','-i','s/^key.store/#/',
-                                                propfile], cwd=root_dir) !=0:
-                                raise BuildException("Failed to amend %s" % propfile)
-
-                    # Update the local.properties file...
-                    locprops = os.path.join(root_dir, 'local.properties')
-                    if os.path.exists(locprops):
-                        f = open(locprops, 'r')
-                        props = f.read()
-                        f.close()
-                        # Fix old-fashioned 'sdk-location' by copying
-                        # from sdk.dir, if necessary...
-                        if thisbuild.get('oldsdkloc', 'no') == "yes":
-                            sdkloc = re.match(r".*^sdk.dir=(\S+)$.*", props,
-                                re.S|re.M).group(1)
-                            props += "\nsdk-location=" + sdkloc + "\n"
-                        # Add ndk location...
-                        props+= "\nndk.dir=" + ndk_path + "\n"
-                        # Add java.encoding if necessary...
-                        if thisbuild.has_key('encoding'):
-                            props += "\njava.encoding=" + thisbuild['encoding'] + "\n"
-                        f = open(locprops, 'w')
-                        f.write(props)
-                        f.close()
-
-                    # Insert version code and number into the manifest if necessary...
-                    if thisbuild.has_key('insertversion'):
-                        if subprocess.call(['sed','-i','s/' + thisbuild['insertversion'] +
-                            '/' + thisbuild['version'] +'/g',
-                            'AndroidManifest.xml'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend manifest")
-                    if thisbuild.has_key('insertvercode'):
-                        if subprocess.call(['sed','-i','s/' + thisbuild['insertvercode'] +
-                            '/' + thisbuild['vercode'] +'/g',
-                            'AndroidManifest.xml'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend manifest")
-
-                    # Delete unwanted file...
-                    if thisbuild.has_key('rm'):
-                        os.remove(os.path.join(build_dir, thisbuild['rm']))
-
-                    # Fix apostrophes translation files if necessary...
-                    if thisbuild.get('fixapos', 'no') == 'yes':
-                        for root, dirs, files in os.walk(os.path.join(root_dir,'res')):
-                            for filename in files:
-                                if filename.endswith('.xml'):
-                                    if subprocess.call(['sed','-i','s@' +
-                                        r"\([^\\]\)'@\1\\'" +
-                                        '@g',
-                                        os.path.join(root, filename)]) != 0:
-                                        raise BuildException("Failed to amend " + filename)
-
-                    # Fix translation files if necessary...
-                    if thisbuild.get('fixtrans', 'no') == 'yes':
-                        for root, dirs, files in os.walk(os.path.join(root_dir,'res')):
-                            for filename in files:
-                                if filename.endswith('.xml'):
-                                    f = open(os.path.join(root, filename))
-                                    changed = False
-                                    outlines = []
-                                    for line in f:
-                                        num = 1
-                                        index = 0
-                                        oldline = line
-                                        while True:
-                                            index = line.find("%", index)
-                                            if index == -1:
-                                                break
-                                            next = line[index+1:index+2]
-                                            if next == "s" or next == "d":
-                                                line = (line[:index+1] +
-                                                        str(num) + "$" +
-                                                        line[index+1:])
-                                                num += 1
-                                                index += 3
-                                            else:
-                                                index += 1
-                                        # We only want to insert the positional arguments
-                                        # when there is more than one argument...
-                                        if oldline != line:
-                                            if num > 2:
-                                                changed = True
-                                            else:
-                                                line = oldline
-                                        outlines.append(line)
-                                    f.close()
-                                    if changed:
-                                        f = open(os.path.join(root, filename), 'w')
-                                        f.writelines(outlines)
-                                        f.close()
-
-                    # Run a pre-build command if one is required...
-                    if thisbuild.has_key('prebuild'):
-                        if subprocess.call(thisbuild['prebuild'],
-                                cwd=root_dir, shell=True) != 0:
-                            raise BuildException("Error running pre-build command")
-
-                    # Apply patches if any
-                    if 'patch' in thisbuild:
-                        for patch in thisbuild['patch'].split(';'):
-                            print "Applying " + patch
-                            patch_path = os.path.join('metadata', app['id'], patch)
-                            if subprocess.call(['patch', '-p1',
-                                            '-i', os.path.abspath(patch_path)], cwd=build_dir) != 0:
-                                raise BuildException("Failed to apply patch %s" % patch_path)
-
-                    # Special case init functions for funambol...
-                    if thisbuild.get('initfun', 'no')  == "yes":
-
-                        if subprocess.call(['sed','-i','s@' +
-                            '<taskdef resource="net/sf/antcontrib/antcontrib.properties" />' +
-                            '@' +
-                            '<taskdef resource="net/sf/antcontrib/antcontrib.properties">' +
-                            '<classpath>' +
-                            '<pathelement location="/usr/share/java/ant-contrib.jar"/>' +
-                            '</classpath>' +
-                            '</taskdef>' +
-                            '@g',
-                            'build.xml'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend build.xml")
-
-                        if subprocess.call(['sed','-i','s@' +
-                            '\${user.home}/funambol/build/android/build.properties' +
-                            '@' +
-                            'build.properties' +
-                            '@g',
-                            'build.xml'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend build.xml")
-
-                        buildxml = os.path.join(root_dir, 'build.xml')
-                        f = open(buildxml, 'r')
-                        xml = f.read()
-                        f.close()
-                        xmlout = ""
-                        mode = 0
-                        for line in xml.splitlines():
-                            if mode == 0:
-                                if line.find("jarsigner") != -1:
-                                    mode = 1
-                                else:
-                                    xmlout += line + "\n"
-                            else:
-                                if line.find("/exec") != -1:
-                                    mode += 1
-                                    if mode == 3:
-                                        mode =0
-                        f = open(buildxml, 'w')
-                        f.write(xmlout)
-                        f.close()
-
-                        if subprocess.call(['sed','-i','s@' +
-                            'platforms/android-2.0' +
-                            '@' +
-                            'platforms/android-8' +
-                            '@g',
-                            'build.xml'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend build.xml")
-
-                        shutil.copyfile(
-                                os.path.join(root_dir, "build.properties.example"),
-                                os.path.join(root_dir, "build.properties"))
-
-                        if subprocess.call(['sed','-i','s@' +
-                            'javacchome=.*'+
-                            '@' +
-                            'javacchome=' + javacc_path +
-                            '@g',
-                            'build.properties'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend build.properties")
-
-                        if subprocess.call(['sed','-i','s@' +
-                            'sdk-folder=.*'+
-                            '@' +
-                            'sdk-folder=' + sdk_path +
-                            '@g',
-                            'build.properties'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend build.properties")
-
-                        if subprocess.call(['sed','-i','s@' +
-                            'android.sdk.version.*'+
-                            '@' +
-                            'android.sdk.version=2.0' +
-                            '@g',
-                            'build.properties'], cwd=root_dir) !=0:
-                            raise BuildException("Failed to amend build.properties")
-
+                    # Prepare the source code...
+                    root_dir = common.prepare_source(vcs, app, thisbuild,
+                            build_dir, sdk_path, ndk_path, javacc_path,
+                            not refreshed_source)
+                    refreshed_source = True
 
                     # Build the source tarball right before we build the release...
                     tarname = app['id'] + '_' + thisbuild['vercode'] + '_src'
                     tarball = tarfile.open(os.path.join(output_dir,
                         tarname + '.tar.gz'), "w:gz")
-                    tarball.add(build_dir, tarname)
+                    def tarexc(f):
+                        if f in ['.svn', '.git', '.hg', '.bzr']:
+                            return True
+                        return False
+                    tarball.add(build_dir, tarname, exclude=tarexc)
                     tarball.close()
 
                     # Build native stuff if required...
@@ -347,18 +141,17 @@ for app in apps:
                     if thisbuild.has_key('maven'):
                         p = subprocess.Popen(['mvn', 'clean', 'install',
                             '-Dandroid.sdk.path=' + sdk_path],
-                            cwd=root_dir, stdout=subprocess.PIPE)
+                            cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                     else:
                         if thisbuild.has_key('antcommand'):
                             antcommand = thisbuild['antcommand']
                         else:
                             antcommand = 'release'
                         p = subprocess.Popen(['ant', antcommand], cwd=root_dir, 
-                                stdout=subprocess.PIPE)
-                    output = p.communicate()[0]
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                    output, error = p.communicate()
                     if p.returncode != 0:
-                        print output
-                        raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']))
+                        raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip())
                     elif options.verbose:
                         print output
                     print "Build successful"
@@ -419,7 +212,8 @@ for app in apps:
                         raise BuildException(("Unexpected version/version code in output"
                                              "APK: %s / %s"
                                              "Expected: %s / %s")
-                                            ) % (version, str(vercode), thisbuild['version'], str(thisbuild['vercode']))
+                                             % (version, str(vercode), thisbuild['version'], str(thisbuild['vercode']))
+                                            )
 
                     # Copy the unsigned apk to our temp directory for further
                     # processing...
@@ -477,24 +271,35 @@ for app in apps:
                     if p.returncode != 0:
                         raise BuildException("Failed to align application")
                     os.remove(dest_unsigned)
+                    build_succeeded.append(app)
             except BuildException as be:
+                if options.stop:
+                    raise
                 print "Could not build app %s due to BuildException: %s" % (app['id'], be)
+                logfile = open(os.path.join(log_dir, app['id'] + '.log'), 'a+')
+                logfile.write(str(be))
+                logfile.close
                 failed_apps[app['id']] = be
             except VCSException as vcse:
+                if options.stop:
+                    raise
                 print "VCS error while building app %s: %s" % (app['id'], vcse)
                 failed_apps[app['id']] = vcse
             except Exception as e:
+                if options.stop:
+                    raise
                 print "Could not build app %s due to unknown error: %s" % (app['id'], e)
                 failed_apps[app['id']] = e
-            build_succeeded.append(app)
 
 for app in build_succeeded:
     print "success: %s" % (app['id'])
 
 for fa in failed_apps:
-    print "Build for app %s failed: %s" % (fa, failed_apps[fa])
+    print "Build for app %s failed:\n%s" % (fa, failed_apps[fa])
 
 print "Finished."
+if len(build_succeeded) > 0:
+    print str(len(build_succeeded)) + ' builds succeeded'
 if len(failed_apps) > 0:
-    print str(len(failed_apps)) + 'builds failed'
+    print str(len(failed_apps)) + ' builds failed'
 
diff --git a/checkmarket2.py b/checkupdates.py
similarity index 68%
rename from checkmarket2.py
rename to checkupdates.py
index 193a63fa..caa27c82 100755
--- a/checkmarket2.py
+++ b/checkupdates.py
@@ -31,20 +31,11 @@ import common
 execfile('config.py')
 
 
-# Parse command line...
-parser = OptionParser()
-parser.add_option("-v", "--verbose", action="store_true", default=False,
-                  help="Spew out even more information than normal")
-(options, args) = parser.parse_args()
-
-# Get all apps...
-apps = common.read_metadata(options.verbose)
-
-html_parser = HTMLParser.HTMLParser()
-
-for app in apps:
-
-    print "Processing " + app['id']
+# Check for a new version by looking at the Google market.
+# Returns (None, "a message") if this didn't work, or (version, vercode) for
+# the details of the current version.
+def check_market(app):
+    time.sleep(5)
     url = 'http://market.android.com/details?id=' + app['id']
     page = urllib.urlopen(url).read()
 
@@ -60,29 +51,49 @@ for app in apps:
         vercode = m.group(1)
 
     if not vercode:
-        print "...couldn't find version code"
-    elif not version:
-        print "...couldn't find version"
-    elif vercode == app['marketvercode'] and version == app['marketversion']:
+        return (None, "Couldn't find version code")
+    if not version:
+        return (None, "Couldn't find version")
+    return (version, vercode)
+
+
+
+
+# Parse command line...
+parser = OptionParser()
+parser.add_option("-v", "--verbose", action="store_true", default=False,
+                  help="Spew out even more information than normal")
+(options, args) = parser.parse_args()
+
+# Get all apps...
+apps = common.read_metadata(options.verbose)
+
+html_parser = HTMLParser.HTMLParser()
+
+for app in apps:
+
+    print "Processing " + app['id'] + '...'
+
+    mode = app['Update Check Mode']
+    if mode == 'Market':
+        (version, vercode) = check_market(app)
+    elif mode == 'None':
+        version = None
+        vercode = 'Checking disabled'
+    else:
+        version = None
+        vercode = 'Invalid update check method'
+
+    if not version:
+        print "..." + vercode
+    elif vercode == app['Market Version Code'] and version == app['Market Version']:
         print "...up to date"
     else:
         print '...updating to version:' + version + ' vercode:' + vercode
-        newdata = ''
+        app['Market Version'] = version
+        app['Market Version Code'] = vercode
         metafile = os.path.join('metadata', app['id'] + '.txt')
-        mf = open(metafile, 'r')
-        for line in mf:
-            if line.startswith('Market Version:'):
-                newdata += 'Market Version:' + version + '\n'
-            elif line.startswith('Market Version Code:'):
-                newdata += 'Market Version Code:' + vercode + '\n'
-            else:
-                newdata += line
-        mf.close()
-        mf = open(metafile, 'w')
-        mf.write(newdata)
-        mf.close()
-
-    time.sleep(5)
+        common.write_metadata(metafile, app)
 
 print "Finished."
 
diff --git a/common.py b/common.py
index a7d4d613..358ba824 100644
--- a/common.py
+++ b/common.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # common.py - part of the FDroid server tools
-# Copyright (C) 2010-11, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import glob, os, sys, re
+import shutil
 import subprocess
 
 
@@ -25,6 +26,8 @@ def getvcs(vcstype, remote, local):
         return vcs_git(remote, local)
     elif vcstype == 'svn':
         return vcs_svn(remote, local)
+    elif vcstype == 'git-svn':
+        return vcs_gitsvn(remote, local)
     elif vcstype == 'hg':
         return vcs_hg(remote,local)
     elif vcstype == 'bzr':
@@ -51,7 +54,7 @@ class vcs:
 
         self.remote = remote
         self.local = local
-                    
+
     # Refresh the local repository - i.e. get the latest code. This
     # works either by updating if a local copy already exists, or by
     # cloning from scratch if it doesn't.
@@ -82,11 +85,19 @@ class vcs:
 
 class vcs_git(vcs):
 
+    def checkrepo(self):
+        p = subprocess.Popen(['git', 'rev-parse', '--show-toplevel'],
+                stdout=subprocess.PIPE, cwd=self.local)
+        result = p.communicate()[0].rstrip()
+        if not result.endswith(self.local):
+            raise VCSException('Repository mismatch')
+
     def clone(self):
         if subprocess.call(['git', 'clone', self.remote, self.local]) != 0:
             raise VCSException("Git clone failed")
 
     def reset(self, rev=None):
+        self.checkrepo()
         if rev is None:
             rev = 'origin'
         if subprocess.call(['git', 'reset', '--hard', rev],
@@ -97,6 +108,7 @@ class vcs_git(vcs):
             raise VCSException("Git clean failed")
 
     def pull(self):
+        self.checkrepo()
         if subprocess.call(['git', 'pull', 'origin'],
                 cwd=self.local) != 0:
             raise VCSException("Git pull failed")
@@ -106,6 +118,7 @@ class vcs_git(vcs):
             raise VCSException("Git fetch failed")
 
     def initsubmodules(self):
+        self.checkrepo()
         if subprocess.call(['git', 'submodule', 'init'],
                 cwd=self.local) != 0:
             raise VCSException("Git submodule init failed")
@@ -114,6 +127,42 @@ class vcs_git(vcs):
             raise VCSException("Git submodule update failed")
 
 
+class vcs_gitsvn(vcs):
+
+    def checkrepo(self):
+        p = subprocess.Popen(['git', 'rev-parse', '--show-toplevel'],
+                stdout=subprocess.PIPE, cwd=self.local)
+        result = p.communicate()[0].rstrip()
+        if not result.endswith(self.local):
+            raise VCSException('Repository mismatch')
+
+    def clone(self):
+        if subprocess.call(['git', 'svn', 'clone', self.remote, self.local]) != 0:
+            raise VCSException("Git clone failed")
+
+    def reset(self, rev=None):
+        self.checkrepo()
+        if rev is None:
+            rev = 'HEAD'
+        else:
+            p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + rev],
+                cwd=self.local, stdout=subprocess.PIPE)
+            rev = p.communicate()[0].rstrip()
+            if p.returncode != 0:
+                raise VCSException("Failed to get git treeish from svn rev")
+        if subprocess.call(['git', 'reset', '--hard', rev],
+                cwd=self.local) != 0:
+            raise VCSException("Git reset failed")
+        if subprocess.call(['git', 'clean', '-dfx'],
+                cwd=self.local) != 0:
+            raise VCSException("Git clean failed")
+
+    def pull(self):
+        self.checkrepo()
+        if subprocess.call(['git', 'svn', 'rebase'],
+                cwd=self.local) != 0:
+            raise VCSException("Git svn rebase failed")
+
 
 class vcs_svn(vcs):
 
@@ -196,15 +245,54 @@ class vcs_bzr(vcs):
             raise VCSException("Bzr update failed")
 
 
+# Get the type expected for a given metadata field.
+def metafieldtype(name):
+    if name == 'Description':
+        return 'multiline'
+    if name == 'Requires Root':
+        return 'flag'
+    if name == 'Build Version':
+        return 'build'
+    if name == 'Use Built':
+        return 'obsolete'
+    return 'string'
 
+
+# Parse metadata for a single application.
+#
+#  'metafile' - the filename to read. The package id for the application comes
+#               from this filename.
+#
+# Returns a dictionary containing all the details of the application. There are
+# two major kinds of information in the dictionary. Keys beginning with capital
+# letters correspond directory to identically named keys in the metadata file.
+# Keys beginning with lower case letters are generated in one way or another,
+# and are not found verbatim in the metadata.
+#
+# Known keys not originating from the metadata are:
+#
+#  'id'               - the application's package ID
+#  'builds'           - a list of dictionaries containing build information
+#                       for each defined build
+#  'comments'         - a list of comments from the metadata file. Each is
+#                       a tuple of the form (field, comment) where field is
+#                       the name of the field it preceded in the metadata
+#                       file. Where field is None, the comment goes at the
+#                       end of the file. Alternatively, 'build:version' is
+#                       for a comment before a particular build version.
+#  'descriptionlines' - original lines of description as formatted in the
+#                       metadata file.
+#
 def parse_metadata(metafile, **kw):
 
-    def parse_buildline(value):
+    def parse_buildline(lines):
+        value = "".join(lines)
         parts = [p.replace("\\,", ",")
                  for p in re.split(r"(?<!\\),", value)]
         if len(parts) < 3:
             raise MetaDataException("Invalid build format: " + value + " in " + metafile.name)
         thisbuild = {}
+        thisbuild['origlines'] = lines
         thisbuild['version'] = parts[0]
         thisbuild['vercode'] = parts[1]
         thisbuild['commit'] = parts[2]
@@ -213,119 +301,189 @@ def parse_metadata(metafile, **kw):
             thisbuild[pk] = pv
         return thisbuild
 
+    def add_comments(key):
+        for comment in curcomments:
+            thisinfo['comments'].append((key, comment))
+        del curcomments[:]
+
     if not isinstance(metafile, file):
         metafile = open(metafile, "r")
     thisinfo = {}
     thisinfo['id'] = metafile.name[9:-4]
     if kw.get("verbose", False):
         print "Reading metadata for " + thisinfo['id']
-    thisinfo['description'] = ''
-    thisinfo['name'] = None
-    thisinfo['summary'] = ''
-    thisinfo['license'] = 'Unknown'
-    thisinfo['web'] = ''
-    thisinfo['source'] = ''
-    thisinfo['tracker'] = ''
-    thisinfo['donate'] = None
-    thisinfo['disabled'] = None
-    thisinfo['antifeatures'] = None
-    thisinfo['marketversion'] = ''
-    thisinfo['marketvercode'] = '0'
-    thisinfo['repotype'] = ''
-    thisinfo['repo'] = ''
+
+    # Defaults for fields that come from metadata...
+    thisinfo['Name'] = None
+    thisinfo['Category'] = 'None'
+    thisinfo['Description'] = []
+    thisinfo['Summary'] = ''
+    thisinfo['License'] = 'Unknown'
+    thisinfo['Web Site'] = ''
+    thisinfo['Source Code'] = ''
+    thisinfo['Issue Tracker'] = ''
+    thisinfo['Donate'] = None
+    thisinfo['Disabled'] = None
+    thisinfo['AntiFeatures'] = None
+    thisinfo['Update Check Mode'] = 'Market'
+    thisinfo['Market Version'] = ''
+    thisinfo['Market Version Code'] = '0'
+    thisinfo['Repo Type'] = ''
+    thisinfo['Repo'] = ''
+    thisinfo['Requires Root'] = False
+
+    # General defaults...
     thisinfo['builds'] = []
-    thisinfo['requiresroot'] = False
+    thisinfo['comments'] = []
+
     mode = 0
-    buildline = []
+    buildlines = []
+    curcomments = []
+
     for line in metafile:
         line = line.rstrip('\r\n')
-        if line.startswith("#"):
-            continue
         if mode == 0:
             if len(line) == 0:
                 continue
+            if line.startswith("#"):
+                curcomments.append(line)
+                continue
             index = line.find(':')
             if index == -1:
                 raise MetaDataException("Invalid metadata in " + metafile.name + " at: " + line)
             field = line[:index]
             value = line[index+1:]
-            if field == 'Description':
+
+
+            fieldtype = metafieldtype(field)
+            if fieldtype != 'build':
+                add_comments(field)
+            if fieldtype == 'multiline':
                 mode = 1
-            elif field == 'Name':
-                thisinfo['name'] = value
-            elif field == 'Summary':
-                thisinfo['summary'] = value
-            elif field == 'Source Code':
-                thisinfo['source'] = value
-            elif field == 'License':
-                thisinfo['license'] = value
-            elif field == 'Category':
-                thisinfo['category'] = value
-            elif field == 'Web Site':
-                thisinfo['web'] = value
-            elif field == 'Issue Tracker':
-                thisinfo['tracker'] = value
-            elif field == 'Donate':
-                thisinfo['donate'] = value
-            elif field == 'Disabled':
-                thisinfo['disabled'] = value
-            elif field == 'Use Built':
-                pass  #Ignoring this - will be removed
-            elif field == 'AntiFeatures':
-                parts = value.split(",")
-                for part in parts:
-                    if (part != "Ads" and
-                        part != "Tracking" and
-                        part != "NonFreeNet" and
-                        part != "NonFreeDep" and
-                        part != "NonFreeAdd"):
-                        raise MetaDataException("Unrecognised antifeature '" + part + "' in " \
-                            + metafile.name)
-                thisinfo['antifeatures'] = value
-            elif field == 'Market Version':
-                thisinfo['marketversion'] = value
-            elif field == 'Market Version Code':
-                thisinfo['marketvercode'] = value
-            elif field == 'Repo Type':
-                thisinfo['repotype'] = value
-            elif field == 'Repo':
-                thisinfo['repo'] = value
-            elif field == 'Build Version':
+                thisinfo[field] = []
+                if len(value) > 0:
+                    raise MetaDataException("Unexpected text on same line as " + field + " in " + metafile.name)
+            elif fieldtype == 'string':
+                thisinfo[field] = value
+            elif fieldtype == 'flag':
+                if value == 'Yes':
+                    thisinfo[field] = True
+                elif value == 'No':
+                    thisinfo[field] = False
+                else:
+                    raise MetaDataException("Expected Yes or No for " + field + " in " + metafile.name)
+            elif fieldtype == 'build':
                 if value.endswith("\\"):
                     mode = 2
-                    buildline = [value[:-1]]
+                    buildlines = [value[:-1]]
                 else:
-                    thisinfo['builds'].append(parse_buildline(value))
-            elif field == "Requires Root":
-                if value == "Yes":
-                    thisinfo['requiresroot'] = True
+                    thisinfo['builds'].append(parse_buildline([value]))
+                    add_comments('build:' + thisinfo['builds'][-1]['version'])
+            elif fieldtype == 'obsolete':
+                pass        # Just throw it away!
             else:
-                raise MetaDataException("Unrecognised field " + field + " in " + metafile.name)
-        elif mode == 1:       # multi-line description
+                raise MetaDataException("Unrecognised field type for " + field + " in " + metafile.name)
+        elif mode == 1:     # Multiline field
             if line == '.':
                 mode = 0
             else:
-                if len(line) == 0:
-                    thisinfo['description'] += '\n\n'
-                else:
-                    if (not thisinfo['description'].endswith('\n') and
-                        len(thisinfo['description']) > 0):
-                        thisinfo['description'] += ' '
-                    thisinfo['description'] += line
-        elif mode == 2:       # line continuation
+                thisinfo[field].append(line)
+        elif mode == 2:     # Line continuation mode in Build Version
             if line.endswith("\\"):
-                buildline.append(line[:-1])
+                buildlines.append(line[:-1])
             else:
-                buildline.append(line)
+                buildlines.append(line)
                 thisinfo['builds'].append(
-                    parse_buildline("".join(buildline)))
+                    parse_buildline(buildlines))
+                add_comments('build:' + thisinfo['builds'][-1]['version'])
                 mode = 0
+    add_comments(None)
+
+    # Mode at end of file should always be 0...
     if mode == 1:
-        raise MetaDataException("Description not terminated in " + metafile.name)
-    if len(thisinfo['description']) == 0:
-        thisinfo['description'] = 'No description available'
+        raise MetaDataException(field + " not terminated in " + metafile.name)
+    elif mode == 2:
+        raise MetaDataException("Unterminated continuation in " + metafile.name)
+
+    if len(thisinfo['Description']) == 0:
+        thisinfo['Description'].append('No description available')
+
+    # Ensure all AntiFeatures are recognised...
+    if thisinfo['AntiFeatures']:
+        parts = thisinfo['AntiFeatures'].split(",")
+        for part in parts:
+            if (part != "Ads" and
+                part != "Tracking" and
+                part != "NonFreeNet" and
+                part != "NonFreeDep" and
+                part != "NonFreeAdd"):
+                raise MetaDataException("Unrecognised antifeature '" + part + "' in " \
+                            + metafile.name)
+
     return thisinfo
 
+# Write a metadata file.
+#
+# 'dest'    - The path to the output file
+# 'app'     - The app data
+def write_metadata(dest, app):
+
+    def writecomments(key):
+        for pf, comment in app['comments']:
+            if pf == key:
+                mf.write(comment + '\n')
+
+    def writefield(field, value=None):
+        writecomments(field)
+        if value is None:
+            value = app[field]
+        mf.write(field + ':' + value + '\n')
+
+    mf = open(dest, 'w')
+    if app['Disabled']:
+        writefield('Disabled')
+    if app['AntiFeatures']:
+        writefield('AntiFeatures')
+    writefield('Category')
+    writefield('License')
+    writefield('Web Site')
+    writefield('Source Code')
+    writefield('Issue Tracker')
+    if app['Donate']:
+        writefield('Donate')
+    mf.write('\n')
+    if app['Name']:
+        writefield('Name')
+    writefield('Summary')
+    writefield('Description', '')
+    for line in app['Description']:
+        mf.write(line + '\n')
+    mf.write('.\n')
+    mf.write('\n')
+    if app['Requires Root']:
+        writefield('Requires Root', 'Yes')
+        mf.write('\n')
+    if len(app['Repo Type']) > 0:
+        writefield('Repo Type')
+        writefield('Repo')
+        mf.write('\n')
+    for build in app['builds']:
+        writecomments('build:' + build['version'])
+        mf.write('Build Version:')
+        mf.write('\\\n'.join(build['origlines']) + '\n')
+    if len(app['builds']) > 0:
+        mf.write('\n')
+    writefield('Update Check Mode')
+    if len(app['Market Version']) > 0:
+        writefield('Market Version')
+        writefield('Market Version Code')
+    mf.write('\n')
+    writecomments(None)
+    mf.close()
+
+
+# Read all metadata. Returns a list of 'app' objects (which are dictionaries as
+# returned by the parse_metadata function.
 def read_metadata(verbose=False):
     apps = []
     for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))):
@@ -334,12 +492,34 @@ def read_metadata(verbose=False):
         apps.append(parse_metadata(metafile, verbose=verbose))
     return apps
 
+
+# Parse multiple lines of description as written in a metadata file, returning
+# a single string.
+def parse_description(lines):
+    text = ''
+    for line in lines:
+        if len(line) == 0:
+            text += '\n\n'
+        else:
+            if not text.endswith('\n') and len(text) > 0:
+                text += ' '
+            text += line
+    return text
+
+
 class BuildException(Exception):
-    def __init__(self, value):
+    def __init__(self, value, stdout = None, stderr = None):
         self.value = value
+        self.stdout = stdout
+        self.stderr = stderr
 
     def __str__(self):
-        return repr(self.value)
+        ret = repr(self.value)
+        if self.stdout:
+            ret = ret + "\n==== stdout begin ====\n" + str(self.stdout) + "\n==== stdout end ===="
+        if self.stderr:
+            ret = ret + "\n==== stderr begin ====\n" + str(self.stderr) + "\n==== stderr end ===="
+        return ret
 
 class VCSException(Exception):
     def __init__(self, value):
@@ -355,3 +535,250 @@ class MetaDataException(Exception):
     def __str__(self):
         return repr(self.value)
 
+
+# Prepare the source code for a particular build
+#  'vcs'         - the appropriate vcs object for the application
+#  'app'         - the application details from the metadata
+#  'build'       - the build details from the metadata
+#  'build_dir'   - the path to the build directory
+#  'sdk_path'    - the path to the Android SDK
+#  'ndk_path'    - the path to the Android NDK
+#  'javacc_path' - the path to javacc
+#  'refresh'     - True to refresh from the remote repo
+# Returns the root directory, which may be the same as 'build_dir' or may
+# be a subdirectory of it.
+def prepare_source(vcs, app, build, build_dir, sdk_path, ndk_path, javacc_path, refresh):
+
+    if refresh:
+        vcs.refreshlocal()
+
+    # Optionally, the actual app source can be in a subdirectory...
+    if build.has_key('subdir'):
+        root_dir = os.path.join(build_dir, build['subdir'])
+    else:
+        root_dir = build_dir
+
+    # Get a working copy of the right revision...
+    print "Resetting repository to " + build['commit']
+    vcs.reset(build['commit'])
+
+    # Check that a subdir (if we're using one) exists. This has to happen
+    # after the checkout, since it might not exist elsewhere...
+    if not os.path.exists(root_dir):
+        raise BuildException('Missing subdir ' + root_dir)
+
+    # Initialise submodules if requred...
+    if build.get('submodules', 'no')  == 'yes':
+        vcs.initsubmodules()
+
+    # Generate (or update) the ant build file, build.xml...
+    if (build.get('update', 'yes') == 'yes' and
+        not build.has_key('maven')):
+        parms = [os.path.join(sdk_path, 'tools', 'android'),
+                'update', 'project', '-p', '.']
+        parms.append('--subprojects')
+        if build.has_key('target'):
+            parms.append('-t')
+            parms.append(build['target'])
+            # Newer versions of the platform tools don't replace the build.xml
+            # file as they always did previously, they spew out a nanny-like
+            # warning and tell you to do it manually. The following emulates
+            # the original behaviour...
+            buildxml = os.path.join(root_dir, 'build.xml')
+            if os.path.exists(buildxml):
+                os.remove(buildxml)
+        if subprocess.call(parms, cwd=root_dir) != 0:
+            raise BuildException("Failed to update project")
+
+    # If the app has ant set up to sign the release, we need to switch
+    # that off, because we want the unsigned apk...
+    for propfile in ('build.properties', 'default.properties'):
+        if os.path.exists(os.path.join(root_dir, propfile)):
+            if subprocess.call(['sed','-i','s/^key.store/#/',
+                                propfile], cwd=root_dir) !=0:
+                raise BuildException("Failed to amend %s" % propfile)
+
+    # Update the local.properties file...
+    locprops = os.path.join(root_dir, 'local.properties')
+    if os.path.exists(locprops):
+        f = open(locprops, 'r')
+        props = f.read()
+        f.close()
+        # Fix old-fashioned 'sdk-location' by copying
+        # from sdk.dir, if necessary...
+        if build.get('oldsdkloc', 'no') == "yes":
+            sdkloc = re.match(r".*^sdk.dir=(\S+)$.*", props,
+                re.S|re.M).group(1)
+            props += "\nsdk-location=" + sdkloc + "\n"
+        # Add ndk location...
+        props+= "\nndk.dir=" + ndk_path + "\n"
+        # Add java.encoding if necessary...
+        if build.has_key('encoding'):
+            props += "\njava.encoding=" + build['encoding'] + "\n"
+        f = open(locprops, 'w')
+        f.write(props)
+        f.close()
+
+    # Insert version code and number into the manifest if necessary...
+    if build.has_key('insertversion'):
+        if subprocess.call(['sed','-i','s/' + build['insertversion'] +
+            '/' + build['version'] +'/g',
+            'AndroidManifest.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend manifest")
+    if build.has_key('insertvercode'):
+        if subprocess.call(['sed','-i','s/' + build['insertvercode'] +
+            '/' + build['vercode'] +'/g',
+            'AndroidManifest.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend manifest")
+
+    # Delete unwanted file...
+    if build.has_key('rm'):
+        os.remove(os.path.join(build_dir, build['rm']))
+
+    # Fix apostrophes translation files if necessary...
+    if build.get('fixapos', 'no') == 'yes':
+        for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
+            for filename in files:
+                if filename.endswith('.xml'):
+                    if subprocess.call(['sed','-i','s@' +
+                        r"\([^\\]\)'@\1\\'" +
+                        '@g',
+                        os.path.join(root, filename)]) != 0:
+                        raise BuildException("Failed to amend " + filename)
+
+    # Fix translation files if necessary...
+    if build.get('fixtrans', 'no') == 'yes':
+        for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
+            for filename in files:
+                if filename.endswith('.xml'):
+                    f = open(os.path.join(root, filename))
+                    changed = False
+                    outlines = []
+                    for line in f:
+                        num = 1
+                        index = 0
+                        oldline = line
+                        while True:
+                            index = line.find("%", index)
+                            if index == -1:
+                                break
+                            next = line[index+1:index+2]
+                            if next == "s" or next == "d":
+                                line = (line[:index+1] +
+                                        str(num) + "$" +
+                                        line[index+1:])
+                                num += 1
+                                index += 3
+                            else:
+                                index += 1
+                        # We only want to insert the positional arguments
+                        # when there is more than one argument...
+                        if oldline != line:
+                            if num > 2:
+                                changed = True
+                            else:
+                                line = oldline
+                        outlines.append(line)
+                    f.close()
+                    if changed:
+                        f = open(os.path.join(root, filename), 'w')
+                        f.writelines(outlines)
+                        f.close()
+
+    # Run a pre-build command if one is required...
+    if build.has_key('prebuild'):
+        if subprocess.call(build['prebuild'],
+                cwd=root_dir, shell=True) != 0:
+            raise BuildException("Error running pre-build command")
+
+    # Apply patches if any
+    if 'patch' in build:
+        for patch in build['patch'].split(';'):
+            print "Applying " + patch
+            patch_path = os.path.join('metadata', app['id'], patch)
+            if subprocess.call(['patch', '-p1',
+                            '-i', os.path.abspath(patch_path)], cwd=build_dir) != 0:
+                raise BuildException("Failed to apply patch %s" % patch_path)
+
+    # Special case init functions for funambol...
+    if build.get('initfun', 'no')  == "yes":
+
+        if subprocess.call(['sed','-i','s@' +
+            '<taskdef resource="net/sf/antcontrib/antcontrib.properties" />' +
+            '@' +
+            '<taskdef resource="net/sf/antcontrib/antcontrib.properties">' +
+            '<classpath>' +
+            '<pathelement location="/usr/share/java/ant-contrib.jar"/>' +
+            '</classpath>' +
+            '</taskdef>' +
+            '@g',
+            'build.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend build.xml")
+
+        if subprocess.call(['sed','-i','s@' +
+            '\${user.home}/funambol/build/android/build.properties' +
+            '@' +
+            'build.properties' +
+            '@g',
+            'build.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend build.xml")
+
+        buildxml = os.path.join(root_dir, 'build.xml')
+        f = open(buildxml, 'r')
+        xml = f.read()
+        f.close()
+        xmlout = ""
+        mode = 0
+        for line in xml.splitlines():
+            if mode == 0:
+                if line.find("jarsigner") != -1:
+                    mode = 1
+                else:
+                    xmlout += line + "\n"
+            else:
+                if line.find("/exec") != -1:
+                    mode += 1
+                    if mode == 3:
+                        mode =0
+        f = open(buildxml, 'w')
+        f.write(xmlout)
+        f.close()
+
+        if subprocess.call(['sed','-i','s@' +
+            'platforms/android-2.0' +
+            '@' +
+            'platforms/android-8' +
+            '@g',
+            'build.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend build.xml")
+
+        shutil.copyfile(
+                os.path.join(root_dir, "build.properties.example"),
+                os.path.join(root_dir, "build.properties"))
+
+        if subprocess.call(['sed','-i','s@' +
+            'javacchome=.*'+
+            '@' +
+            'javacchome=' + javacc_path +
+            '@g',
+            'build.properties'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend build.properties")
+
+        if subprocess.call(['sed','-i','s@' +
+            'sdk-folder=.*'+
+            '@' +
+            'sdk-folder=' + sdk_path +
+            '@g',
+            'build.properties'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend build.properties")
+
+        if subprocess.call(['sed','-i','s@' +
+            'android.sdk.version.*'+
+            '@' +
+            'android.sdk.version=2.0' +
+            '@g',
+            'build.properties'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend build.properties")
+
+    return root_dir
+
diff --git a/marketcheck/.gitignore b/marketcheck/.gitignore
deleted file mode 100644
index 6b468b62..00000000
--- a/marketcheck/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.class
diff --git a/marketcheck/README.txt b/marketcheck/README.txt
deleted file mode 100644
index 009014c3..00000000
--- a/marketcheck/README.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-=Libraries=
-
-androidmarketapi-x.x.jar is Apache 2.0 licensed - source from:
-
-  http://code.google.com/p/android-market-api/
-
-https://code.google.com/p/protobuf/ is New BSD licensed - source from:
-
-  https://code.google.com/p/protobuf/
-
diff --git a/marketcheck/androidmarketapi-0.6.jar b/marketcheck/androidmarketapi-0.6.jar
deleted file mode 100644
index b7f54192..00000000
Binary files a/marketcheck/androidmarketapi-0.6.jar and /dev/null differ
diff --git a/marketcheck/make.sh b/marketcheck/make.sh
deleted file mode 100755
index aec4fb1f..00000000
--- a/marketcheck/make.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-javac -classpath androidmarketapi-0.6.jar test.java
diff --git a/marketcheck/protobuf-java-2.2.0.jar b/marketcheck/protobuf-java-2.2.0.jar
deleted file mode 100644
index 7a0ccde1..00000000
Binary files a/marketcheck/protobuf-java-2.2.0.jar and /dev/null differ
diff --git a/marketcheck/run.sh b/marketcheck/run.sh
deleted file mode 100755
index 59515a84..00000000
--- a/marketcheck/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -classpath ".:androidmarketapi-0.6.jar" test $1 $2 $3
diff --git a/marketcheck/test.java b/marketcheck/test.java
deleted file mode 100644
index 28431806..00000000
--- a/marketcheck/test.java
+++ /dev/null
@@ -1,147 +0,0 @@
-
-import java.io.*;
-import java.util.*;
-
-import com.gc.android.market.api.MarketSession.Callback;
-import com.gc.android.market.api.MarketSession;
-import com.gc.android.market.api.model.Market.App;
-import com.gc.android.market.api.model.Market.AppsResponse;
-import com.gc.android.market.api.model.Market.AppsRequest;
-import com.gc.android.market.api.model.Market.CommentsRequest;
-import com.gc.android.market.api.model.Market.GetImageRequest;
-import com.gc.android.market.api.model.Market.GetImageResponse;
-import com.gc.android.market.api.model.Market.ResponseContext;
-import com.gc.android.market.api.model.Market.GetImageRequest.AppImageUsage;
-
-class test {
-
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        try {
-            if(args.length < 3) {
-                System.out.println("Parameters :\n" +
-                        "email password deviceid");
-                return;
-            }
-            String login = args[0];
-            String password = args[1];
-            String deviceid = args[2];
-
-            // Get a list of apps we want to check - i.e. those that
-            // we have metadata files for...
-            File dir = new File("../metadata");
-            List<String> apps = new ArrayList<String>();
-            String[] metafiles = dir.list();
-            for (int i=0; i<metafiles.length; i++) {
-                String metafile = metafiles[i];
-                if(metafile.endsWith(".txt")) {
-                    String pkg = metafile.substring(0,
-                           metafile.length() - 4);
-                    apps.add(pkg);
-                }
-            }
-            System.out.println("Apps to check: " + apps.size());
-
-            MarketSession session = new MarketSession();
-
-            session.getContext().setAndroidId(deviceid);
-            session.getContext().setDeviceAndSdkVersion("sapphire:7");
-            System.out.println("Login...");
-            session.login(login,password);
-            System.out.println("Login done");
-
-            MarketSession.Callback callback = new MarketSession.Callback() {
-
-                @Override
-                    public void onResult(ResponseContext context, Object oresp) {
-                        try {
-                            AppsResponse response = (AppsResponse)oresp;
-                            if(response == null) {
-                                System.out.println("No response");
-                            }
-                            if(response.getAppCount() != 1) {
-                                System.out.println("Not in market, or multiple results");
-                            } else {
-                                App app = response.getAppList().get(0);
-                                String filespec = "../metadata/" + app.getPackageName() + ".txt";
-                                FileInputStream fi = new FileInputStream(filespec);
-                                InputStreamReader isr = new InputStreamReader(fi, "UTF-8");
-                                BufferedReader br = new BufferedReader(isr);
-                                StringBuilder output = new StringBuilder();
-                                boolean changed = false;
-                                boolean vercodefound = false;
-                                boolean versionfound = false;
-                                String line, newline;
-                                while (br.ready()) {
-                                    line = br.readLine();
-                                    if (line.startsWith("Market Version:")) {
-                                        versionfound = true;
-                                        newline="Market Version:" + app.getVersion();
-                                        if (!newline.equals(line)) {
-                                            changed = true;
-                                            line = newline;
-                                        }
-                                    } else if (line.startsWith("Market Version Code:")) {
-                                        vercodefound = true;
-                                        newline="Market Version Code:" + app.getVersionCode();
-                                        if (!newline.equals(line)) {
-                                            changed = true;
-                                            line = newline;
-                                        }
-                                    }
-                                    output.append(line + "\n");
-                                }
-                                br.close();
-                                isr.close();
-                                fi.close();
-                                if(!versionfound) {
-                                    changed = true;
-                                    output.append("Market Version:" + app.getVersion() + "\n");
-                                }
-                                if(!vercodefound) {
-                                    changed = true;
-                                    output.append("Market Version Code:" + app.getVersionCode() + "\n");
-                                }
-
-                                if (changed) { 
-                                    System.out.println("..updating");
-                                    FileOutputStream fo = new FileOutputStream(filespec);
-                                    OutputStreamWriter osr = new OutputStreamWriter(fo, "UTF-8");
-                                    BufferedWriter wi = new BufferedWriter(osr);
-                                    wi.write(output.toString());
-                                    wi.close();
-                                    osr.close();
-                                    fo.close();
-                                }
-
-                            }
-                        } catch (Exception ex) {
-                            System.out.println("...Exception");
-                            ex.printStackTrace();
-                        }
-                    }
-
-            };
-
-            for(String pkg : apps) {
-                System.out.println("Checking: " + pkg);
-                AppsRequest appsRequest = AppsRequest.newBuilder()
-                    .setQuery("pname:" + pkg)
-                    .setStartIndex(0).setEntriesCount(10)
-                    .setWithExtendedInfo(true)
-                    .build();
-                session.append(appsRequest, callback);
-                session.flush();
-
-                // Pause to avoid rate limit...
-                Thread.sleep(5000);
-            }
-
-        } catch(Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-}
diff --git a/metadata/An.stop.txt b/metadata/An.stop.txt
index e8c2e730..43d7a191 100644
--- a/metadata/An.stop.txt
+++ b/metadata/An.stop.txt
@@ -1,15 +1,17 @@
-Use Built:Yes
-License:GPLv2
 Category:Office
+License:GPLv2
 Web Site:http://code.google.com/p/anstop/
 Source Code:http://code.google.com/p/anstop/source/checkout
 Issue Tracker:http://code.google.com/p/anstop/issues/list
+
 Summary:A simple stopwatch
-Description:A simple stopwatch, that also supports lap timing and a countdown
+Description:
+A simple stopwatch, that also supports lap timing and a countdown
 timer.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://anstop.googlecode.com/svn/trunk
 
 Build Version:1.4,9,34
+
diff --git a/metadata/aarddict.android.txt b/metadata/aarddict.android.txt
new file mode 100644
index 00000000..c49dfa24
--- /dev/null
+++ b/metadata/aarddict.android.txt
@@ -0,0 +1,17 @@
+Category:Office
+License:GPLv3
+Web Site:http://aarddict.org/android/
+Source Code:https://github.com/aarddict/android
+Issue Tracker:https://github.com/aarddict/android/issues
+Donate:http://aarddict.org/android/
+
+Summary:Offline dictionary
+Description:
+An offline dictionary and wikipedia reader.
+.
+
+Repo Type:git
+Repo:git://github.com/aarddict/android.git
+
+Build Version:1.3.1,10,1.3.1,prebuild=mv lib libs
+
diff --git a/metadata/android.androidVNC.txt b/metadata/android.androidVNC.txt
index 9dd1cd7e..31b00ab0 100644
--- a/metadata/android.androidVNC.txt
+++ b/metadata/android.androidVNC.txt
@@ -1,17 +1,19 @@
-Use Built:Yes
-License:GPLv2+
 Category:System
+License:GPLv2+
 Web Site:http://code.google.com/p/android-vnc-viewer/
 Source Code:http://code.google.com/p/android-vnc-viewer/source/checkout
 Issue Tracker:http://code.google.com/p/android-vnc-viewer/issues/list
+
 Summary:VNC viewer
 Description:
 A VNC ('remote desktop') client.
 .
-Repo Type:svn
+
+Repo Type:git-svn
 Repo:http://android-vnc-viewer.googlecode.com/svn/branches/antlersoft
 
 Build Version:0.5.0,13,197,subdir=androidVNC
 
 Market Version:0.5.0
 Market Version Code:13
+
diff --git a/metadata/as.adamsmith.iteration.txt b/metadata/as.adamsmith.iteration.txt
index fce6085e..cc327de8 100644
--- a/metadata/as.adamsmith.iteration.txt
+++ b/metadata/as.adamsmith.iteration.txt
@@ -1,12 +1,15 @@
 Disabled:See license
-License:Unknown
 Category:Games
+License:Unknown
 Web Site:http://github.com/rndmcnlly/iteration
 Source Code:http://github.com/rndmcnlly/iteration
 Issue Tracker:
+
 Summary:Generative art
 Description:
 Generative art (pretty pictures of mathematical origin).
 .
+
 Market Version:3.15
 Market Version Code:25
+
diff --git a/metadata/at.aichbauer.ical.txt b/metadata/at.aichbauer.ical.txt
index 51e36970..00d1102f 100644
--- a/metadata/at.aichbauer.ical.txt
+++ b/metadata/at.aichbauer.ical.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:https://code.google.com/p/ical-import-export/
 Source Code:https://code.google.com/p/ical-import-export/source/checkout
 Issue Tracker:https://code.google.com/p/ical-import-export/issues/list
+
 Summary:iCal (.ics) file importer
 Description:
 Allows you to import iCalendar files to your calendar without using Google
@@ -13,7 +13,8 @@ synchronization services.
 Repo Type:svn
 Repo:http://ical-import-export.googlecode.com/svn/trunk/
 
-Build Version:1.5,51,!11 but needs AndroidTools compiling too,subdir=iCalImportExport,target=android-9
+Build Version:1.5,51,!11 but needs AndroidTools compiling too,subdir=iCalImportExport,target=android-10
 
 Market Version:1.5
 Market Version Code:51
+
diff --git a/metadata/at.tomtasche.reader.txt b/metadata/at.tomtasche.reader.txt
index 2c79edb6..681f9d7e 100644
--- a/metadata/at.tomtasche.reader.txt
+++ b/metadata/at.tomtasche.reader.txt
@@ -1,15 +1,18 @@
 Disabled:Sends device info and other data to a web server without permission
-Use Built:Yes
+Category:None
 License:GPLv3+
 Web Site:http://tomtasche.at/p/OpenOffice%20Document%20Reader
 Source Code:https://github.com/TomTasche/OpenOffice-Document-Reader
 Issue Tracker:https://github.com/TomTasche/OpenOffice-Document-Reader/issues
+
 Summary:Open Office document reader.
 Description:
 Open Office document reader.
 .
+
 Repo Type:git
 Repo:https://github.com/TomTasche/OpenOffice-Document-Reader.git
+
 Build Version:1.1.9,11,243eba4f441b3601de96
 Build Version:1.2,12,d174bed05a6026ddb5db
 Build Version:1.2.3,15,8fe022fd67e5bb62c6d8
diff --git a/metadata/caldwell.ben.trolly.txt b/metadata/caldwell.ben.trolly.txt
index 82295c35..cbc34799 100644
--- a/metadata/caldwell.ben.trolly.txt
+++ b/metadata/caldwell.ben.trolly.txt
@@ -1,20 +1,22 @@
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:http://sites.google.com/site/caldwellcode/
 Source Code:http://code.google.com/p/trolly/source/checkout
 Issue Tracker:http://code.google.com/p/trolly/issues/list
+
 Summary:Shopping list application
 Description:
 Trolly is a shopping list application with the aim of being a very simple
 app with no annoying or complicated features. It exposes intent filters to
 allow other apps to automatically add items to the shopping list.
 .
+
 Repo Type:svn
 Repo:http://trolly.googlecode.com/svn/trunk
 
 # It needs a file from OpenIntents, so let's get it from Subversion...
 Build Version:1.4,6,40,target=android-4,prebuild=mkdir -p src/org/openintents/intents && svn cat -r 3070 http://openintents.googlecode.com/svn/trunk/shoppinglist/ShoppingList/src/org/openintents/intents/ShoppingListIntents.java >src/org/openintents/intents/ShoppingListIntents.java
 
-Use Built:Yes
 Market Version:1.4
 Market Version Code:6
+
diff --git a/metadata/cm.aptoide.pt.txt b/metadata/cm.aptoide.pt.txt
index d8e7e1e9..c9dfc9b2 100644
--- a/metadata/cm.aptoide.pt.txt
+++ b/metadata/cm.aptoide.pt.txt
@@ -1,18 +1,20 @@
 Disabled:Source incomplete
+Category:None
 License:GPLv2+
 Web Site:http://www.aptoide.com/
 Source Code:http://aptoide.org/trac
 Issue Tracker:http://aptoide.org/trac
+
 Summary:A package installer.
 Description:
 Aptoide is a simple repository and package installer. F-Droid was originally
 based on Aptoide!
 .
-Market Version:2.0.1
-Market Version Code:145
 
 Repo Type:svn
 Repo:http://aptoide.org/repo
 
-#Build Version:2.0,126,45,subdir=aptoide-client/v2.0
+Market Version:2.0.1
+Market Version Code:145
 
+#Build Version:2.0,126,45,subdir=aptoide-client/v2.0
diff --git a/metadata/cmupdaterapp.ui.txt b/metadata/cmupdaterapp.ui.txt
index f3a87409..50563d3f 100644
--- a/metadata/cmupdaterapp.ui.txt
+++ b/metadata/cmupdaterapp.ui.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv2
 Category:System
+License:GPLv2
 Web Site:http://code.google.com/p/cyanogen-updater/
 Source Code:http://code.google.com/p/cyanogen-updater/source/checkout
 Issue Tracker:http://code.google.com/p/cyanogen-updater/issues/list
+
 Summary:Updater for CyanogenMod
 Description:
 An over-the-air updater for the CyanogenMod series of custom ROMs. Root
@@ -14,7 +14,9 @@ Requires Root:Yes
 
 Repo Type:svn
 Repo:http://cyanogen-updater.googlecode.com/svn/trunk/
+
 Build Version:5.0.1,501,626
 
 Market Version:5.0.1
 Market Version Code:501
+
diff --git a/metadata/com.FireFart.Permissions.txt b/metadata/com.FireFart.Permissions.txt
index 7e2468b8..70de69ba 100644
--- a/metadata/com.FireFart.Permissions.txt
+++ b/metadata/com.FireFart.Permissions.txt
@@ -1,8 +1,9 @@
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/androidpermissions/
 Source Code:http://code.google.com/p/androidpermissions/source/checkout
 Issue Tracker:http://code.google.com/p/androidpermissions/issues/list
+
 Summary:Lists application permissions
 Description:
 This application shows all the available permissions on your phone in a big
@@ -10,9 +11,12 @@ list, highlighting those it considers dangerous. You can expand any of the
 entries in the list to see what applications are using that particular
 permission.
 .
+
 Repo Type:svn
 Repo:http://androidpermissions.googlecode.com/svn/trunk
+
 Build Version:1.1,2,16
-Use Built:Yes
+
 Market Version:1.1
 Market Version Code:2
+
diff --git a/metadata/com.agiro.scanner.android.txt b/metadata/com.agiro.scanner.android.txt
index 6dc28ba4..337535f0 100644
--- a/metadata/com.agiro.scanner.android.txt
+++ b/metadata/com.agiro.scanner.android.txt
@@ -1,6 +1,9 @@
-License:Apache2
 Category:Office
+License:Apache2
+Web Site:
 Source Code:https://github.com/pakerfeldt/aGiro
+Issue Tracker:
+
 Summary:OCR scanner for Swedish bills
 Description:
 Scans bills sent through Bankgiro or Plusgiro and send the result to a
@@ -8,12 +11,12 @@ server. The server component is available separately:
 https://github.com/johannilsson/agiro-server
 .
 
-Repo Type:
+Repo Type:git
 Repo:https://github.com/pakerfeldt/aGiro.git
 
 Build Version:alpha 2,2,!repo moved and renamed 20bd0f021dd852afcc9aa9008ee713419ae8e05c
-#Use Built:Yes
 
+#Use Built:Yes
 # The closest thing to a web site or issue tracker is this thread:
 # http://www.swedroid.se/forum/showthread.php?t=16305
 #Web Site:
diff --git a/metadata/com.alfray.mandelbrot2.txt b/metadata/com.alfray.mandelbrot2.txt
index edf8843c..f421aaab 100644
--- a/metadata/com.alfray.mandelbrot2.txt
+++ b/metadata/com.alfray.mandelbrot2.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://code.google.com/p/mandelbrot/
 Source Code:http://code.google.com/p/mandelbrot/source/checkout
 Issue Tracker:
+
 Summary:Mandelbrot set viewer
 Description:
 Mandelbrot set viewer that works in the style of a map viewer - i.e. scroll around
 and zoom in/out.
 .
+
 Market Version:0.13
 Market Version Code:13
+
diff --git a/metadata/com.alfray.timeriffic.txt b/metadata/com.alfray.timeriffic.txt
index fd71694e..9562dab5 100644
--- a/metadata/com.alfray.timeriffic.txt
+++ b/metadata/com.alfray.timeriffic.txt
@@ -1,8 +1,9 @@
-Use Built:Yes
 Category:Office
 License:GPLv3
 Web Site:http://code.google.com/p/timeriffic/
 Source Code:http://code.google.com/p/timeriffic/source/checkout
+Issue Tracker:
+
 Summary:Auto-control settings on a schedule
 Description:
 Allows you to set multiple schedules to control mute, vibrate, brightness, 
@@ -14,15 +15,13 @@ Repo:https://timeriffic.googlecode.com/hg/
 
 #This previous version was svn from http://timeriffic.googlecode.com/svn/trunk/
 #Build Version:1.09.03,10903,45,subdir=Timeriffic,oldsdkloc=yes
-
 Build Version:1.09.05,10905,fc40dccbb9,subdir=Timeriffic,oldsdkloc=yes,novcheck=yes,bindir=Timeriffic/bin2
-
 #NOTE: Far from obvious which commit corresponds to version 1.09.09. Also
 #note the source tree re-org, which means some of the settings above need
 #to change, and also the switch to android-11 as a target.
 Build Version:1.09.11,10911,!Can't find correct commit. See metadata notes too.
-
 Build Version:1.09.12,10912,!No source for this in the repo
 
 Market Version:1.09.12
 Market Version Code:10912
+
diff --git a/metadata/com.andrewshu.android.reddit.txt b/metadata/com.andrewshu.android.reddit.txt
index a729fdd3..7a3836ff 100644
--- a/metadata/com.andrewshu.android.reddit.txt
+++ b/metadata/com.andrewshu.android.reddit.txt
@@ -1,15 +1,14 @@
-Use Built:Yes
 Category:Internet
 License:GPLv3+
 Web Site:https://github.com/talklittle/reddit-is-fun
 Source Code:https://github.com/talklittle/reddit-is-fun
 Issue Tracker:https://github.com/talklittle/reddit-is-fun/issues
+
 Summary:Reddit app
 Description:
 An app for the social news website Reddit.
 .
 
-
 Repo Type:git
 Repo:https://github.com/talklittle/reddit-is-fun.git
 
@@ -19,9 +18,10 @@ Build Version:1.1.4,69,9372d0ab3a16125e9045,prebuild=rsync -r lib/ libs
 Build Version:1.2.0,70,442e604760506e25e6c9,prebuild=rsync -r lib/ libs
 Build Version:1.2.0a,71,e37439e12d11ff17a841,prebuild=rsync -r lib/ libs
 Build Version:1.2.1,73,e35fd128c954d41e24abf91b71f301740f6ca483,prebuild=rsync -r lib/ libs
-Build Version:1.2.1.2,75,28c98a7,prebuild=rsync -r lib/ libs,target=android-9
-Build Version:1.2.1.3,76,143892b558,prebuild=rsync -r lib/ libs,target=android-9
+Build Version:1.2.1.2,75,28c98a7,prebuild=rsync -r lib/ libs,target=android-10
+Build Version:1.2.1.3,76,143892b558,prebuild=rsync -r lib/ libs,target=android-10
 Build Version:1.2.1.5,78,!more dependency shuffling required and watch out for the proguard config
 
-Market Version:1.2.1.5
-Market Version Code:78
+Market Version:1.2.2b
+Market Version Code:82
+
diff --git a/metadata/com.android.inputmethod.norwegian.txt b/metadata/com.android.inputmethod.norwegian.txt
index f702a0ac..c0569467 100644
--- a/metadata/com.android.inputmethod.norwegian.txt
+++ b/metadata/com.android.inputmethod.norwegian.txt
@@ -1,18 +1,22 @@
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/scandinavian-keyboard/
 Source Code:http://code.google.com/p/scandinavian-keyboard/source/checkout
 Issue Tracker:http://code.google.com/p/scandinavian-keyboard/issues/list
+
 Summary:Keyboard for Scandinavian languages
 Description:
 A modified version of the standard onscreen keyboard in Android
 with support for Norwegian, Swedish, Danish, Faroese, German,
 Icelandic and Northern Sámi keyboard layouts.
 .
-Repo Type:svn
+
+Repo Type:git-svn
 Repo:http://scandinavian-keyboard.googlecode.com/svn/trunk
+
 Build Version:1.4.4,13,15,target=android-4
 Build Version:1.4.6,15,17,target=android-4
-Use Built:Yes
+
 Market Version:1.4.6
 Market Version Code:15
+
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index 207b8232..2582295d 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv2
 Category:Office
+License:GPLv2
 Web Site:http://www.keepassdroid.com/
 Source Code:http://github.com/bpellin/keepassdroid
 Issue Tracker:http://code.google.com/p/keepassdroid/issues/list
+
 Summary:KeePass-compatible password safe
 Description:
 A password safe, compatible with KeePass.
diff --git a/metadata/com.angrydoughnuts.android.alarmclock.txt b/metadata/com.angrydoughnuts.android.alarmclock.txt
index 730af83b..5fd4d84e 100644
--- a/metadata/com.angrydoughnuts.android.alarmclock.txt
+++ b/metadata/com.angrydoughnuts.android.alarmclock.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:Office
+License:Apache2
 Web Site:https://code.google.com/p/kraigsandroid/
 Source Code:https://code.google.com/p/kraigsandroid/source/checkout
 Issue Tracker:https://code.google.com/p/kraigsandroid/issues/list
+
 Summary:An alarm clock
 Description:
 An alarm clock.
@@ -16,3 +16,4 @@ Build Version:1.7,8,378
 
 Market Version:1.7
 Market Version Code:8
+
diff --git a/metadata/com.appengine.paranoid_android.lost.txt b/metadata/com.appengine.paranoid_android.lost.txt
new file mode 100644
index 00000000..1796a1a1
--- /dev/null
+++ b/metadata/com.appengine.paranoid_android.lost.txt
@@ -0,0 +1,25 @@
+Category:System
+License:LGPL
+Web Site:https://sites.google.com/site/paranoidandroidproject/ContactOwner
+Source Code:https://code.google.com/p/contactowner/source/browse/
+Issue Tracker:https://code.google.com/p/contactowner/issues/list
+
+Summary:Contact info on lock screen
+Description:
+Contact Owner is displays your (or a friend's) contact information on the "lock
+screen" of your device, so that if you happen to lose it the finder will know
+how to contact you. Select yourself (or your friend) from your list of contacts,
+then select which information you want shown and (optionally) customize your
+message. Contact Owner is a "fire and forget" tool: once you set it up, your
+contact information will keep being displayed even after restarting your
+device, as long as the application is installed.
+.
+
+Repo Type:git-svn
+Repo:http://contactowner.googlecode.com/svn/branches/v2next/
+
+Build Version:2.2,12,44,target=android-4
+
+Market Version:2.2
+Market Version Code:22
+
diff --git a/metadata/com.beem.project.beem.txt b/metadata/com.beem.project.beem.txt
index 5f998862..baa5ddcc 100644
--- a/metadata/com.beem.project.beem.txt
+++ b/metadata/com.beem.project.beem.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3+
 Category:Internet
+License:GPLv3+
 Web Site:http://www.beem-project.com/
 Source Code:http://www.beem-project.com/projects/beem/repository
 Issue Tracker:http://www.beem-project.com/projects/beem/issues
+
 Summary:XMPP client
 Description:
 Beem is an XMPP (Jabber) client.
@@ -17,3 +17,4 @@ Build Version:0.1.6,9,0.1.6
 
 Market Version:0.1.6
 Market Version Code:9
+
diff --git a/metadata/com.boardgamegeek.txt b/metadata/com.boardgamegeek.txt
index 8f0b2484..21dee90e 100644
--- a/metadata/com.boardgamegeek.txt
+++ b/metadata/com.boardgamegeek.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:https://code.google.com/p/boardgamegeek/
 Source Code:https://code.google.com/p/boardgamegeek/source/checkout
 Issue Tracker:https://code.google.com/p/boardgamegeek/issues/list
-Donate:
+
 Summary:BoardGameGeek application
 Description:
 This app searches the board game data from boardgamegeek.com. It's not a game
@@ -18,3 +18,4 @@ Build Version:3.4,21,r525,subdir=BoardGameGeek,target=android-8
 
 Market Version:3.4
 Market Version Code:21
+
diff --git a/metadata/com.bottleworks.dailymoney.txt b/metadata/com.bottleworks.dailymoney.txt
new file mode 100644
index 00000000..8de3d59f
--- /dev/null
+++ b/metadata/com.bottleworks.dailymoney.txt
@@ -0,0 +1,28 @@
+Disabled:Non-free blob
+AntiFeatures:Tracking
+Category:Office
+License:GPLv2
+Web Site:https://code.google.com/p/daily-money/
+Source Code:https://code.google.com/p/daily-money/source/browse/
+Issue Tracker:https://code.google.com/p/daily-money/issues/list
+
+Summary:Simple Finance Manager
+Description:
+Features:
+* Record your daily expense, income, asset and liability
+* Show and count the details
+* Export/Import to CSV
+* Pie and time chart of balance
+.
+
+Repo Type:svn
+Repo:https://daily-money.googlecode.com/svn/trunk/
+
+Market Version:0.9.7-0702-freshly
+Market Version Code:2011070200
+
+# Does not build yet
+#Build Version:0.9.7-0702-freshly,2011070200,218,subdir=dailymoney-surface/,target=android-7,prebuild=\
+#	cp build.xml local.properties ../dailymoney/ && \
+#	cd ../dailymoney/ && \
+#	cp default.properties project.properties
diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt
index 5d307609..7b8d974f 100644
--- a/metadata/com.bwx.bequick.txt
+++ b/metadata/com.bwx.bequick.txt
@@ -1,23 +1,23 @@
-Use Built:Yes
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/quick-settings/
 Source Code:http://code.google.com/p/quick-settings/source/checkout
 Issue Tracker:http://code.google.com/p/quick-settings/issues/list
+
 Summary:System settings tool
 Description:
 Quick Settings provides quick access to various Android system
 settings, such as WiFi, GPS, brightness and all the various volume
 controls.
 .
+
 Repo Type:svn
 Repo:http://quick-settings.googlecode.com/svn/trunk/quick-settings/
 
-#Don't know why the market version has a slightly different version code...
-Build Version:1.9.8 p2,201012061,!Different market code
 Build Version:1.9.8 p2,201012060,184,target=android-8
 Build Version:1.9.9.2,201106160,213,target=android-8
 Build Version:1.9.9.3,201107260,220,target=android-8
 
 Market Version:1.9.9.5
 Market Version Code:201110061
+
diff --git a/metadata/com.bwx.qs.battery.txt b/metadata/com.bwx.qs.battery.txt
index ebb59f86..7ff8337c 100644
--- a/metadata/com.bwx.qs.battery.txt
+++ b/metadata/com.bwx.qs.battery.txt
@@ -1,13 +1,14 @@
-Use Built:Yes
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/quick-settings/
 Source Code:http://code.google.com/p/quick-settings/source/checkout
 Issue Tracker:http://code.google.com/p/quick-settings/issues/list
+
 Summary:Battery widget
 Description:
 A tiny widget that displays battery level both numerically and graphically.
 .
+
 Repo Type:svn
 Repo:http://quick-settings.googlecode.com/svn/trunk/quick-battery/
 
@@ -15,3 +16,4 @@ Build Version:0.8.2,201010020,153,target=android-8
 
 Market Version:0.8.2
 Market Version Code:201010020
+
diff --git a/metadata/com.chessclock.android.txt b/metadata/com.chessclock.android.txt
new file mode 100644
index 00000000..5ef2b876
--- /dev/null
+++ b/metadata/com.chessclock.android.txt
@@ -0,0 +1,20 @@
+Category:Games
+License:GPLv3
+Web Site:https://code.google.com/p/simplechessclock/
+Source Code:https://code.google.com/p/simplechessclock/source/browse/
+Issue Tracker:https://code.google.com/p/simplechessclock/issues/list
+
+Summary:Simple chess clock
+Description:
+Simple Chess Clock does what it says! It is designed for touchscreen Android
+devices, and provides a simple, clear interface and easy interaction.
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/simplechessclock/
+
+Build Version:1.2.0,8,379155447bff,subdir=simplechessclock,target=android-8
+
+Market Version:1.2.0
+Market Version Code:8
+
diff --git a/metadata/com.commonsware.android.arXiv.txt b/metadata/com.commonsware.android.arXiv.txt
index 48b1dc6f..7f233533 100644
--- a/metadata/com.commonsware.android.arXiv.txt
+++ b/metadata/com.commonsware.android.arXiv.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv2
 Category:Internet
+License:GPLv2
 Web Site:https://launchpad.net/arxivdroid
 Source Code:http://bazaar.launchpad.net/~jdeslip/arxivdroid/trunk/files
 Issue Tracker:
+
 Summary:arxiv.org client
 Description:
 Official arxiv.org client with widget
@@ -13,7 +13,7 @@ Repo Type:bzr
 Repo:lp:arxivdroid
 
 Build Version:2.0.4,90,!94 but doesn't compile due to apparently missing resource,target=android-11
-Build Version:2.0.6,92,95,target=android-11
+Build Version:2.0.6,92,95,target=android-11,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
 Build Version:2.0.10,96,!No source in repo,target=android-11
 Build Version:2.0.14,100,!No source in repo,target=android-11
 Build Version:2.0.16,102,!No source in repo,target=android-11
@@ -23,3 +23,4 @@ Build Version:2.0.20,106,!No source in repo
 
 Market Version:2.0.20
 Market Version Code:106
+
diff --git a/metadata/com.csipsimple.txt b/metadata/com.csipsimple.txt
index d70108e7..f1593cb4 100644
--- a/metadata/com.csipsimple.txt
+++ b/metadata/com.csipsimple.txt
@@ -1,9 +1,10 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://code.google.com/p/csipsimple/
 Source Code:http://code.google.com/p/csipsimple/source/checkout
 Issue Tracker:http://code.google.com/p/csipsimple/issues/list
 Donate:http://code.google.com/p/csipsimple/wiki/Donate
+
 Summary:SIP (VOIP) client
 Description:
 A SIP (VOIP) client.
@@ -11,6 +12,6 @@ A SIP (VOIP) client.
 
 #Note : build needs a customised ndk, as described at:
 #  http://code.google.com/p/csipsimple/wiki/HowToBuild
-
 Market Version:0.03-01
 Market Version Code:1108
+
diff --git a/metadata/com.danga.squeezer.txt b/metadata/com.danga.squeezer.txt
index c78bac0b..bb3d934b 100644
--- a/metadata/com.danga.squeezer.txt
+++ b/metadata/com.danga.squeezer.txt
@@ -1,16 +1,17 @@
-License:Apache2
 Category:Multimedia
+License:Apache2
 Web Site:http://code.google.com/p/android-squeezer/
 Source Code:https://github.com/bradfitz/android-squeezer
 Issue Tracker:http://code.google.com/p/android-squeezer/issues/list
+
 Summary:Squeezebox remote control app
 Description:
 Control your SqueezeCenter ("Slimserver") and Squeezebox (or multiple
 squeezeboxes) from your Android phone.
 .
+
 Repo Type:git
 Repo:https://github.com/bradfitz/android-squeezer.git
-Use Built:Yes
 
 Build Version:0.5,5,df0ffda7ae6370f22847ea9e764d81802eeaf545,\
 prebuild=sed -r -i \
@@ -20,3 +21,4 @@ oldsdkloc=yes,target=android-4
 
 Market Version:0.5
 Market Version Code:5
+
diff --git a/metadata/com.determinato.feeddroid.txt b/metadata/com.determinato.feeddroid.txt
index 49d6be82..67843f85 100644
--- a/metadata/com.determinato.feeddroid.txt
+++ b/metadata/com.determinato.feeddroid.txt
@@ -1,19 +1,19 @@
 Disabled: Need to deal with possible trademark issues due us forking the project.
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://code.google.com/p/feeddroid/
 Source Code:http://gitorious.org/feeddroid/feeddroid
 Issue Tracker:
+
 Summary:RSS feed reader/podcatcher
 Description:
 An RSS feed reader and podcatcher with audio and video support.
 .
 
-
 Repo Type:git
 Repo:http://git.gitorious.org/feeddroid/feeddroid.git
 
 #Build Version:1.1.1,37,db5077bf1ef792d8d5f6154198b7200a50d963df,subdir=FeedDroid
-
 Market Version:1.1.1
 Market Version Code:37
+
diff --git a/metadata/com.dozingcatsoftware.bouncy.txt b/metadata/com.dozingcatsoftware.bouncy.txt
index 21ac3d49..16feceb3 100644
--- a/metadata/com.dozingcatsoftware.bouncy.txt
+++ b/metadata/com.dozingcatsoftware.bouncy.txt
@@ -1,18 +1,20 @@
-Use Built:Yes
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:https://github.com/dozingcat/Vector-Pinball
 Source Code:https://github.com/dozingcat/Vector-Pinball
 Issue Tracker:https://github.com/dozingcat/Vector-Pinball/issues
-Donate:
+
 Summary:Pinball game
 Description:
 Vector Pinball is a pinball game.
 .
+
 Repo Type:git
 Repo:https://github.com/dozingcat/Vector-Pinball.git
+
 Build Version:1.1,4,45b5218594320ffb4b37
 Build Version:1.3,10,1210949b1e373916d096
 
 Market Version:1.3.1
 Market Version Code:11
+
diff --git a/metadata/com.drodin.tuxrider.txt b/metadata/com.drodin.tuxrider.txt
index 55cd36e6..d12323c7 100644
--- a/metadata/com.drodin.tuxrider.txt
+++ b/metadata/com.drodin.tuxrider.txt
@@ -1,19 +1,20 @@
 Disabled:Ads
 AntiFeatures:Ads
-License:GPLv2+
 Category:Games
+License:GPLv2+
 Web Site:http://tuxrider.drodin.com/
 Source Code:https://github.com/drodin/TuxRider
 Issue Tracker:https://github.com/drodin/TuxRider/issues
+
 Summary:Racing Game
 Description:
 A Tux Racer clone.
 .
+
 Repo Type:git
 Repo:git://github.com/drodin/TuxRider.git
 
 #Build Version:1.0.4 beta,6,67bce39cda321c225bc5
-
-
 Market Version:1.0.9
 Market Version Code:11
+
diff --git a/metadata/com.droidwave.offlinecalendar.txt b/metadata/com.droidwave.offlinecalendar.txt
index 8e250189..c8390ea2 100644
--- a/metadata/com.droidwave.offlinecalendar.txt
+++ b/metadata/com.droidwave.offlinecalendar.txt
@@ -1,18 +1,20 @@
 Disabled:No release available
-Use Built:Yes
+Category:None
 License:MIT
 Web Site:https://bitbucket.org/giszmo/offline-calendar/overview
 Source Code:https://bitbucket.org/giszmo/offline-calendar/src
 Issue Tracker:https://bitbucket.org/giszmo/offline-calendar/issues?status=new&status=open
+
 Summary:Calendar
 Description:
 A calendar application.
 .
+
 Repo Type:hg
 Repo:https://bitbucket.org/giszmo/offline-calendar
 
 #There don't seem to be any developer releases yet
 #There is now a 1.1 in the android market, but no source for it in the repository
-
 Market Version:1.1
 Market Version Code:2
+
diff --git a/metadata/com.eddyspace.networkmonitor.txt b/metadata/com.eddyspace.networkmonitor.txt
index 7102b45d..56dba3ca 100644
--- a/metadata/com.eddyspace.networkmonitor.txt
+++ b/metadata/com.eddyspace.networkmonitor.txt
@@ -1,14 +1,15 @@
-Use Built:Yes
-License:GPLv3+
 Category:System
+License:GPLv3+
 Web Site:http://anetmon.sourceforge.net/
 Source Code:http://sourceforge.net/projects/anetmon/develop
 Issue Tracker:http://sourceforge.net/tracker/?group_id=288036
+
 Summary:Network event logger
 Description:
 Shows various network status information and optionally logs it to a
 CSV file to assist in troubleshooting.
 .
+
 Repo Type:svn
 Repo:https://anetmon.svn.sourceforge.net/svnroot/anetmon/
 
diff --git a/metadata/com.eleybourn.bookcatalogue.txt b/metadata/com.eleybourn.bookcatalogue.txt
index 1405ce75..3b926f79 100644
--- a/metadata/com.eleybourn.bookcatalogue.txt
+++ b/metadata/com.eleybourn.bookcatalogue.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3+
 Category:Office
+License:GPLv3+
 Web Site:http://github.com/eleybourn/Book-Catalogue/wiki
 Source Code:http://github.com/eleybourn/Book-Catalogue
 Issue Tracker:http://github.com/eleybourn/Book-Catalogue/issues
+
 Summary:Book cataloguing application
 Description:
 This is a simple book catalogue application, to store a list of your books. Books can be added either manually, by ISBN, or by barcode.
@@ -11,21 +11,21 @@ This is a simple book catalogue application, to store a list of your books. Book
 
 Repo Type:git
 Repo:git://github.com/eleybourn/Book-Catalogue.git
+
 Build Version:3.0.1,36,b876c6df82c7e195ec5d,patch=percent-in-strings.patch
 Build Version:3.0,35,448858bad8b397974db7,patch=percent-in-strings.patch
-
 Build Version:3.3,47,50379da3ee1f7e95679a
 Build Version:3.3.1,48,!No source - see https://github.com/eleybourn/Book-Catalogue/issues/162/#issue/162/comment/821843
 Build Version:3.4,49,ef03c165bdc34e6be1f6
 Build Version:3.4.2,51,f802cfb067684b78f195
 Build Version:3.5.1,53,52ba5015693ae0b2696e
 Build Version:3.5.6,57,!version code incorrect in source repo - 57 does not exist
-Build Version:3.6,59,0f22f87a308190d74fab,target=android-9
-Build Version:3.6.1,61,75e2f8328ff9a2602fe1,target=android-9
-Build Version:3.6.2,62,da37baecb2c90aa2b306,target=android-9
-Build Version:3.7,68,514799b45d18cf6dbc42065adf08abbdc9e2f16f,target=android-9
-Build Version:3.8,69,bb85065cb6045df773cd681ac8bad55a6818d48a,target=android-9
-Build Version:3.8.1,70,890b6affe8a64,target=android-9
+Build Version:3.6,59,0f22f87a308190d74fab,target=android-10
+Build Version:3.6.1,61,75e2f8328ff9a2602fe1,target=android-10
+Build Version:3.6.2,62,da37baecb2c90aa2b306,target=android-10
+Build Version:3.7,68,514799b45d18cf6dbc42065adf08abbdc9e2f16f,target=android-10
+Build Version:3.8,69,bb85065cb6045df773cd681ac8bad55a6818d48a,target=android-10
+Build Version:3.8.1,70,890b6affe8a64,target=android-10
 
 Market Version:3.8.1
 Market Version Code:70
diff --git a/metadata/com.episode6.android.appalarm.lite.txt b/metadata/com.episode6.android.appalarm.lite.txt
new file mode 100644
index 00000000..cd95aa3a
--- /dev/null
+++ b/metadata/com.episode6.android.appalarm.lite.txt
@@ -0,0 +1,20 @@
+Category:System
+License:GPLv2
+Web Site:http://episode6.wordpress.com/2010/03/27/appalarm/
+Source Code:https://github.com/ghackett/AppAlarm
+Issue Tracker:https://github.com/ghackett/AppAlarm/issues
+
+Summary:App Alarm
+Description:
+Turn any app into an Alarm Clock.
+Schedule any app for anytime.
+.
+
+Repo Type:git
+Repo:https://github.com/ghackett/AppAlarm
+
+Build Version:1.2.6,30,af9d89993212c67bfc510ed082381afc7abcd95a
+
+Market Version:1.2.6
+Market Version Code:30
+
diff --git a/metadata/com.evancharlton.mileage.txt b/metadata/com.evancharlton.mileage.txt
index 6c9efd20..9201f4a4 100644
--- a/metadata/com.evancharlton.mileage.txt
+++ b/metadata/com.evancharlton.mileage.txt
@@ -1,9 +1,10 @@
-Use Built:Yes
-License:Apache2
 Category:Office
+License:Apache2
 Web Site:http://evancharlton.com/projects/mileage/
 Source Code:http://evancharlton.com/projects/mileage/source/
+Issue Tracker:
 Donate:http://evancharlton.com/donate/
+
 Summary:A Mileage tracker
 Description:
 A Mileage tracker for an Android-based phone. Allows importing and
@@ -17,6 +18,6 @@ Repo:http://hg.evancharlton.com/mileage
 Build Version:3.0.0,3000,0766c4f352a5,subdir=trunk,oldsdkloc=yes
 Build Version:3.0.8,3080,!No source in repo
 
-
 Market Version:3.0.8
 Market Version Code:3080
+
diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt
index 26d36925..1447eb47 100644
--- a/metadata/com.example.android.maxpapers.txt
+++ b/metadata/com.example.android.maxpapers.txt
@@ -1,18 +1,20 @@
-License:EPL
 Category:System
+License:EPL
 Web Site:http://code.google.com/p/lcarswallpaper/
 Source Code:http://code.google.com/p/lcarswallpaper/source/checkout
 Issue Tracker:http://code.google.com/p/lcarswallpaper/issues/list
+
 Summary:LCARS live wallpaper
 Description:
 Star Trek LCARS themed live wallpaper for Android 2.1+ devices that shows
 various system information.
 .
+
 Repo Type:svn
 Repo:http://lcarswallpaper.googlecode.com/svn/trunk/lcarswallpaper
-Use Built:Yes
 
 # The manifest has no version code, so let's use the SVN revision number.
 Build Version:1.0.2,35,35,\
 prebuild=sed -i -r 's/(android:versionName)/android:versionCode="35" \1/' \
  AndroidManifest.xml
+
diff --git a/metadata/com.example.weightchart.txt b/metadata/com.example.weightchart.txt
index cbc69bb8..c7708b24 100644
--- a/metadata/com.example.weightchart.txt
+++ b/metadata/com.example.weightchart.txt
@@ -1,17 +1,18 @@
-Use Built:Yes
-License:GPLv3
+Disabled: Doesn't built at the moment.
 Category:Office
+License:GPLv3
 Web Site:https://launchpad.net/weightchart
 Source Code:https://code.launchpad.net/~rheo/weightchart/trunk
 Issue Tracker:https://bugs.launchpad.net/weightchart
+
 Summary:Logs your body weight
-Disabled: Doesn't built at the moment.
 Description:
 Keep a personal log of body weight and display as a chart.
 
 .
+
 Repo Type:bzr
 Repo:lp:weightchart
+
 Build Version:1,1,1,target=8
 
-
diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index c0cb61f4..05d636ff 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -1,8 +1,9 @@
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:http://code.google.com/p/k9mail/
 Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list
+
 Summary:Full-featured email client
 Description:
 Email client supporting multiple accounts, POP3, IMAP, Push IMAP. Packed with
@@ -14,6 +15,7 @@ Repo:https://github.com/k9mail/k-9.git
 
 #Note - k9 is currently developer's binary only
 #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10
+Update Check Mode:Market
+Market Version:4.003
+Market Version Code:14021
 
-Market Version:4.002
-Market Version Code:14020
diff --git a/metadata/com.funambol.androidsync.txt b/metadata/com.funambol.androidsync.txt
index f9d82274..ae8ff80a 100644
--- a/metadata/com.funambol.androidsync.txt
+++ b/metadata/com.funambol.androidsync.txt
@@ -1,19 +1,20 @@
-Use Built:Yes
-License:AGPLv3
 Category:Office
+License:AGPLv3
 Web Site:http://www.funambol.com
 Source Code:https://android-client.forge.funambol.org/source/browse/android-client/
 Issue Tracker:
+
 Summary:Funambol sync client
-Description:Sync Client
+Description:
 Funambol sync client.
 .
+
 Repo Type:svn
 Repo:guest:x@https://android-client.forge.funambol.org/svn/android-client/
 
 Build Version:8.7.3,8,1032,subdir=tags/8.7.3,update=no,initfun=yes
 Build Version:9.0.1,9,1437,subdir=tags/9.0.1,update=no,initfun=yes
-Build Version:9.0.3,10,1546,subdir=tags/9.0.3,update=no,initfun=yes
+Build Version:9.0.3,10,1547,subdir=tags/9.0.3,update=no,initfun=yes
 Build Version:10.0.4,14,2162,subdir=tags/10.0.4,update=no,initfun=yes
 Build Version:10.0.5,15,2211,subdir=tags/10.0.5,update=no,initfun=yes
 Build Version:10.0.6,16,2337,subdir=tags/10.0.6,update=no,initfun=yes
@@ -23,7 +24,6 @@ Build Version:10.0.6,16,2337,subdir=tags/10.0.6,update=no,initfun=yes
 #Source is now accessible, but the build is failing without an obvious error.
 #Need to look at this again.
 #Build Version:10.0.7,17,2671,subdir=tags/10.0.7,update=no,initfun=yes
-
-
 Market Version:10.0.7
 Market Version Code:17
+
diff --git a/metadata/com.ghostsq.commander.txt b/metadata/com.ghostsq.commander.txt
index b4becd21..d1dd16e2 100644
--- a/metadata/com.ghostsq.commander.txt
+++ b/metadata/com.ghostsq.commander.txt
@@ -1,8 +1,9 @@
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
 Source Code:http://sourceforge.net/projects/ghostcommander/develop
 Issue Tracker:http://sourceforge.net/tracker/?group_id=311417
+
 Summary:Dual-panel file manager
 Description:
 Dual panel file manager, like Norton Commander, Midnight Commander or
@@ -14,18 +15,18 @@ files to/from FTP servers and SMB network shares (with plug-in). It
 given root privileges, it offers additional functionality, such as
 remounting filesystems.
 .
+
 Repo Type:svn
 Repo:https://ghostcommander.svn.sourceforge.net/svnroot/ghostcommander
-Use Built:Yes
 
 Build Version:1.35.1b5,97,141,\
 prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
-
 # All commit messages are empty, so I'm just guessing the revision.
 Build Version:1.35,94,131,\
 prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
 Build Version:1.36.4,110,161,\
 prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
 
-Market Version:1.39.2
-Market Version Code:152
+Market Version:1.39.3
+Market Version Code:154
+
diff --git a/metadata/com.gluegadget.hndroid.txt b/metadata/com.gluegadget.hndroid.txt
index 0b614e77..4f9e1cdc 100644
--- a/metadata/com.gluegadget.hndroid.txt
+++ b/metadata/com.gluegadget.hndroid.txt
@@ -1,7 +1,15 @@
 Disabled:No license - it's "Open Source" whatever that means
+Category:Internet
+License:Unknown
 Web Site:http://gluegadget.com/hndroid/
 Source Code:https://github.com/amir/HNdroid
-Category:Internet
+Issue Tracker:
+
+Summary:
+Description:
+No description available
+.
 
 Market Version:0.4
 Market Version Code:5
+
diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index e4bbdc42..b292131f 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -1,13 +1,14 @@
-Use Built:Yes
-License:GPLv2
 Category:System
+License:GPLv2
 Web Site:http://diskusage.googlecode.com/
 Source Code:http://code.google.com/p/diskusage/source/checkout
 Issue Tracker:http://code.google.com/p/diskusage/issues/list
+
 Summary:Visual disk usage explorer
 Description:
 Visually explore used and free space on internal and external storage.
 .
+
 Repo Type:svn
 Repo:http://diskusage.googlecode.com/svn/trunk/
 
@@ -22,3 +23,4 @@ Build Version:3.2,3020,69,prebuild=mkdir libs && cp extra/system.jar libs/
 
 Market Version:3.2
 Market Version Code:3020
+
diff --git a/metadata/com.google.android.maps.mytracks.txt b/metadata/com.google.android.maps.mytracks.txt
index 5a6f181a..9fc683d9 100644
--- a/metadata/com.google.android.maps.mytracks.txt
+++ b/metadata/com.google.android.maps.mytracks.txt
@@ -1,11 +1,11 @@
 Disabled:Needs google maps API key, and some build problems resolving
-Use Built:Yes
-License:Apache2
 AntiFeatures:NonFreeDep
 Category:Navigation
+License:Apache2
 Web Site:http://code.google.com/p/mytracks/
 Source Code:http://code.google.com/p/mytracks/source/checkout
 Issue Tracker:http://code.google.com/p/mytracks/issues/list
+
 Summary:A GPS logger.
 Description:
 MyTracks is a GPS logger.
@@ -15,12 +15,11 @@ Repo Type:hg
 Repo:https://mytracks.googlecode.com/hg/
 
 Build Version:1.1.0,23,a86a640f2d,subdir=MyTracks
-
 Build Version:1.1.3,26,!Doesn't build - needs dependencies building now I think
-#Build Version:1.1.3,26,62821d45032d,subdir=MyTracks,target=android-9,encoding=utf-8
 
+#Build Version:1.1.3,26,62821d45032d,subdir=MyTracks,target=android-10,encoding=utf-8
 #Still doesn't build...
 #Build Version:1.1.9,22,v1.1.9,subdir=MyTracks,encoding=utf-8,target=android-13
-
 Market Version:1.1.13
 Market Version Code:36
+
diff --git a/metadata/com.google.code.appsorganizer.txt b/metadata/com.google.code.appsorganizer.txt
index 845ff244..24c186ca 100644
--- a/metadata/com.google.code.appsorganizer.txt
+++ b/metadata/com.google.code.appsorganizer.txt
@@ -1,9 +1,10 @@
-License:GPLv3+
 Category:System
+License:GPLv3+
 Web Site:http://sites.google.com/site/appsorganizer/
 Source Code:http://code.google.com/p/appsorganizer/source/checkout
 Issue Tracker:http://code.google.com/p/appsorganizer/issues/list
 Donate:http://sites.google.com/site/appsorganizer/donate
+
 Summary:Organize applications using labels
 Description:
 Apps Organizer allows you to organize installed applications using
@@ -18,7 +19,8 @@ Build Version:1.5.14,162,184,subdir=AppsOrganizer
 Build Version:1.5.15,163,185,subdir=AppsOrganizer
 Build Version:1.5.16,164,187,subdir=AppsOrganizer
 Build Version:1.5.18,166,190,subdir=AppsOrganizer
-Build Version:1.5.19,167,191,subdir=AppsOrganizer,target=android-9
+Build Version:1.5.19,167,191,subdir=AppsOrganizer,target=android-10
 
 Market Version:1.5.19
 Market Version Code:167
+
diff --git a/metadata/com.google.zxing.client.android.txt b/metadata/com.google.zxing.client.android.txt
index 1937c1b9..36d1ec81 100644
--- a/metadata/com.google.zxing.client.android.txt
+++ b/metadata/com.google.zxing.client.android.txt
@@ -1,8 +1,9 @@
-License:Apache2
 Category:Multimedia
+License:Apache2
 Web Site:http://code.google.com/p/zxing/
 Source Code:http://code.google.com/p/zxing/source/checkout
 Issue Tracker:http://code.google.com/p/zxing/issues/list
+
 Summary:Barcode scanner
 Description:
 Barcode scanner from ZXing.
@@ -10,3 +11,4 @@ Barcode scanner from ZXing.
 
 Market Version:3.72
 Market Version Code:76
+
diff --git a/metadata/com.googlecode.androidcells.txt b/metadata/com.googlecode.androidcells.txt
index 77170f67..97161910 100644
--- a/metadata/com.googlecode.androidcells.txt
+++ b/metadata/com.googlecode.androidcells.txt
@@ -1,11 +1,9 @@
-
-Use Built:Yes
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://openbmap.org
 Source Code:http://sourceforge.net/scm/?type=git&group_id=218065
 Issue Tracker:http://sourceforge.net/tracker/?group_id=218065
-Donate:
+
 Summary:OpenBMap Data Contribution
 Description:
 Provides the ability to record cellular and WiFi locations and upload them
@@ -15,8 +13,9 @@ to the OpenBMap database. See http://openbmap.org.
 Repo Type:git
 Repo:git://myposition.git.sourceforge.net/gitroot/myposition/AndroidClient
 
-Build Version:0.4.96,9,bc15ce80024d7f53897fd10e6ea0cc914d0ba226,prebuild=mv lib libs,target=android-9
+Build Version:0.4.96,9,bc15ce80024d7f53897fd10e6ea0cc914d0ba226,prebuild=mv lib libs,target=android-10
 Build Version:0.4.991,13,!Source is not there - see https://sourceforge.net/tracker/?func=detail&aid=3374951&group_id=218065&atid=1043257
 
 Market Version:0.4.991
 Market Version Code:13
+
diff --git a/metadata/com.googlecode.chartdroid.txt b/metadata/com.googlecode.chartdroid.txt
index 97827d95..fe72a2e1 100644
--- a/metadata/com.googlecode.chartdroid.txt
+++ b/metadata/com.googlecode.chartdroid.txt
@@ -1,8 +1,9 @@
-License:Apache2
 Category:Multimedia
+License:Apache2
 Web Site:http://code.google.com/p/chartdroid/
 Source Code:http://code.google.com/p/chartdroid/source/checkout
 Issue Tracker:http://code.google.com/p/chartdroid/issues/list
+
 Summary:Chart engine
 Description:
 ChartDroid is an Intent-based "library application" for static chart and
@@ -10,9 +11,12 @@ graph generation on Android. Other applications can use it to
 graph/plot/display numerical data in many representations by implementing a
 ContentProvider.
 .
+
 Repo Type:svn
 Repo:http://chartdroid.googlecode.com/svn/trunk/core
+
 Build Version:2.0.0,18,294
-Use Built:Yes
+
 Market Version:2.0.0
 Market Version Code:18
+
diff --git a/metadata/com.googlecode.droidwall.txt b/metadata/com.googlecode.droidwall.txt
index d959bc3e..45e71479 100644
--- a/metadata/com.googlecode.droidwall.txt
+++ b/metadata/com.googlecode.droidwall.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
 Category:System
 License:GPLv3
 Web Site:http://code.google.com/p/droidwall/
 Source Code:http://code.google.com/p/droidwall/source/checkout
 Issue Tracker:http://code.google.com/p/droidwall/issues/list
+
 Summary:Firewall
 Description:
 A Firewall frontend based on iptables
@@ -11,7 +11,6 @@ A Firewall frontend based on iptables
 NOTE: Root access is required to use this application.
 .
 
-
 Requires Root:Yes
 
 Repo Type:svn
@@ -23,6 +22,6 @@ Build Version:1.4.8,148,156
 Build Version:1.5.3,153,219
 Build Version:1.5.6,156,245,target=android-8
 
-
 Market Version:1.5.6
 Market Version Code:156
+
diff --git a/metadata/com.googlecode.talkmyphone.txt b/metadata/com.googlecode.talkmyphone.txt
index dbc55262..89c6e7f8 100644
--- a/metadata/com.googlecode.talkmyphone.txt
+++ b/metadata/com.googlecode.talkmyphone.txt
@@ -1,13 +1,16 @@
-License:LGPL
 Category:System
+License:LGPL
 Web Site:http://code.google.com/p/talkmyphone/
 Source Code:http://code.google.com/p/talkmyphone/source/checkout
 Issue Tracker:http://code.google.com/p/talkmyphone/issues/list
+
 Summary:Remote control of phone by XMPP
 Description:
 Allows you to send commands to your device remotely, via the XMPP protocol.
 You can also receive information, such as incoming calls and SMS, and
 battery state.
 .
+
 Market Version:2.06-beta
 Market Version Code:17
+
diff --git a/metadata/com.gpl.rpg.AndorsTrail.txt b/metadata/com.gpl.rpg.AndorsTrail.txt
index 4e9c4f13..5f3b7096 100644
--- a/metadata/com.gpl.rpg.AndorsTrail.txt
+++ b/metadata/com.gpl.rpg.AndorsTrail.txt
@@ -1,9 +1,10 @@
-Name:Andor's Trail
+Category:Games
 License:GPLv2
 Web Site:http://andors.techby2guys.com/
 Source Code:http://code.google.com/p/andors-trail/
 Issue Tracker:http://code.google.com/p/andors-trail/issues/list
-Category:Games
+
+Name:Andor's Trail
 Summary:Quest-driven Roguelike fantasy dungeon crawler RPG.
 Description:
 Quest-driven Roguelike fantasy dungeon crawler RPG with a powerful story.
@@ -26,3 +27,4 @@ Build Version:0.6.10,25,192,subdir=AndorsTrail
 
 Market Version:0.6.10
 Market Version Code:25
+
diff --git a/metadata/com.ichi2.anki.txt b/metadata/com.ichi2.anki.txt
index 5e688e07..b4450fe7 100644
--- a/metadata/com.ichi2.anki.txt
+++ b/metadata/com.ichi2.anki.txt
@@ -3,6 +3,7 @@ License:GPLv3
 Web Site:https://code.google.com/p/ankidroid/wiki/Index
 Source Code:http://github.com/nicolas-raoul/Anki-Android/
 Issue Tracker:http://code.google.com/p/ankidroid/issues
+
 Summary:A flashcard-based study aid
 Description:
 Anki is a program which makes remembering things easy. Because it is a lot more
@@ -19,7 +20,7 @@ Repo:git://github.com/nicolas-raoul/Anki-Android.git
 #Build Version:0.5.1,19,!There is a v0.5.1 tag but the version code is not right
 Build Version:0.6,20,f26b7662ae9db9a92d21
 Build Version:0.7,21,v0.7
-Build Version:1.0,22,v1.0
+Build Version:1.0,22,v1.0,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
 
 Market Version:1.0
 Market Version Code:23
diff --git a/metadata/com.integralblue.callerid.txt b/metadata/com.integralblue.callerid.txt
index 1f2dc88a..5df7200d 100644
--- a/metadata/com.integralblue.callerid.txt
+++ b/metadata/com.integralblue.callerid.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
 Category:System
 License:GPLv3
 Web Site:http://candrews.integralblue.com/2011/04/my-first-android-app-callerid/
 Source Code:https://gitorious.org/callerid-for-android
 Issue Tracker:
-Donate:
+
 Summary:Provides caller ID
 Description:
 Uses a web service to provide information about an incoming caller based on
@@ -16,6 +15,6 @@ Repo:git://gitorious.org/callerid-for-android/mainline.git
 
 #Disabled pending figuring out how to stop it zipaligning....
 #Build Version:1.0,1,e6d5a9ac4bb24ae3866a0782f2b23d1f18eb2266,subdir=application,maven=yes,bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar -Dfile=osmdroid-android-3.0.3.jar
-
 Market Version:1.3
 Market Version Code:4
+
diff --git a/metadata/com.jadn.cc.txt b/metadata/com.jadn.cc.txt
new file mode 100644
index 00000000..d5ac2b66
--- /dev/null
+++ b/metadata/com.jadn.cc.txt
@@ -0,0 +1,25 @@
+Category:Multimedia
+License:MIT
+Web Site:http://jadn.com/carcast/
+Source Code:http://github.com/bherrmann7/Car-Cast/
+Issue Tracker:https://github.com/bherrmann7/Car-Cast/issues
+Donate:https://market.android.com/details?id=com.jadn.ccpro
+
+Summary:A podcast downloader and player.
+Description:
+Car Cast is a simple audio podcast downloader and player.
+Optimized for use in a daily commute, it features big buttons, large text, remembers last played location.
+
+1. Subscribe to podcasts
+2. Download podcasts (stored on flash card)
+3. Playback in car/gym (no network needed)
+.
+
+Repo Type:git
+Repo:git://github.com/bherrmann7/Car-Cast.git
+
+Build Version:1.0.129,129,7a879c6bfa51b5d80401b84e031bf4ff2981bb8c,subdir=cc,target=android-8,rm=cc/libs/admob-sdk-android.jar,patch=admob.patch
+
+Market Version:1.0.129
+Market Version Code:129
+
diff --git a/metadata/com.jadn.cc/admob.patch b/metadata/com.jadn.cc/admob.patch
new file mode 100644
index 00000000..98b9311e
--- /dev/null
+++ b/metadata/com.jadn.cc/admob.patch
@@ -0,0 +1,105 @@
+diff --git a/cc/AndroidManifest.xml b/cc/AndroidManifest.xml
+index d2a8dc2..a81106b 100644
+--- a/cc/AndroidManifest.xml
++++ b/cc/AndroidManifest.xml
+@@ -10,16 +10,6 @@
+ 				<category android:name="android.intent.category.LAUNCHER" />
+ 			</intent-filter>
+ 		</activity>
+-		<activity android:name="com.admob.android.ads.AdMobActivity"
+-			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+-			android:configChanges="orientation|keyboard|keyboardHidden" />
+-
+-		<receiver android:name="com.admob.android.ads.analytics.InstallReceiver"
+-			android:exported="true">
+-			<intent-filter>
+-				<action android:name="com.android.vending.INSTALL_REFERRER" />
+-			</intent-filter>
+-		</receiver>
+ 
+ 		<activity android:name=".ui.AudioRecorder"></activity>
+ 		<activity android:name=".ui.Downloader"
+diff --git a/cc/res/layout-land/player.xml b/cc/res/layout-land/player.xml
+index 0c2e9ed..f9ef3a3 100644
+--- a/cc/res/layout-land/player.xml
++++ b/cc/res/layout-land/player.xml
+@@ -4,11 +4,6 @@
+ 	android:layout_width="fill_parent" android:background="#000"
+ 	android:layout_height="fill_parent" android:padding="0dip">
+ 
+-	<com.admob.android.ads.AdView android:id="@+id/ad"
+-	android:layout_width="fill_parent" android:layout_height="48dip"
+-	myapp:backgroundColor="#FF0000" myapp:primaryTextColor="#FFFFFF"
+-		myapp:secondaryTextColor="#CCCCCC" android:layout_alignParentTop="true"/>
+-
+ 	<ImageButton android:id="@+id/previous"
+ 		android:layout_height="43dip" android:layout_width="65dip"
+ 		android:src="@drawable/player_65_previous" android:layout_alignParentLeft="true"
+@@ -59,7 +54,7 @@
+ 		android:layout_width="fill_parent" android:singleLine="true"
+ 		android:ellipsize="none" android:textColor="#000" android:layout_x="0dip"
+ 		android:text="" android:background="#c7cbd7"
+-		android:layout_below="@id/ad" android:layout_height="35dip" />
++		android:layout_alignParentTop="true" android:layout_height="35dip" />
+ 
+ 	<TextView android:textSize="20dp" android:id="@+id/title"
+ 		android:layout_width="fill_parent" android:layout_height="110dip"
+diff --git a/cc/res/layout/player.xml b/cc/res/layout/player.xml
+index 0cbcda3..ff7ecc9 100644
+--- a/cc/res/layout/player.xml
++++ b/cc/res/layout/player.xml
+@@ -4,11 +4,6 @@
+ 	android:layout_width="fill_parent" android:background="#000"
+ 	android:layout_height="fill_parent" android:padding="0dip">
+ 
+-	<com.admob.android.ads.AdView android:id="@+id/ad"
+-	android:layout_width="fill_parent" android:layout_height="48dip"
+-	myapp:backgroundColor="#FF0000" myapp:primaryTextColor="#FFFFFF"
+-		myapp:secondaryTextColor="#CCCCCC" android:layout_alignParentTop="true"/>
+-
+ 	<ImageButton android:id="@+id/previous"
+ 		android:layout_height="70dip" android:layout_width="64dip"
+ 		android:src="@drawable/player_65_previous" android:layout_alignParentLeft="true"
+@@ -62,7 +57,7 @@
+ 		android:layout_width="fill_parent" android:singleLine="true"
+ 		android:ellipsize="none" android:textColor="#000" android:layout_x="0dip"
+ 		android:text="" android:background="#c7cbd7"
+-		android:layout_below="@id/ad" android:layout_height="35dip" />
++		android:layout_alignParentTop="true" android:layout_height="35dip" />
+ 
+ 	<TextView android:textSize="20dp" android:id="@+id/title"
+ 		android:layout_width="fill_parent" android:layout_height="110dip"
+diff --git a/cc/res/values/attrs.xml b/cc/res/values/attrs.xml
+index 20298af..045e125 100644
+--- a/cc/res/values/attrs.xml
++++ b/cc/res/values/attrs.xml
+@@ -1,10 +1,3 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <resources>
+-	<declare-styleable name="com.admob.android.ads.AdView">
+-		<attr name="backgroundColor" format="color" />
+-		<attr name="primaryTextColor" format="color" />
+-		<attr name="secondaryTextColor" format="color" />
+-		<attr name="keywords" format="string" />
+-		<attr name="refreshInterval" format="integer" />
+-	</declare-styleable>
+ </resources>
+diff --git a/cc/res/xml/settings.xml b/cc/res/xml/settings.xml
+index 11e40e5..38be7a4 100644
+--- a/cc/res/xml/settings.xml
++++ b/cc/res/xml/settings.xml
+@@ -34,10 +34,10 @@
+ 		android:key="canCollectData" 
+ 		android:title="Allow data collection" 
+ 		android:summary="Data helps us improve" 
+-		android:defaultValue="true" />
++		android:defaultValue="false" />
+ 	<CheckBoxPreference 
+ 		android:key="emailSecret" 
+ 		android:title="Keep email address secret" 
+ 		android:summary="Used for internal tracking only" 
+-		android:defaultValue="false" />
+-</PreferenceScreen>
+\ No newline at end of file
++		android:defaultValue="true" />
++</PreferenceScreen>
diff --git a/metadata/com.kirit.android.mintercept.txt b/metadata/com.kirit.android.mintercept.txt
index a33b668a..a34a2713 100644
--- a/metadata/com.kirit.android.mintercept.txt
+++ b/metadata/com.kirit.android.mintercept.txt
@@ -1,12 +1,15 @@
-License:GPLv3+
 Category:Games
+License:GPLv3+
 Web Site:http://www.kirit.com/Missile%20intercept
 Source Code:http://www.kirit.com/Missile%20intercept
 Issue Tracker:http://support.felspar.com/Project:/Missile%20intercept
+
 Summary:Missile Command style game
 Description:
 A game in the style of the classic Missile Command. Defend your cities from incoming
 enemy missiles.
 .
+
 Market Version:0.5.1
 Market Version Code:6
+
diff --git a/metadata/com.kmagic.solitaire.txt b/metadata/com.kmagic.solitaire.txt
index 4ea3a534..6509c27e 100644
--- a/metadata/com.kmagic.solitaire.txt
+++ b/metadata/com.kmagic.solitaire.txt
@@ -1,15 +1,16 @@
-Use Built:Yes
 Category:Games
 License:Apache2
 Web Site:http://code.google.com/p/solitaire-for-android/
 Source Code:http://code.google.com/p/solitaire-for-android/source/checkout
 Issue Tracker:http://code.google.com/p/solitaire-for-android/issues/list
+
 Summary:Solitaire collection
 Description:
 Solitaire Collection of Klondike (Regular solitaire), Spider Solitaire,
 and Freecell using the touchscreen interface. Features include multi-level
 undo, animated card movement, and statistic/score tracking.
 .
+
 Repo Type:svn
 Repo:http://solitaire-for-android.googlecode.com/svn/trunk/
 
@@ -17,3 +18,4 @@ Build Version:1.12.2,450,30,target=android-8
 
 Market Version:1.12.2
 Market Version Code:450
+
diff --git a/metadata/com.lecz.android.tiltmazes.txt b/metadata/com.lecz.android.tiltmazes.txt
index ff22423a..7ba74c25 100644
--- a/metadata/com.lecz.android.tiltmazes.txt
+++ b/metadata/com.lecz.android.tiltmazes.txt
@@ -1,8 +1,9 @@
-License:BSD
 Category:Games
+License:BSD
 Web Site:http://code.google.com/p/tiltmazes/
 Source Code:http://code.google.com/p/tiltmazes/source/checkout
 Issue Tracker:http://code.google.com/p/tiltmazes/issues/list
+
 Summary:Logical puzzle game
 Description:
 A ball sits in a flat tray containing one or more squares (goals). The challenge is
@@ -10,5 +11,7 @@ to guide the ball around the tray and collect all the squares. Tilt the tray to,
 literally, start the ball rolling. The ball rolls in a straight line until it hits
 a wall, you can then tilt again. 
 .
+
 Market Version:1.2
 Market Version Code:3
+
diff --git a/metadata/com.liato.bankdroid.txt b/metadata/com.liato.bankdroid.txt
index 2e0d0dd8..4d32fd91 100644
--- a/metadata/com.liato.bankdroid.txt
+++ b/metadata/com.liato.bankdroid.txt
@@ -1,14 +1,15 @@
-Use Built:Yes
 Category:Office
 License:Apache2
 Web Site:http://www.swedroid.se/forum/showthread.php?t=11108
 Source Code:https://github.com/liato/android-bankdroid
 Issue Tracker:https://github.com/liato/android-bankdroid/issues
+
 Summary:Banking application for Swedish banks
 Description:
 Checks your account balance at any of the major Swedish banks and can
 display notifications on changes. Includes a widget.
 .
+
 Repo Type:git
 Repo:https://github.com/liato/android-bankdroid.git
 
@@ -20,7 +21,6 @@ Build Version:1.6.3,102,612aae755a82008f44a6,encoding=utf-8,prebuild=mkdir libs
     unzip -j guava-r08.zip guava-r08/guava-r08.jar && \
     rm *.zip && \
     cd ..
-
 Build Version:1.7.2,110,fec08e34a157a3e0b455,encoding=utf-8,prebuild=mkdir libs && \
     cd libs && \
     wget http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.zip && \
@@ -29,9 +29,7 @@ Build Version:1.7.2,110,fec08e34a157a3e0b455,encoding=utf-8,prebuild=mkdir libs
     unzip -j guava-r08.zip guava-r08/guava-r08.jar && \
     rm *.zip && \
     cd ..
-
 Build Version:1.7.3,115,!a08cab7e66c70e7b0f5c but wrong version code in repo
-
 Build Version:1.8.0,120,899e4b957e512bf55254,encoding=utf-8,prebuild=mkdir libs && \
     cd libs && \
     wget http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.zip && \
@@ -51,10 +49,9 @@ Build Version:1.8.0,120,899e4b957e512bf55254,encoding=utf-8,prebuild=mkdir libs
 #    unzip -j guava-r08.zip guava-r08/guava-r08.jar && \
 #    rm *.zip && \
 #    cd ..
-
 #Build fails on this version, same as previous version:
 # res/values/styles.xml:62: error: Error retrieving parent for item: No resource found that matches the given name 'android:WindowTitleBackground'
-#Build Version:1.8.1,121,9f626b0dedb01cb90a16fb127a041c5f3dd1c579,target=android-9,encoding=utf-8,prebuild=mkdir libs && \
+#Build Version:1.8.1,121,9f626b0dedb01cb90a16fb127a041c5f3dd1c579,target=android-10,encoding=utf-8,prebuild=mkdir libs && \
 #    cd libs && \
 #    wget http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.zip && \
 #    unzip -j commons-io-2.0.1-bin.zip commons-io-2.0.1/commons-io-2.0.1.jar && \
@@ -62,7 +59,6 @@ Build Version:1.8.0,120,899e4b957e512bf55254,encoding=utf-8,prebuild=mkdir libs
 #    unzip -j guava-r08.zip guava-r08/guava-r08.jar && \
 #    rm *.zip && \
 #    cd ..
-
 Market Version:1.8.4
 Market Version Code:125
 
diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt
index 760156f3..29424609 100644
--- a/metadata/com.madgag.agit.txt
+++ b/metadata/com.madgag.agit.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Development
+License:GPLv3
 Web Site:https://github.com/rtyley/agit
 Source Code:https://github.com/rtyley/agit
 Issue Tracker:https://github.com/rtyley/agit/issues
-Donate:
+
 Summary:A git client
 Description:
 A git client - currently read-only.
@@ -16,3 +15,4 @@ Repo:https://github.com/rtyley/agit.git
 #No builds yet - another 'need to figure out how to make maven work' scenario
 Market Version:1.25
 Market Version Code:110900321
+
diff --git a/metadata/com.martynhaigh.violin.txt b/metadata/com.martynhaigh.violin.txt
index 496cce17..46f9a335 100644
--- a/metadata/com.martynhaigh.violin.txt
+++ b/metadata/com.martynhaigh.violin.txt
@@ -1,12 +1,15 @@
 Disabled:See license
-License:Unknown
 Category:Games
+License:Unknown
 Web Site:http://github.com/martynhaigh/Tiny-Open-Source-Violin
 Source Code:http://github.com/martynhaigh/Tiny-Open-Source-Violin
 Issue Tracker:http://github.com/martynhaigh/Tiny-Open-Source-Violin
+
 Summary:A tiny open source violin
 Description:
 The world's tiniest open source violin.
 .
+
 Market Version:1.3
 Market Version Code:9
+
diff --git a/metadata/com.matburt.mobileorg.txt b/metadata/com.matburt.mobileorg.txt
index 17f04615..9d1777c8 100644
--- a/metadata/com.matburt.mobileorg.txt
+++ b/metadata/com.matburt.mobileorg.txt
@@ -1,8 +1,9 @@
-License:GPLv2
 Category:Office
+License:GPLv2
 Web Site:https://github.com/matburt/mobileorg-android/wiki
-Issue Tracker:https://github.com/matburt/mobileorg-android/issues
 Source Code:https://github.com/matburt/mobileorg-android
+Issue Tracker:https://github.com/matburt/mobileorg-android/issues
+
 Summary:TODO/task management application
 Description:
 TODO/task management based on emacs org-mode files.
@@ -13,6 +14,6 @@ Repo:https://github.com/matburt/mobileorg-android.git
 
 #Needs dropbox consumer key
 #Build Version:0.5.2,51,38dfe967ee99c71b12b8
+Market Version:0.7.1
+Market Version Code:71
 
-Market Version:0.6.2
-Market Version Code:62
diff --git a/metadata/com.mobilepearls.sokoban.txt b/metadata/com.mobilepearls.sokoban.txt
index 5c42daea..bb1d2d35 100644
--- a/metadata/com.mobilepearls.sokoban.txt
+++ b/metadata/com.mobilepearls.sokoban.txt
@@ -1,16 +1,19 @@
-Use Built:Yes
-License:GPLv2
 Category:Games
+License:GPLv2
 Web Site:http://mobilepearls.com
 Source Code:https://github.com/mobilepearls/com.mobilepearls.sokoban
 Issue Tracker:https://github.com/mobilepearls/com.mobilepearls.sokoban/issues
+
 Summary:A Sokoban game for Android
 Description:
 A puzzle game.
 .
+
 Repo Type:git
 Repo:https://github.com/mobilepearls/com.mobilepearls.sokoban.git
+
 Build Version:1.11,12,48e1976f9d9881adb70e
 
 Market Version:1.11
 Market Version Code:12
+
diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt
index 3527acfd..51214d9c 100644
--- a/metadata/com.morphoss.acal.txt
+++ b/metadata/com.morphoss.acal.txt
@@ -1,10 +1,10 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:http://acal.me
 Source Code:http://gitorious.org/acal
 Issue Tracker:
 Donate:http://acal.me/wiki/Donating
+
 Summary:Calendar - CalDAV client
 Description:
 A CalDAV client, allowing you to directly access a calendar on a CalDAV
@@ -25,6 +25,8 @@ Build Version:1.3),32,r1.3,target=android-8
 Build Version:1.31,33,r1.31,target=android-8
 Build Version:1.32,34,r1.32,target=android-8
 Build Version:1.33,35,r1.33,target=android-8
+Build Version:1.34,36,r1.34,target=android-8
+
+Market Version:1.35
+Market Version Code:37
 
-Market Version:1.33
-Market Version Code:35
diff --git a/metadata/com.mp3tunes.android.player.txt b/metadata/com.mp3tunes.android.player.txt
index 84b62b29..89c8d54e 100644
--- a/metadata/com.mp3tunes.android.player.txt
+++ b/metadata/com.mp3tunes.android.player.txt
@@ -1,9 +1,10 @@
-Use Built:Yes
-License:GPLv3+
+AntiFeatures:NonFreeNet
 Category:Multimedia
+License:GPLv3+
 Web Site:http://code.google.com/p/mp3tunes/
 Source Code:http://code.google.com/p/mp3tunes/source/browse/
 Issue Tracker:http://androidmp3.uservoice.com/
+
 Summary:Client for listening to music stored in an MP3tunes locker
 Description:
 MP3tunes is a music storage service, where users can upload their music files and stream them from anywhere. 
@@ -16,7 +17,6 @@ Repo:https://mp3tunes.googlecode.com/hg/
 Build Version:3.7,89,ba4550305733,target=android-4,fixapos=yes
 Build Version:5.1,92,!No source in repo
 
-AntiFeatures:NonFreeNet
-
 Market Version:5.1
 Market Version Code:92
+
diff --git a/metadata/com.namelessdev.mpdroid.txt b/metadata/com.namelessdev.mpdroid.txt
index 3d7d9bd6..0925f42d 100644
--- a/metadata/com.namelessdev.mpdroid.txt
+++ b/metadata/com.namelessdev.mpdroid.txt
@@ -1,17 +1,16 @@
 Disabled:Doesn't build for me
-#build/com.namelessdev.mpdroid/MPDroid/res/values/styles.xml:18: error: Error retrieving parent for item: No resource found that matches the given name '@android:style/Widget.Holo.ActionBar'.
-
-License:Apache2
 Category:Multimedia
+#build/com.namelessdev.mpdroid/MPDroid/res/values/styles.xml:18: error: Error retrieving parent for item: No resource found that matches the given name '@android:style/Widget.Holo.ActionBar'.
+License:Apache2
 Web Site:https://github.com/dreamteam69/dmix
 Source Code:https://github.com/dreamteam69/dmix
 Issue Tracker:https://github.com/dreamteam69/dmix/issues
+
 Summary:MPD client
 Description:
 An MPD client which supports streaming. Can fetch cover art from last.fm.
 .
 
-
 Repo Type:git
 Repo:https://github.com/dreamteam69/dmix.git
 
@@ -21,3 +20,4 @@ cd ../JMPDComm/ && ant && mkdir ../MPDroid/libs/ && cp ../JMPDComm/JMPDComm.jar
 
 Market Version:0.7
 Market Version Code:18
+
diff --git a/metadata/com.nephoapp.anarxiv.txt b/metadata/com.nephoapp.anarxiv.txt
index 82042771..3315f0d5 100644
--- a/metadata/com.nephoapp.anarxiv.txt
+++ b/metadata/com.nephoapp.anarxiv.txt
@@ -1,11 +1,14 @@
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:http://www.nephoapp.com/
 Source Code:https://github.com/nephoapp/anarxiv
 Issue Tracker:
+
 Summary:arxiv.org client
 Description:
 Browse papers released on arxiv.org
 .
+
 Market Version:0.3
 Market Version Code:3
+
diff --git a/metadata/com.nexes.manager.txt b/metadata/com.nexes.manager.txt
index 69a5c688..a9754a59 100644
--- a/metadata/com.nexes.manager.txt
+++ b/metadata/com.nexes.manager.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3+
 Category:System
+License:GPLv3+
 Web Site:http://github.com/nexes/Android-File-Manager
 Source Code:http://github.com/nexes/Android-File-Manager
 Issue Tracker:http://github.com/nexes/Android-File-Manager/issues
+
 Summary:A simple file browser and manager
 Description:
 A simple file browser and manager.
@@ -18,3 +18,4 @@ Build Version:2.1.8,218,edf793a782861ae31648
 
 Market Version:2.1.8
 Market Version Code:218
+
diff --git a/metadata/com.prey.txt b/metadata/com.prey.txt
new file mode 100644
index 00000000..f657a062
--- /dev/null
+++ b/metadata/com.prey.txt
@@ -0,0 +1,31 @@
+Disabled:C2DM API key required
+#NonFreeDep because it requires the Market app to be installed, for C2DM
+AntiFeatures:NonFreeNet,NonFreeDep
+Category:System
+License:GPLv3
+Web Site:http://preyproject.com
+Source Code:https://github.com/prey/prey-android-client/
+Issue Tracker:https://github.com/prey/prey-android-client/issues
+
+Summary:Anti-theft software
+Description:
+Track down your lost or stolen phone or tablet.
+Prey lets you keep track of all your devices easily on one place. Supports:
+- GPS + Wifi geo-location.
+- SIM change detection.
+- SMS or Push (On Demand) activation (2.2+).
+- Lock phone/tablet for privacy (2.2+).
+- Uninstall protection (2.2+).
+- Loud alarm sound.
+- Alert messages to user.
+.
+
+Repo Type:git
+Repo:https://github.com/prey/prey-android-client
+
+# TODO: c2dm (aka "push API") seems to require an API key from Google, see http://code.google.com/android/c2dm/index.html
+Build Version:0.5,34,8934cda82af81580a26cf4de233da15feaab1dfd,prebuild=echo "ask-for-password=true\nprey-minor-version=0\nprey-versionon=0.5\nprey-subdomain=control\nprey-domain=preyproject.com\n#c2dm\nc2dm-mail=\nc2dm-action=\nc2dm-message-sync=" > res/raw/config
+
+Market Version:0.5
+Market Version Code:33
+
diff --git a/metadata/com.proch.practicehub.txt b/metadata/com.proch.practicehub.txt
index 9627ac6b..17728a7c 100644
--- a/metadata/com.proch.practicehub.txt
+++ b/metadata/com.proch.practicehub.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://code.google.com/p/music-practice-tools/
 Source Code:http://code.google.com/p/music-practice-tools/source/checkout
 Issue Tracker:http://code.google.com/p/music-practice-tools/issues/list
-Donate:
+
 Summary:Tools for musicians
 Description:
 Tools for musicians, including a chromoatic tuner, a metronome, and a pitch
@@ -17,3 +17,4 @@ Build Version:1.0,1,109c0bddf346
 
 Market Version:1.0
 Market Version Code:1
+
diff --git a/metadata/com.replica.replicaisland.txt b/metadata/com.replica.replicaisland.txt
index 6d90f4fa..4c8f6fdb 100644
--- a/metadata/com.replica.replicaisland.txt
+++ b/metadata/com.replica.replicaisland.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:Games
+License:Apache2
 Web Site:http://www.replicaisland.net/
 Source Code:http://code.google.com/p/replicaisland/source/checkout
 Issue Tracker:http://code.google.com/p/replicaisland/issues/list
+
 Summary:Side-scrolling platform game
 Description:
 Guide the Android robot through 40 action-packed platforming levels on a quest to
@@ -19,3 +19,4 @@ Build Version:1.4,14,7
 
 Market Version:1.4
 Market Version Code:14
+
diff --git a/metadata/com.ringdroid.txt b/metadata/com.ringdroid.txt
index 13103103..ba9e3924 100644
--- a/metadata/com.ringdroid.txt
+++ b/metadata/com.ringdroid.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:Multimedia
+License:Apache2
 Web Site:http://code.google.com/p/ringdroid/
 Source Code:http://code.google.com/p/ringdroid/source/checkout
 Issue Tracker:
+
 Summary:Ringtone editor
 Description:
 An application for editing and creating your own ringtones, alarms, and notification
@@ -17,3 +17,4 @@ Build Version:2.5,20500,64,target=android-8
 
 Market Version:2.5
 Market Version Code:20500
+
diff --git a/metadata/com.roozen.SoundManager.txt b/metadata/com.roozen.SoundManager.txt
index 983aac32..c3731585 100644
--- a/metadata/com.roozen.SoundManager.txt
+++ b/metadata/com.roozen.SoundManager.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:Multimedia
+License:Apache2
 Web Site:http://sites.google.com/site/roozenandroidapps/home/sound-manager
 Source Code:http://code.google.com/p/app-soundmanager/source/checkout
 Issue Tracker:http://code.google.com/p/app-soundmanager/issues/list
+
 Summary:Volume level scheduler
 Description:
 Exposes all the audio volume controls, provides quick access to
@@ -11,6 +11,7 @@ ringmode and vibration settings, and allows you to set timers to
 automatically change volumes at set times on any given day of the
 week.
 .
+
 Repo Type:svn
 Repo:http://app-soundmanager.googlecode.com/svn/tags/
 
diff --git a/metadata/com.ryanm.minedroid.txt b/metadata/com.ryanm.minedroid.txt
index c4be1fba..b654748c 100644
--- a/metadata/com.ryanm.minedroid.txt
+++ b/metadata/com.ryanm.minedroid.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:New BSD
 Category:Games
+License:New BSD
 Web Site:http://code.google.com/p/minedroid/
 Source Code:http://code.google.com/p/minedroid/source/checkout
 Issue Tracker:http://code.google.com/p/minedroid/issues/list
-Donate:
+
 Summary:Experimental Minecraft Client
 Description:
 An experimental Minecraft client.
@@ -15,4 +14,3 @@ Repo:http://minedroid.googlecode.com/svn/trunk/
 
 #Needs DroidRUGL to build.
 #Build Version:Extra lucky bugfix edition,13,47,subdir=MineDroid
-
diff --git a/metadata/com.serone.desktoplabel.txt b/metadata/com.serone.desktoplabel.txt
index 828a9f79..b4c4d775 100644
--- a/metadata/com.serone.desktoplabel.txt
+++ b/metadata/com.serone.desktoplabel.txt
@@ -1,11 +1,14 @@
-License:GPLv3+
 Category:Office
+License:GPLv3+
 Web Site:http://code.google.com/p/desktoplabel/
 Source Code:http://code.google.com/p/desktoplabel/source/checkout
 Issue Tracker:http://code.google.com/p/desktoplabel/issues/list
+
 Summary:Custom desktop label widgets
 Description:
 Allows you to add custom widgets to your 'desktop' to label things.
 .
+
 Market Version:1.3.0
 Market Version Code:6
+
diff --git a/metadata/com.smorgasbork.hotdeath.txt b/metadata/com.smorgasbork.hotdeath.txt
index 2a7e249b..2e3b6527 100644
--- a/metadata/com.smorgasbork.hotdeath.txt
+++ b/metadata/com.smorgasbork.hotdeath.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://code.google.com/p/hotdeath/
 Source Code:http://code.google.com/p/hotdeath/source/checkout
 Issue Tracker:http://code.google.com/p/hotdeath/issues/list
-Donate:
+
 Summary:Card game
 Description:
 A variant of the classic card game Uno
@@ -16,3 +16,4 @@ Build Version:1.0.2,3,26
 
 Market Version:1.0.2
 Market Version Code:3
+
diff --git a/metadata/com.teleca.jamendo.txt b/metadata/com.teleca.jamendo.txt
index 344f52a7..17f99aa7 100644
--- a/metadata/com.teleca.jamendo.txt
+++ b/metadata/com.teleca.jamendo.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:Multimedia
+License:Apache2
 Web Site:http://telecapoland.github.com/jamendo-android/
 Source Code:http://github.com/telecapoland/jamendo-android
 Issue Tracker:http://github.com/telecapoland/jamendo-android/issues
+
 Summary:Jamendo (FaiF music) player
 Description:
 A music player tied to the Jamendo site, a large resource of FaiF music.
@@ -20,3 +20,4 @@ Build Version:1.0.3 [BETA],34,!No source in repo
 
 Market Version:1.0.4 [BETA]
 Market Version Code:35
+
diff --git a/metadata/com.textuality.lifesaver2.txt b/metadata/com.textuality.lifesaver2.txt
index 9f6704c8..2e912022 100644
--- a/metadata/com.textuality.lifesaver2.txt
+++ b/metadata/com.textuality.lifesaver2.txt
@@ -1,11 +1,14 @@
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://www.tbray.org/ongoing/When/201x/2010/04/25/LifeSaver-Lessons
 Source Code:http://code.google.com/p/lifesaver/
 Issue Tracker:http://code.google.com/p/lifesaver/issues/list
+
 Summary:SMS and call log backup/restore
 Description:
 A simple backup and restore of your SMS and call logs.
 .
+
 Market Version:1.0
 Market Version Code:3
+
diff --git a/metadata/com.tj.qotd.txt b/metadata/com.tj.qotd.txt
index b1081acd..3b8b17b4 100644
--- a/metadata/com.tj.qotd.txt
+++ b/metadata/com.tj.qotd.txt
@@ -1,15 +1,18 @@
 Disabled:Can't identify release
-Use Built:Yes
 Category:Games
+License:Unknown
 Web Site:https://github.com/thibault/OpenQOTD
 Source Code:https://github.com/thibault/OpenQOTD
 Issue Tracker:https://github.com/thibault/OpenQOTD/issues
+
 Summary:Widget to display random quotes
 Description:
 A simple widget that displays random quotes in English or French.
 .
+
 Repo Type:git
 Repo:https://github.com/thibault/OpenQOTD.git
 
 Market Version:1.0.1
 Market Version Code:2
+
diff --git a/metadata/com.totsp.bookworm.txt b/metadata/com.totsp.bookworm.txt
index 0b8f9327..5c6bf917 100644
--- a/metadata/com.totsp.bookworm.txt
+++ b/metadata/com.totsp.bookworm.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:Office
+License:Apache2
 Web Site:http://code.google.com/p/and-bookworm/
 Source Code:http://code.google.com/p/and-bookworm/source/checkout
 Issue Tracker:http://code.google.com/p/and-bookworm/issues/list
+
 Summary:Book collection manager
 Description:
 BookWorm allows you to keep track of books you have read and those you
@@ -20,3 +20,4 @@ Build Version:1.0.18,19,574
 
 Market Version:1.0.18
 Market Version Code:19
+
diff --git a/metadata/com.totsp.crossword.shortyz.txt b/metadata/com.totsp.crossword.shortyz.txt
new file mode 100644
index 00000000..84184627
--- /dev/null
+++ b/metadata/com.totsp.crossword.shortyz.txt
@@ -0,0 +1,21 @@
+Category:Games
+License:GPLv3
+Web Site:http://code.google.com/p/shortyz/
+Source Code:http://code.google.com/p/shortyz/source/checkout
+Issue Tracker:http://code.google.com/p/shortyz/issues/list
+
+Summary:Crossword game
+Description:
+Crossword game that downloads puzzles from a variety of internet locations.
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/shortyz/
+
+Build Version:3.1.0,30100,1ce970a00083,subdir=shortyz,target=android-11,prebuild=\
+	cd ../puzlib && mvn package && mv target/*.jar ../shortyz/libs && rm -rf target &&\
+	cd ../shortyz
+
+Market Version:3.1.7
+Market Version Code:30107
+
diff --git a/metadata/com.unitedcoders.android.gpodroid.txt b/metadata/com.unitedcoders.android.gpodroid.txt
new file mode 100644
index 00000000..879ea869
--- /dev/null
+++ b/metadata/com.unitedcoders.android.gpodroid.txt
@@ -0,0 +1,16 @@
+Category:Multimedia
+License:EPLv1
+Web Site:http://united-coders.com/gpodroid
+Source Code:https://github.com/gpodder/GpodRoid
+Issue Tracker:https://github.com/gpodder/GpodRoid/issues
+
+Summary:gpodder.net client
+Description:
+A gpodder.net podcasting client.
+.
+
+Repo Type:git
+Repo:git://github.com/gpodder/GpodRoid.git
+
+Build Version:0.4.7,12,0.4.7,target=android-7,prebuild=mv jars libs
+
diff --git a/metadata/com.voidcode.diasporawebclient.txt b/metadata/com.voidcode.diasporawebclient.txt
index f8beb7f6..d9fac683 100644
--- a/metadata/com.voidcode.diasporawebclient.txt
+++ b/metadata/com.voidcode.diasporawebclient.txt
@@ -1,10 +1,9 @@
-
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:https://github.com/voidcode/Diaspora-Webclient
 Source Code:https://github.com/voidcode/Diaspora-Webclient
 Issue Tracker:
-Donate:
+
 Summary:Diaspora Client
 Description:
 Client for the Diaspora social network.
@@ -13,5 +12,8 @@ Client for the Diaspora social network.
 Repo Type:git
 Repo:https://github.com/voidcode/Diaspora-Webclient.git
 
-Build Version:1.3,3,26d7120fea1af5835a17537bebeef6df523d57e6,prebuild=rm -rf gen/ && rm -rf bin/,target=android-9
+Build Version:1.3,3,26d7120fea1af5835a17537bebeef6df523d57e6,prebuild=rm -rf gen/ && rm -rf bin/,target=android-10
+
+Market Version:1.5
+Market Version Code:6
 
diff --git a/metadata/com.volosyukivan.txt b/metadata/com.volosyukivan.txt
index 3ff11f5a..78e11d26 100644
--- a/metadata/com.volosyukivan.txt
+++ b/metadata/com.volosyukivan.txt
@@ -1,8 +1,9 @@
-License:GPLv2
 Category:System
+License:GPLv2
 Web Site:http://code.google.com/p/wifikeyboard/
 Source Code:http://code.google.com/p/wifikeyboard/source/checkout
 Issue Tracker:http://code.google.com/p/wifikeyboard/issues/list
+
 Summary:Remote WiFi keyboard
 Description:
 Use a remote browser over WiFi as a keyboard for the Android device.
diff --git a/metadata/com.wanghaus.remembeer.txt b/metadata/com.wanghaus.remembeer.txt
index 708b10e5..6c692951 100644
--- a/metadata/com.wanghaus.remembeer.txt
+++ b/metadata/com.wanghaus.remembeer.txt
@@ -1,9 +1,10 @@
-Use Built:Yes
-License:Expat
+AntiFeatures:NonFreeNet
 Category:Office
+License:Expat
 Web Site:http://remembeer.info
 Source Code:https://code.discordians.net/projects/remembeer/repository
 Issue Tracker:https://code.discordians.net/projects/remembeer/issues
+
 Summary:Track and rate the beers you drink.
 Description:
 Remembeer lets you track and rate the beers you drink. No more trying
@@ -17,7 +18,6 @@ Repo:git://code.discordians.net/srv/git/remembeer.git
 Build Version:1.2.2,48,c9d64e35964e9c445749aa02e470354b5788d8b4,target=android-4,subdir=android,prebuild=mv lib libs
 Build Version:1.3.0,50,319231627d207cf7fb1d2ac23ada0ffdd486230c,target=android-4,subdir=android,prebuild=mv lib libs
 
-AntiFeatures:NonFreeNet
-
 Market Version:1.3.0
 Market Version Code:50
+
diff --git a/metadata/com.webworxshop.swallowcatcher.txt b/metadata/com.webworxshop.swallowcatcher.txt
index f4e390b8..0a789d88 100644
--- a/metadata/com.webworxshop.swallowcatcher.txt
+++ b/metadata/com.webworxshop.swallowcatcher.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:AGPL
 Category:Internet
+License:AGPL
 Web Site:http://blog.webworxshop.com/projects/swallowcatcher
 Source Code:http://gitorious.org/swallowcatcher
 Issue Tracker:
-Donate:
+
 Summary:Podcast client
 Description:
 A podcatcher.
diff --git a/metadata/com.zegoggles.gist.txt b/metadata/com.zegoggles.gist.txt
index a0419ab5..6265cad3 100644
--- a/metadata/com.zegoggles.gist.txt
+++ b/metadata/com.zegoggles.gist.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:MIT
 Category:Internet
+License:MIT
 Web Site:https://github.com/jberkel/gist-it#readme
 Source Code:https://github.com/jberkel/gist-it
 Issue Tracker:https://github.com/jberkel/gist-it/issues
+
 Summary:Android gist API client written in Scala
 Description:
 Create and edit gists (snippets of text hosted at https://gist.github.com) with
@@ -12,5 +12,7 @@ this Android app.
 
 Repo Type:git
 Repo:https://github.com/jberkel/gist-it.git
+
 Market Version:0.1.4
 Market Version Code:5
+
diff --git a/metadata/com.zegoggles.smssync.txt b/metadata/com.zegoggles.smssync.txt
index 3d0b5c65..20d996c2 100644
--- a/metadata/com.zegoggles.smssync.txt
+++ b/metadata/com.zegoggles.smssync.txt
@@ -1,25 +1,23 @@
-Use Built:Yes
-License:Apache2
+Disabled:Non-free blob
 Category:System
+License:Apache2
 Web Site:https://github.com/jberkel/sms-backup-plus#readme
 Source Code:https://github.com/jberkel/sms-backup-plus#readme
 Issue Tracker:https://github.com/jberkel/sms-backup-plus/issues
+
 Summary:Backup SMS and call logs to IMAP
 Description:
 Backups up SMS and call log data from the device to an IMAP server, or
 Gmail.
-
-There are newer versions of this application avaiable elsewhere, but
-these include non-free software components and are not available via
-F-Droid.
 .
 
 Repo Type:git
 Repo:https://github.com/jberkel/sms-backup-plus.git
 
 Build Version:1.4.3,1404,1.4.3
-Build Version:1.4.4,1405,1.4.4,target=android-9,prebuild=mv lib libs
-Build Version:1.4.5,1406,!Non-free blob now included
+Build Version:1.4.4,1405,1.4.4,target=android-10,prebuild=mv lib libs
+Build Version:1.4.5,1406,1.4.5,target=android-10,prebuild=mv lib libs
 
 Market Version:1.4.5
 Market Version Code:1406
+
diff --git a/metadata/cz.hejl.chesswalk.txt b/metadata/cz.hejl.chesswalk.txt
new file mode 100644
index 00000000..0922d068
--- /dev/null
+++ b/metadata/cz.hejl.chesswalk.txt
@@ -0,0 +1,20 @@
+Category:Games
+License:GPLv3
+Web Site:https://gitorious.org/chesswalk
+Source Code:https://gitorious.org/chesswalk
+Issue Tracker:
+
+Summary:Chess game and FICS client
+Description:
+Play chess offline, or play online at FICS.
+.
+
+Repo Type:git
+Repo:https://git.gitorious.org/chesswalk/chesswalk.git
+
+Build Version:1.5,7,4007173d,buildjni=yes
+
+Update Check Mode:Market
+Market Version:1.4
+Market Version Code:6
+
diff --git a/metadata/cz.romario.opensudoku.txt b/metadata/cz.romario.opensudoku.txt
index f5390ec9..caffa4c5 100644
--- a/metadata/cz.romario.opensudoku.txt
+++ b/metadata/cz.romario.opensudoku.txt
@@ -1,15 +1,16 @@
-Use Built:Yes
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://code.google.com/p/opensudoku-android/
 Source Code:http://code.google.com/p/opensudoku-android/source/checkout
 Issue Tracker:http://code.google.com/p/opensudoku-android/issues/list
+
 Summary:Sudoku game
 Description:
 OpenSudoku is a simple open source sudoku game. It's designed to be controlled both
 by finger and keyboard. It's preloaded with 90 puzzles in 3 difficulty levels. More
 puzzles can be downloaded from the web and it also allows you to enter your own.
 .
+
 Repo Type:svn
 Repo:http://opensudoku-android.googlecode.com/svn/trunk/OpenSudoku
 
@@ -18,3 +19,4 @@ Build Version:1.1.5,1105,412
 
 Market Version:1.1.5
 Market Version Code:1105
+
diff --git a/metadata/de.blau.android.Application.txt b/metadata/de.blau.android.Application.txt
index e464e3f7..09b971be 100644
--- a/metadata/de.blau.android.Application.txt
+++ b/metadata/de.blau.android.Application.txt
@@ -1,11 +1,9 @@
-
-Use Built:Yes
-License:Apache2
 Category:Navigation
+License:Apache2
 Web Site:https://code.google.com/p/osmeditor4android
 Source Code:https://code.google.com/p/osmeditor4android/source/checkout
 Issue Tracker:https://code.google.com/p/osmeditor4android/issues/list
-Donate:
+
 Summary:OSM Editor
 Description:
 OpenStreemMap editor.
diff --git a/metadata/de.joergjahnke.c64.android.txt b/metadata/de.joergjahnke.c64.android.txt
index 43b79643..eba11942 100644
--- a/metadata/de.joergjahnke.c64.android.txt
+++ b/metadata/de.joergjahnke.c64.android.txt
@@ -1,13 +1,16 @@
 Disabled:Field-of-use restriction issues with included ROM binary
-License:GPL
 Category:Games
-Name:Mobile C64
+License:GPL
 Web Site:http://jmec64.sourceforge.net/
 Source Code:http://sourceforge.net/projects/jmec64/develop
 Issue Tracker:http://sourceforge.net/tracker/?group_id=171310
+
+Name:Mobile C64
 Summary:Commodore 64 Emulator
 Description:
 A Commodore 64 (C64) emulator.
 .
+
 Market Version:1.5.13
 Market Version Code:10513
+
diff --git a/metadata/de.shandschuh.slightbackup.txt b/metadata/de.shandschuh.slightbackup.txt
index c7f929cd..1a131513 100644
--- a/metadata/de.shandschuh.slightbackup.txt
+++ b/metadata/de.shandschuh.slightbackup.txt
@@ -1,8 +1,9 @@
-Use Built:Yes
-License:MIT
 Category:System
+License:MIT
 Web Site:https://github.com/handschuh/Slight-backup
 Source Code:https://github.com/handschuh/Slight-backup
+Issue Tracker:
+
 Summary:A very simple backup program.
 Description:
 A very simple program that can be used to backup
@@ -16,9 +17,10 @@ unscheduled.
 Repo Type:git
 Repo:https://github.com/handschuh/Slight-backup.git
 
-Build Version:0.2,6,94715551ab863b20df3d,target=android-9
-Build Version:0.4.2,12,843c7eecef6ac3602728,target=android-9
-Build Version:0.4.3,13,093cf46438b95cc379139792f7093739dcdfc2a7,target=android-9
+Build Version:0.2,6,94715551ab863b20df3d,target=android-10
+Build Version:0.4.2,12,843c7eecef6ac3602728,target=android-10
+Build Version:0.4.3,13,093cf46438b95cc379139792f7093739dcdfc2a7,target=android-10
 
 Market Version:0.4.3
 Market Version Code:13
+
diff --git a/metadata/de.shandschuh.sparserss.txt b/metadata/de.shandschuh.sparserss.txt
index 1870a7bf..8e1f07b6 100644
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-
-License:MIT
 Category:Internet
+License:MIT
 Web Site:http://code.google.com/p/sparserss/
 Source Code:http://code.google.com/p/sparserss/source/checkout
+Issue Tracker:
+
 Summary:Simple feed reader
 Description:
 A simple and lightweight feed reader with automatic background update and
@@ -21,8 +21,8 @@ Build Version:0.9.2,57,136,target=android-8
 Build Version:1.1.1,65,177,target=android-8
 Build Version:1.2.2,68,183,target=android-8
 Build Version:1.3,69,197,target=android-8
-Build Version:1.3.1,70,210,target=android-9
+Build Version:1.3.1,70,210,target=android-10
 
+Market Version:1.3.2
+Market Version Code:71
 
-Market Version:1.3.1
-Market Version Code:70
diff --git a/metadata/de.ub0r.android.adBlock.txt b/metadata/de.ub0r.android.adBlock.txt
index 19095579..5d6788bb 100644
--- a/metadata/de.ub0r.android.adBlock.txt
+++ b/metadata/de.ub0r.android.adBlock.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3+
 Category:System
+License:GPLv3+
 Web Site:http://code.google.com/p/andblock/
 Source Code:https://github.com/felixb/adBlock
 Issue Tracker:http://code.google.com/p/andblock/issues/list
+
 Summary:Ad-blocking HTTP proxy
 Description:
 Blocks advertisements on the web by filtering requests by URL.
@@ -16,3 +16,4 @@ Build Version:0.5,5,v0.5,oldsdkloc=yes
 
 Market Version:0.5
 Market Version Code:5
+
diff --git a/metadata/de.ub0r.android.callmeter.txt b/metadata/de.ub0r.android.callmeter.txt
index b573027f..4bde3529 100644
--- a/metadata/de.ub0r.android.callmeter.txt
+++ b/metadata/de.ub0r.android.callmeter.txt
@@ -1,14 +1,15 @@
-License:GPL3+
+AntiFeatures:Ads
 Category:System
+License:GPL3+
 Web Site:https://code.google.com/p/callmeter/
 Source Code:http://github.com/felixb/callmeter
 Issue Tracker:https://code.google.com/p/callmeter/issues/list
+
 Summary:keep track of calls, messages and data transfer
 Description:
 CallMeter is an Android application summing up your call and text logs. Different billing modes and periods are take into account on summing. 
 .
 
-AntiFeatures:Ads
-
 Market Version:3.0
 Market Version Code:2836
+
diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt
index 4adbefb6..62b2ae46 100644
--- a/metadata/dk.andsen.asqlitemanager.txt
+++ b/metadata/dk.andsen.asqlitemanager.txt
@@ -1,10 +1,9 @@
-
-License:EUPL
 Category:System
+License:EUPL
 Web Site:http://aaa.andsen.dk/aSQLiteManager.html
 Source Code:http://sourceforge.net/scm/?type=svn&group_id=362274
 Issue Tracker:http://sourceforge.net/tracker/?group_id=362274
-Donate:
+
 Summary:SQLite Frontend
 Description:
 Front end allowing management of SQLite databases.
@@ -14,7 +13,8 @@ Repo Type:svn
 Repo:https://asqlitemanager.svn.sourceforge.net/svnroot/asqlitemanager
 
 Build Version:2.6,7,190,subdir=aSQLiteManager
-Build Version:2.7,9,204,subdir=aSQLiteManager,target=android-9
+Build Version:2.7,9,204,subdir=aSQLiteManager,target=android-10
 
 Market Version:2.7
 Market Version Code:9
+
diff --git a/metadata/edu.nyu.cs.omnidroid.app.txt b/metadata/edu.nyu.cs.omnidroid.app.txt
index 33ef1274..f12b9a8e 100644
--- a/metadata/edu.nyu.cs.omnidroid.app.txt
+++ b/metadata/edu.nyu.cs.omnidroid.app.txt
@@ -1,9 +1,9 @@
-
+Category:System
 License:Apache2
 Web Site:http://code.google.com/p/omnidroid/
 Source Code:http://code.google.com/p/omnidroid/source/checkout
 Issue Tracker:http://code.google.com/p/omnidroid/issues/list
-Category:System
+
 Summary:Automated Event Handler
 Description:
 Omnidroid is an automated event/action manager that allows users to automate
@@ -21,3 +21,4 @@ Build Version:0.2.2,7,!Apparently no source code exists for this
 
 Market Version:0.2.2
 Market Version Code:7
+
diff --git a/metadata/edu.rit.poe.atomix.txt b/metadata/edu.rit.poe.atomix.txt
index c770ce0e..b52769d5 100644
--- a/metadata/edu.rit.poe.atomix.txt
+++ b/metadata/edu.rit.poe.atomix.txt
@@ -1,15 +1,21 @@
-License:GPLv2
 Category:Games
+License:GPLv2
 Web Site:http://code.google.com/p/droid-atomix/
 Source Code:http://code.google.com/p/droid-atomix/source/checkout
 Issue Tracker:http://code.google.com/p/droid-atomix/issues/list
+
 Summary:Puzzle game
 Description:
 This is a puzzle game to build molecules from individual atoms. Atoms can
 move left, right, up or down, and will continue to slide until they hit any
 obstacle.
 .
+
 Repo Type:hg
 Repo:https://droid-atomix.googlecode.com/hg/
-Use Built:Yes
-Build Version:1.0.1,2,ea2086d1f9fe759866008f6fe5187fc1cc97bd1d,target=android-4
+
+Build Version:1.0.1,2,ea2086d1f9fe759866008f6fe5187fc1cc97bd1d,target=android-4,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+
+Market Version:1.0.1
+Market Version Code:2
+
diff --git a/metadata/es.prodevelop.gvsig.mini.txt b/metadata/es.prodevelop.gvsig.mini.txt
index dee1dfaa..b49b5214 100644
--- a/metadata/es.prodevelop.gvsig.mini.txt
+++ b/metadata/es.prodevelop.gvsig.mini.txt
@@ -1,11 +1,14 @@
-License:GPLv2
 Category:Navigation
+License:GPLv2
 Web Site:https://confluence.prodevelop.es/display/GVMN/Home
 Source Code:https://svn.prodevelop.es/public/gvsigmini/
 Issue Tracker:
+
 Summary:Tile-based map viewer
 Description:
 A tile-based map viewer with support for maps from many sources.
 .
+
 Market Version:1.2.3
 Market Version Code:457
+
diff --git a/metadata/fm.libre.droid.txt b/metadata/fm.libre.droid.txt
index b805f213..0984298a 100644
--- a/metadata/fm.libre.droid.txt
+++ b/metadata/fm.libre.droid.txt
@@ -1,19 +1,20 @@
-License:GPLv3+
 Category:Multimedia
+License:GPLv3+
 Web Site:http://libre.fm
 Source Code:http://gitorious.org/foocorp/gnu-fm/trees/master/clients/libredroid
 Issue Tracker:
+
 Summary:Client for Libre.fm
 Description:
 A streaming radio player client for Libre.fm.
 .
 
-Market Version:1.4
-Market Version Code:4
-
 Repo Type:git
 Repo:git://gitorious.org/foocorp/gnu-fm.git
 
 Build Version:1.4,4,926fde6d208190a1fffef12a47bb231f908125e8,subdir=clients/libredroid
 Build Version:1.2,3,4ebfcf224745ca443a308463721e4f8001293f15,subdir=clients/libredroid
 
+Market Version:1.4
+Market Version Code:4
+
diff --git a/metadata/fr.seeks.txt b/metadata/fr.seeks.txt
index b12ac51d..828a6f06 100644
--- a/metadata/fr.seeks.txt
+++ b/metadata/fr.seeks.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://www.seeks-project.info/site/
 Source Code:https://github.com/sileht/SeeksWidget
 Issue Tracker:http://redmine.seeks-project.info/projects/seeks
-Donate:
+
 Summary:Widget for Seeks web service
 Description:
 A widget for the Seeks web service, a decentralised search engine.
@@ -16,3 +16,4 @@ Build Version:1.2,4,1.2
 
 Market Version:1.2
 Market Version Code:4
+
diff --git a/metadata/goo.TeaTimer.txt b/metadata/goo.TeaTimer.txt
index 5f704e2e..fcff73bf 100644
--- a/metadata/goo.TeaTimer.txt
+++ b/metadata/goo.TeaTimer.txt
@@ -1,11 +1,12 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:http://solidsushi.com/lab/teatimer
 Source Code:http://github.com/ralphleon/TeaTimer
 Issue Tracker:https://github.com/ralphleon/TeaTimer/issues
-Summary:A Simple Tea Timer for Android
-Description:A straight-forward tea timer
+
+Summary:Simple Tea Timer
+Description:
+A straight-forward tea timer
 .
 
 Repo Type:git
@@ -16,3 +17,4 @@ Build Version:1.7,10,!No source in repo
 
 Market Version:1.7
 Market Version Code:10
+
diff --git a/metadata/info.guardianproject.browser.txt b/metadata/info.guardianproject.browser.txt
index 9027aedd..c77daf1d 100644
--- a/metadata/info.guardianproject.browser.txt
+++ b/metadata/info.guardianproject.browser.txt
@@ -1,9 +1,9 @@
-License:GPLv2
 Category:Internet
+License:GPLv2
 Web Site:https://guardianproject.info/apps/orweb/
 Source Code:https://github.com/guardianproject/orweb
 Issue Tracker:https://github.com/guardianproject/orweb/issues
-Donate:
+
 Summary:Proxy + Privacy Browser
 Description:
 Orweb is a companion browser for Orbot, the port of Tor to Android. Orweb provides anonymous and uncensored access to the web from Android devices.
@@ -14,6 +14,6 @@ Repo:git://github.com/guardianproject/Orweb.git
 
 Build Version:0.2.2,3,460a5a92bc5a426f7ff710f03bc1341359a17d4b
 
-
 Market Version:0.2.2
 Market Version Code:4
+
diff --git a/metadata/info.guardianproject.cacert.txt b/metadata/info.guardianproject.cacert.txt
index 6d3b4f3e..2e8de754 100644
--- a/metadata/info.guardianproject.cacert.txt
+++ b/metadata/info.guardianproject.cacert.txt
@@ -1,10 +1,9 @@
 Category:System
-Requires Root:Yes
 License:GPLv3
 Web Site:https://guardianproject.info/2011/09/05/cacertman-app-to-address-diginotar-other-bad-cas/
 Source Code:https://github.com/guardianproject/cacert
 Issue Tracker:https://github.com/guardianproject/cacert/issues
-Donate:
+
 Summary:A slightly more vetted version of the Android CACert keystore
 Description:
 A slightly more vetted version of the Android CACert keystore
@@ -16,9 +15,14 @@ If the ‘save’ doesn’t work, then you will need to use ‘RootExplorer’ t
 ***
 .
 
+Requires Root:Yes
+
 Repo Type:git
 Repo:https://github.com/guardianproject/cacert.git
 
 Build Version:0.0.2-20110906,3,0.0.2,target=android-8,subdir=app
 Build Version:0.0.2.20111012,4,212187e9c398e46fda87fe2335ee48bb693caca0,target=android-8,subdir=app
 
+Market Version:0.0.2-20110906
+Market Version Code:3
+
diff --git a/metadata/info.guardianproject.otr.app.im.txt b/metadata/info.guardianproject.otr.app.im.txt
index 324b13a6..a4bb6bf2 100644
--- a/metadata/info.guardianproject.otr.app.im.txt
+++ b/metadata/info.guardianproject.otr.app.im.txt
@@ -1,18 +1,20 @@
-License:Apache2
+Disabled: Seems to early in the development cycle to build a release
 Category:Internet
+License:Apache2
 Web Site:https://guardianproject.info/apps/gibber/
 Source Code:https://github.com/guardianproject/OtRChat
 Issue Tracker:https://github.com/guardianproject/OtRChat/issues
+
 Summary:XMPP client with OTR support
 Description:
 Gibber is an XMPP (Jabber) client based on Google's Talk IM App. It
 adds support for end-to-end encryption with Off-the-Record Messaging
 and for Tor via Orbot.
 .
+
 Repo Type:git
 Repo:https://github.com/guardianproject/OtRChat.git
 
-Disabled: Seems to early in the development cycle to build a release
-
 Market Version:0.0.5-RC5
 Market Version Code:21
+
diff --git a/metadata/info.lamatricexiste.network.txt b/metadata/info.lamatricexiste.network.txt
index 460b96ba..731998b2 100644
--- a/metadata/info.lamatricexiste.network.txt
+++ b/metadata/info.lamatricexiste.network.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:GPLv2
 Category:System
+License:GPLv2
 Web Site:http://rorist.github.com/android-network-discovery/
 Source Code:http://rorist.github.com/android-network-discovery/
 Issue Tracker:https://github.com/rorist/android-network-discovery/issues
-Donate:
+
 Summary:Network discovery tool
 Description:
 Discover network (WiFi/3G) hosts, scan ports, etc.
@@ -17,3 +16,4 @@ Build Version:0.3.4,42,32bffddce7e37a3c12f8,oldsdkloc=yes
 
 Market Version:0.3.4
 Market Version Code:42
+
diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt
index 14781081..b72fcc0f 100644
--- a/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@ -1,21 +1,23 @@
-Use Built:Yes
-License:GPLv3+
 Category:Office
+License:GPLv3+
 Web Site:http://staticfree.info/projects/units/
 Source Code:http://staticfree.info/projects/units/
 Issue Tracker:
+
 Summary:Powerful unit converter
 Description:
 A powerful unit-aware calculator and converter inspired by GNU Units.
 .
+
 Repo Type:git
 Repo:git://staticfree.info/git/Units/
+
 Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
 Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
 
 #Commenting the following out because it doesn't build....
 #src/info/staticfree/android/units/Units.java:32: package org.jared.commons.ui does not exist
 #Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af
-
 Market Version:1.0
 Market Version Code:9
+
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index 40442072..1b5e73d6 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Navigation
+License:GPLv3
 Web Site:https://code.google.com/p/osmtracker-android/
 Source Code:https://github.com/nguillaumin/osmtracker-android
 Issue Tracker:https://code.google.com/p/osmtracker-android/issues/list
-Donate:
+
 Summary:GPS Track Recorder
 Description:
 OSMTracker allows you to track your journey and mark significant way points.
@@ -21,3 +20,4 @@ Build Version:0.5.6,21,0.5.6,target=android-8
 
 Market Version:0.5.6
 Market Version Code:21
+
diff --git a/metadata/mixedbit.speechtrainer.txt b/metadata/mixedbit.speechtrainer.txt
index 6436975e..1f2839b2 100644
--- a/metadata/mixedbit.speechtrainer.txt
+++ b/metadata/mixedbit.speechtrainer.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://mixedbit.org/
 Source Code:https://github.com/wrr/speech_trainer
 Issue Tracker:
-Donate:
+
 Summary:Speech training
 Description:
 Gives immediate feedback on the sound of your voice for training pronunciation,
@@ -14,7 +14,8 @@ treating speech disorders.
 Repo Type:git
 Repo:git://github.com/wrr/speech_trainer.git
 
-Build Version:1.01,2,109eba6da3eac93c6e0d445f488433452387f815,subdir=app,target=android-9
+Build Version:1.01,2,109eba6da3eac93c6e0d445f488433452387f815,subdir=app,target=android-10
 
 Market Version:1.01
 Market Version Code:2
+
diff --git a/metadata/name.bagi.levente.pedometer.txt b/metadata/name.bagi.levente.pedometer.txt
index 73244055..94736bba 100644
--- a/metadata/name.bagi.levente.pedometer.txt
+++ b/metadata/name.bagi.levente.pedometer.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Navigation
+License:GPLv3
 Web Site:https://code.google.com/p/pedometer/
 Source Code:https://github.com/bagilevi/android-pedometer
 Issue Tracker:https://code.google.com/p/pedometer/issues/list
+
 Summary:Pedometer
 Description:
 A step counter with speed, distance, steps-per-minute and text-to-speech.
@@ -13,5 +13,7 @@ Repo Type:git
 Repo:https://github.com/bagilevi/android-pedometer.git
 
 Build Version:1.4.1,6,1.4.1
+
 Market Version:1.4.1
 Market Version Code:6
+
diff --git a/metadata/net.androgames.level.txt b/metadata/net.androgames.level.txt
new file mode 100644
index 00000000..d32a0505
--- /dev/null
+++ b/metadata/net.androgames.level.txt
@@ -0,0 +1,27 @@
+Category:None
+License:GPLv3
+Web Site:https://code.google.com/p/androgames-sample/
+Source Code:http://code.google.com/p/androgames-sample/source/browse/#svn/Market-apps/Level/trunk
+Issue Tracker:
+Donate:https://market.android.com/details?id=net.androgames.level.donate
+
+Summary:A spirit level
+Description:
+Hold any of the phone's four sides against an object to test it for level or plumb, or lay it down on a flat surface for a 360° level.
+- Calibrate
+- Show angle or inclination
+- Sound effects
+- Install on SD
+- Orientation locking
+- Roof pitch
+.
+
+Repo Type:svn
+Repo:http://androgames-sample.googlecode.com/svn/Market-apps/Level/trunk/
+
+Build Version:1.8.0,27,75
+
+Update Check Mode:Market
+Market Version:1.8.0
+Market Version Code:27
+
diff --git a/metadata/net.avs234.txt b/metadata/net.avs234.txt
index f000cb33..d045711b 100644
--- a/metadata/net.avs234.txt
+++ b/metadata/net.avs234.txt
@@ -1,16 +1,22 @@
-License:GPLv2+
 Category:Multimedia
+License:GPLv2+
 Web Site:http://code.google.com/p/andless/
 Source Code:http://code.google.com/p/andless/source/checkout
 Issue Tracker:http://code.google.com/p/andless/issues/list
+
 Summary:Audio player for lossless files
 Description:
 Audio player that plays lossless files (FLAC/APE/MPC/WV) as well as
 any formats natively supported by Android. CUE sheets and playlists
 are also supported.
 .
-Repo Type:svn
+
+Repo Type:git-svn
 Repo:http://andless.googlecode.com/svn/trunk/
 
+#Can't build this without modifying the NDK - http://code.google.com/p/andless/wiki/Building
+#Binary of this version in the repo
+#Build Version:1.3.3,10,91,buildjni=yes
 Market Version:1.3.3
 Market Version Code:10
+
diff --git a/metadata/net.bytten.xkcdviewer.txt b/metadata/net.bytten.xkcdviewer.txt
index 0624cc4b..dc2f99b0 100644
--- a/metadata/net.bytten.xkcdviewer.txt
+++ b/metadata/net.bytten.xkcdviewer.txt
@@ -1,20 +1,22 @@
-Use Built:Yes
-License:GPLv2+
 Category:Internet
+License:GPLv2+
 Web Site:https://github.com/tcoxon/XkcdViewer
 Source Code:https://github.com/tcoxon/XkcdViewer
 Issue Tracker:https://github.com/tcoxon/XkcdViewer/issues
+
 Summary:Viewer for the xkcd.com webcomic
 Description:
 Shows comics from xkcd.com, including alt-text. Also provides
 support for bookmarks and easy navigation.
 .
+
 Repo Type:git
 Repo:https://github.com/tcoxon/XkcdViewer.git
 
 Build Version:2.1.2,15,20ceb28d4360b11d2bfd
 Build Version:2.2.1,17,8ee6381d565db4d1b6a4
-Build Version:3.0.2,21,v3.0.2,target=android-9
+Build Version:3.0.2,21,v3.0.2,target=android-10
 
 Market Version:3.0.2
 Market Version Code:21
+
diff --git a/metadata/net.cactii.mathdoku.txt b/metadata/net.cactii.mathdoku.txt
index 09c9c26f..59daa2b6 100644
--- a/metadata/net.cactii.mathdoku.txt
+++ b/metadata/net.cactii.mathdoku.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://code.google.com/p/mathdoku/
 Source Code:http://code.google.com/p/mathdoku/source/checkout
 Issue Tracker:http://code.google.com/p/mathdoku/issues/list
+
 Summary:Sudoku-like game based on KenKen(TM)
 Description:
 A sudoku-like game with a mathematical twist. Based on KenKen(TM).
@@ -16,3 +16,4 @@ Build Version:1.8,70,70
 
 Market Version:1.8
 Market Version Code:70
+
diff --git a/metadata/net.dahanne.android.regalandroid.txt b/metadata/net.dahanne.android.regalandroid.txt
index a8088824..826da7a4 100644
--- a/metadata/net.dahanne.android.regalandroid.txt
+++ b/metadata/net.dahanne.android.regalandroid.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://code.google.com/p/regalandroid/
 Source Code:https://github.com/anthonydahanne/ReGalAndroid
 Issue Tracker:http://code.google.com/p/regalandroid/issues/list
+
 Summary:Gallery client for G2/3 and Piwigo
 Description:
 A gallery client with support for G2 and G3 (also known as Menalto Gallery) and
 Piwigo.
 .
+
 Market Version:1.1.2
 Market Version Code:5
+
diff --git a/metadata/net.fercanet.LNM.txt b/metadata/net.fercanet.LNM.txt
index 948b474e..45c68edd 100644
--- a/metadata/net.fercanet.LNM.txt
+++ b/metadata/net.fercanet.LNM.txt
@@ -1,14 +1,14 @@
-Use Built:Yes
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://learnmusicnotes.sourceforge.net/
 Source Code:http://sourceforge.net/projects/learnmusicnotes/develop
 Issue Tracker:http://sourceforge.net/tracker/?group_id=371992
-Donate:
+
 Summary:Music sight reading training game
 Description:
 A simple game to assist with music sight reading training.
 .
+
 Repo Type:svn
 Repo:https://learnmusicnotes.svn.sourceforge.net/svnroot/learnmusicnotes/trunk
 
@@ -17,3 +17,4 @@ Build Version:1.4,5,!No source for this version in the repo
 
 Market Version:1.4
 Market Version Code:5
+
diff --git a/metadata/net.gaast.giggity.txt b/metadata/net.gaast.giggity.txt
index b1269627..17f45290 100644
--- a/metadata/net.gaast.giggity.txt
+++ b/metadata/net.gaast.giggity.txt
@@ -1,20 +1,22 @@
-Use Built:Yes
-License:GPLv2
 Category:Office
+License:GPLv2
 Web Site:http://wilmer.gaa.st/main.php/giggity.html
 Source Code:http://wilmer.gaa.st/main.php/giggity.html
 Issue Tracker:
+
 Summary:Schedule viewer
 Description:
 An application that loads xcal/Pentabarf XML files (that contain schedules of
 conferences/festivals/other events) and lets you browse them in various convenient
 formats. Preloaded with data for FOSDEM.
 .
+
 Repo Type:bzr
 Repo:http://wilmer.gaa.st/giggity/
 
 Build Version:0.8.1,4,133
-#There is a 0.8.2 in the market, but the repo source doesn't seem to correspond
 
+#There is a 0.8.2 in the market, but the repo source doesn't seem to correspond
 Market Version:0.9.8
 Market Version Code:16
+
diff --git a/metadata/net.gorry.aicia.txt b/metadata/net.gorry.aicia.txt
index 9b43fc03..309acaee 100644
--- a/metadata/net.gorry.aicia.txt
+++ b/metadata/net.gorry.aicia.txt
@@ -1,10 +1,14 @@
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:http://gorry.haun.org/android/aicia/
 Source Code:http://gorry.haun.org/android/aicia/dist/old/
+Issue Tracker:
+
 Summary:IRC client
 Description:
 Internet Relay Chat client with a twin-pane view.
 .
+
 Market Version:2011.0622.1
 Market Version Code:201106221
+
diff --git a/metadata/net.jaqpot.netcounter.txt b/metadata/net.jaqpot.netcounter.txt
index f4fcc8a7..0e11ab31 100644
--- a/metadata/net.jaqpot.netcounter.txt
+++ b/metadata/net.jaqpot.netcounter.txt
@@ -1,13 +1,16 @@
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:http://www.jaqpot.net/netcounter/
 Source Code:http://www.jaqpot.net/netcounter/
 Issue Tracker:
+
 Summary:Bandwidth usage tracker
 Description:
 NetCounter keeps track of your bandwidth usage (both cell and Wi-Fi) and displays it
 to you in an easy to read format. It can also alert you when you reach a predefined
 limit.
 .
+
 Market Version:0.14.1
 Market Version Code:22
+
diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt
index e231009b..cd59613b 100644
--- a/metadata/net.mafro.android.wakeonlan.txt
+++ b/metadata/net.mafro.android.wakeonlan.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:BSD
 Category:System
+License:BSD
 Web Site:http://android.mafro.net/
 Source Code:https://github.com/mafrosis/Wake-On-Lan
 Issue Tracker:https://github.com/mafrosis/Wake-On-Lan/issues
+
 Summary:Wake-On-Lan
 Description:
 Sends Wake-On-Lan magic packets.
@@ -16,3 +16,4 @@ Build Version:1.4.2,12,468312845057e78a70f7b6260f2b116042571c42
 
 Market Version:1.4.2
 Market Version Code:12
+
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index bb7c09a1..f00b190b 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -1,10 +1,10 @@
-Use Built:Yes
 Category:Navigation
 License:LGPL
-Name:OsmAnd+
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
+
+Name:OsmAnd+
 Summary:OpenStreetMap navigation & routing
 Description:
 Navigation and routing based on OpenStreetMap, including the ability for
@@ -24,3 +24,4 @@ Build Version:0.6.9',43,!No corresponding source for whatever this is
 
 Market Version:0.6.9'
 Market Version Code:43
+
diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt
index ae52a81d..8ca62bb5 100644
--- a/metadata/net.osmand.txt
+++ b/metadata/net.osmand.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:LGPL
 Category:Navigation
+License:LGPL
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
+
 Summary:OpenStreetMap navigation & routing
 Description:
 Navigation and routing based on OpenStreetMap, including the ability for
@@ -16,6 +16,6 @@ Repo:https://github.com/osmandapp/Osmand.git
 Build Version:0.5.2,25,efc0e83a,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw
 Build Version:0.5.3,26,8e9d76ea685ea75d6c08,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw
 
-
 Market Version:0.5.3
 Market Version Code:26
+
diff --git a/metadata/net.pierrox.mcompass.txt b/metadata/net.pierrox.mcompass.txt
index fc52c991..5daaec02 100644
--- a/metadata/net.pierrox.mcompass.txt
+++ b/metadata/net.pierrox.mcompass.txt
@@ -1,11 +1,14 @@
-License:Apache2
 Category:Navigation
+License:Apache2
 Web Site:http://www.pierrox.net/cmsms/open-source/marine-compass-2.html
 Source Code:http://svn.pierrox.net/mcompass/trunk
 Issue Tracker:
+
 Summary:Compass
 Description:
 Uses the magnetic sensor to show the orientation.
 .
+
 Market Version:2.5.1
 Market Version Code:23
+
diff --git a/metadata/net.rocrail.androc.txt b/metadata/net.rocrail.androc.txt
index fb63fe3b..6f9e9fe5 100644
--- a/metadata/net.rocrail.androc.txt
+++ b/metadata/net.rocrail.androc.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3+
 Category:Games
+License:GPLv3+
 Web Site:http://wiki.rocrail.net/doku.php?id=androc-intro-en
 Source Code:https://code.launchpad.net/~rocrail-project/rocrail/androc
 Issue Tracker:https://bugs.launchpad.net/rocrail
+
 Summary:Model railway controller client
 Description:
 A controller client for RocRail, a model railway controller.
@@ -11,6 +11,7 @@ A controller client for RocRail, a model railway controller.
 
 Repo Type:bzr
 Repo:lp:rocrail/androc
+
 Build Version:1.1.219,219,219
 Build Version:1.1.221,221,221
 Build Version:1.2.224,224,!No source for this version in repo
@@ -31,3 +32,4 @@ Build Version:1.5.324,324,324
 
 Market Version:339
 Market Version Code:339
+
diff --git a/metadata/net.sf.andbatdog.batterydog.txt b/metadata/net.sf.andbatdog.batterydog.txt
index f8f09db0..a9b4db3c 100644
--- a/metadata/net.sf.andbatdog.batterydog.txt
+++ b/metadata/net.sf.andbatdog.batterydog.txt
@@ -1,7 +1,9 @@
-License:GPLv2+
 Category:System
+License:GPLv2+
 Web Site:http://andbatdog.sourceforge.net/
 Source Code:http://sourceforge.net/projects/andbatdog/develop
+Issue Tracker:
+
 Summary:Battery level logger
 Description:
 Android Battery Dog is a watchdog application to facilitate long term
@@ -9,14 +11,14 @@ analysis of the battery level. In addition to showing a graph of this
 information, the file “/sdcard/BatteryDog/battery.csv” is created containing
 the recorded battery levels together with a timestamp.
 .
+
 Repo Type:svn
 Repo:https://andbatdog.svn.sourceforge.net/svnroot/andbatdog/trunk/AndroidBatteryDog/AndroidBatteryDog
-Use Built:Yes
 
 # There is no source for 0.1.2 or 0.1.3.
 Build Version:0.1.1,11,22,encoding=iso-8859-1
-
 Build Version:0.1.3,13,!No source for 0.1.2 and newer
 
 Market Version:0.1.3
 Market Version Code:13
+
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index a58594b1..e9ffcc3c 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -1,11 +1,9 @@
-
-Use Built:Yes
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:http://sourceforge.net/projects/servestream/
 Source Code:http://servestream.svn.sourceforge.net/viewvc/servestream/
 Issue Tracker:http://sourceforge.net/tracker/?group_id=361303
-Donate:
+
 Summary:Media server browser/stream player.
 Description:
 HTTP media server browser and stream player. For use with streaming media servers such as GNUMP3d.
@@ -22,5 +20,6 @@ Build Version:0.2.11,46,614,prebuild=mv lib/ libs/
 #Still guessing, see previous comment
 Build Version:0.3.1,48,659,prebuild=mv lib/ libs/
 
-Market Version:0.4.1
-Market Version Code:51
+Market Version:0.4.3
+Market Version Code:53
+
diff --git a/metadata/net.status.client.mobile.txt b/metadata/net.status.client.mobile.txt
index c06e5daa..264fe8a8 100644
--- a/metadata/net.status.client.mobile.txt
+++ b/metadata/net.status.client.mobile.txt
@@ -1,11 +1,14 @@
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:http://status.net/wiki/Client
 Source Code:http://www.gitorious.org/statusnet-client
 Issue Tracker:
+
 Summary:Official StatusNet client
 Description:
 The official client for StatusNet microblogging (which includes identi.ca).
 .
+
 Market Version:1.0.4
 Market Version Code:3
+
diff --git a/metadata/net.sylvek.sharemyposition.txt b/metadata/net.sylvek.sharemyposition.txt
index f463af21..b983fe87 100644
--- a/metadata/net.sylvek.sharemyposition.txt
+++ b/metadata/net.sylvek.sharemyposition.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:
 Category:Navigation
+License:
 Web Site:http://code.google.com/p/sharemyposition
 Source Code:http://code.google.com/p/sharemyposition/source/checkout
 Issue Tracker:http://code.google.com/p/sharemyposition/issues/list
+
 Summary:Share your location
 Description:
 A simple way of sharing your location via a widget. You can send a message
@@ -14,13 +14,16 @@ The recipient is sent a link to a web service. (The source for the web
 service is in the same repository as the client).
 .
 
-Repo Type:svn
-Repo:http://sharemyposition.googlecode.com/svn/trunk/
+Repo Type:git-svn
 #Note - deliberately pulling from trunk, not trunk/ShareMyPosition-android,
 #even though that would be more efficient, in order to preserve the
 #corresponding source for the web service in our source tarball.
+Repo:http://sharemyposition.googlecode.com/svn/trunk/
 
 Build Version:1.0.11,16,64,subdir=ShareMyPosition-android
+Build Version:1.1.0-beta3,20,70,subdir=ShareMyPosition-android,target=android-11,prebuild=mv lib libs
+
+Update Check Mode:Market
+Market Version:1.1.0-beta4
+Market Version Code:21
 
-Market Version:1.0.11
-Market Version Code:16
diff --git a/metadata/net.tapi.handynotes.txt b/metadata/net.tapi.handynotes.txt
index 9679f48e..e7204344 100644
--- a/metadata/net.tapi.handynotes.txt
+++ b/metadata/net.tapi.handynotes.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:http://github.com/atd/HandyNotes
 Source Code:http://github.com/atd/HandyNotes
 Issue Tracker:http://github.com/atd/HandyNotes/issues
+
 Summary:Sticky notes widget
 Description:
 Simple Android application that provides widgets to have notes at hand
@@ -15,6 +15,6 @@ Repo:https://github.com/atd/HandyNotes.git
 Build Version:1.0,1,bd33550beaf014ebbe8d,target=android-8
 Build Version:1.2,3,v1.2,target=android-8
 
-
 Market Version:1.2
 Market Version Code:3
+
diff --git a/metadata/net.tedstein.AndroSS.txt b/metadata/net.tedstein.AndroSS.txt
index c9f77597..2e723bfb 100644
--- a/metadata/net.tedstein.AndroSS.txt
+++ b/metadata/net.tedstein.AndroSS.txt
@@ -1,14 +1,14 @@
-Use Built:Yes
-License:GPLv2
 Category:System
+License:GPLv2
 Web Site:https://github.com/tstein/AndroSS
 Source Code:https://github.com/tstein/AndroSS
 Issue Tracker:https://github.com/tstein/AndroSS/issues
-Donate:
+
 Summary:Screenshot application
 Description:
 Screenshot application.
 .
+
 Requires Root:Yes
 
 Repo Type:git
@@ -20,5 +20,6 @@ Build Version:0.2.2,8,v0.2.2,buildjni=yes,target=android-8
 Build Version:0.3.-1,10,v0.3.-1,buildjni=yes,target=android-8
 Build Version:0.3.2,13,v0.3.2,buildjni=yes,target=android-8
 
-Market Version:0.4.1
-Market Version Code:15
+Market Version:0.4.2
+Market Version Code:16
+
diff --git a/metadata/net.tevp.postcode.txt b/metadata/net.tevp.postcode.txt
index 15e1d5f4..995767c1 100644
--- a/metadata/net.tevp.postcode.txt
+++ b/metadata/net.tevp.postcode.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 Category:Navigation
+License:GPLv3
 Web Site:http://www.lshift.net/blog/2010/09/26/android-postcode-app
 Source Code:http://github.com/palfrey/postcode
 Issue Tracker:
+
 Summary:Get postcode for your location (UK only)
 Description:
 A simple way to retrieve the postcode for your current location. Only works in the UK
 currently.
 .
+
 Market Version:1.1
 Market Version Code:2
+
diff --git a/metadata/nl.sogeti.android.gpstracker.txt b/metadata/nl.sogeti.android.gpstracker.txt
index 415fe0e3..bf15f49f 100644
--- a/metadata/nl.sogeti.android.gpstracker.txt
+++ b/metadata/nl.sogeti.android.gpstracker.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 AntiFeatures:NonFreeDep
 Category:Navigation
+License:GPLv3
 Web Site:http://code.google.com/p/open-gpstracker/
 Source Code:http://code.google.com/p/open-gpstracker/source/checkout
 Issue Tracker:http://code.google.com/p/open-gpstracker/issues/list
+
 Summary:GPS Logger
 Description:
 A GPS logging application.
 .
+
 Market Version:1.3-cupcake
 Market Version Code:64
+
diff --git a/metadata/nu.firetech.android.pactrack.txt b/metadata/nu.firetech.android.pactrack.txt
index 1408ef68..279b6480 100644
--- a/metadata/nu.firetech.android.pactrack.txt
+++ b/metadata/nu.firetech.android.pactrack.txt
@@ -1,17 +1,21 @@
-License:GPLv2+
 Category:Office
+License:GPLv2+
 Web Site:http://firetech.nu/pactrackdroid/
 Source Code:https://github.com/firetech/PactrackDroid
 Issue Tracker:https://github.com/firetech/PactrackDroid/issues
+
 Summary:Swedish parcel tracker
 Description:
 Tracks the status of parcels sent through Posten, the Swedish postal
 service, using their PacTrack service. Has support for showing
 notifications on the Sony Ericsson LiveView.
 .
+
 Repo Type:git
 Repo:https://github.com/firetech/PactrackDroid.git
+
 Build Version:1.3.1,1310,a2722a4062afbef38ec91e9af41908c9548d7a76
-Use Built:Yes
+
 Market Version:1.3.1
 Market Version Code:1310
+
diff --git a/metadata/org.abrantix.rockon.rockonnggl.txt b/metadata/org.abrantix.rockon.rockonnggl.txt
index 17d3a33f..2424ede6 100644
--- a/metadata/org.abrantix.rockon.rockonnggl.txt
+++ b/metadata/org.abrantix.rockon.rockonnggl.txt
@@ -1,8 +1,9 @@
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://abrantix.org/3.php
 Source Code:http://github.com/fabrantes/rockonnggl
 Issue Tracker:http://github.com/fabrantes/rockonnggl/issues
+
 #Don't want to encourage donating when the source is no longer available.
 #Donate:http://abrantix.org/cubed-donate.php
 Summary:Music player
@@ -17,12 +18,10 @@ for those (yet?).
 Repo Type:git
 Repo:https://github.com/fabrantes/rockonnggl.git
 
-
 #Note: the prebuild command here prevents it from using Google NAnalytics,
 #but need to check that's still the case in upgrades. It would be better
 #to remove the library and associated code entirely.
 #Build Version:1.0.79,80,2a567bd9632032c1f58c,prebuild=sed -i "s@config_isMarketVersion\">true</bool>@config_isMarketVersion\">false</bool>@" res/values/config.xml
-
 Build Version:1.0.93,94,!No source for anything after 1.0.79 - see https://github.com/fabrantes/rockonnggl/issues/issue/125
 Build Version:1.0.96,97,!Still no source - should probably just remove this fake FOSS from the repo
 
diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index 16037a47..fe0bf19a 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -1,23 +1,26 @@
-Use Built:Yes
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:http://code.google.com/p/ad-away/
 Source Code:https://gitorious.org/adaway/
 Issue Tracker:http://code.google.com/p/ad-away/issues/list
 Donate:http://flattr.com/thing/369138/AdAway-Ad-blocker-for-Android
+
 Summary:Ad blocking via hosts file
 Description:
 Blocks advertisements via the /etc/hosts file. Supports automatic updates.
 .
 
+Requires Root:Yes
+
 Repo Type:git
 Repo:git://gitorious.org/adaway/adaway.git
 
-Requires Root:yes
-
 Build Version:1.12,13,ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9,subdir=org_adaway/,buildjni=yes
 Build Version:1.15,16,4128e59da2eac5c2904c7c7568d298ca51e79540,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
 Build Version:1.18,19,0b9985398b9eef7baf6aadd0dbb12002bc199d2e,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
+Build Version:1.19,20,ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
+Build Version:1.20,21,695e3801e4081026c8f7213a2345fc451d5eb89c,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
+
+Market Version:1.20
+Market Version Code:21
 
-Market Version:1.18
-Market Version Code:19
diff --git a/metadata/org.adw.launcher.txt b/metadata/org.adw.launcher.txt
index 8ec5d638..56fdc4f1 100644
--- a/metadata/org.adw.launcher.txt
+++ b/metadata/org.adw.launcher.txt
@@ -1,10 +1,9 @@
-
-License:Apache2
 Category:System
+License:Apache2
 Web Site:https://github.com/AnderWeb/android_packages_apps_Launcher
 Source Code:https://github.com/AnderWeb/android_packages_apps_Launcher
 Issue Tracker:https://github.com/AnderWeb/android_packages_apps_Launcher/issues
-Donate:
+
 Summary:Home screen replacement
 Description:
 Home screen replacement.
@@ -15,5 +14,7 @@ Repo:https://github.com/AnderWeb/android_packages_apps_Launcher.git
 
 Build Version:1.3.6 Standalone,34,b28e9e417c81857cfd2e0265c3c6d409d6c8d0f1
 
+Update Check Mode:None
 Market Version:1.3.6 Standalone
 Market Version Code:34
+
diff --git a/metadata/org.andnav.osm.txt b/metadata/org.andnav.osm.txt
index d2a8ea06..b8c78388 100644
--- a/metadata/org.andnav.osm.txt
+++ b/metadata/org.andnav.osm.txt
@@ -1,11 +1,14 @@
-License:LGPL
 Category:Navigation
+License:LGPL
 Web Site:http://code.google.com/p/osmdroid/
 Source Code:http://code.google.com/p/osmdroid/source/checkout
 Issue Tracker:http://code.google.com/p/osmdroid/issues/list
+
 Summary:OpenStreetMap map viewer
 Description:
 Map viewer using OpenStreetMap tiles.
 .
+
 Market Version:2.0.0
 Market Version Code:3
+
diff --git a/metadata/org.androidsoft.games.memory.kids.txt b/metadata/org.androidsoft.games.memory.kids.txt
index dedf9905..c2979ac7 100644
--- a/metadata/org.androidsoft.games.memory.kids.txt
+++ b/metadata/org.androidsoft.games.memory.kids.txt
@@ -1,10 +1,9 @@
-
-License:GPLv3+
 Category:Games
+License:GPLv3+
 Web Site:http://androidsoft.org
 Source Code:http://androidsoft.googlecode.com/svn/trunk/memory/
 Issue Tracker:
-Donate:
+
 Summary:Memory game for kids
 Description:
 A memory game for kids.
@@ -17,3 +16,4 @@ Build Version:1.8.0,13,44,prebuild=rm -rf releases && rm libs/androidsoft-credit
 
 Market Version:1.8.0
 Market Version Code:13
+
diff --git a/metadata/org.connectbot.txt b/metadata/org.connectbot.txt
index 57325fb7..9c65f18f 100644
--- a/metadata/org.connectbot.txt
+++ b/metadata/org.connectbot.txt
@@ -1,20 +1,21 @@
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/connectbot/
 Source Code:http://github.com/kruton/connectbot/
 Issue Tracker:http://code.google.com/p/connectbot/issues/list
+
 Summary:SSH and local shell client
 Description:
 An SSH and telnet client, and terminal emulator for local shell.
 Supports multiple sessions, including running them concurrently.
 .
-Market Version:1.7.1
-Market Version Code:323
+
 Repo Type:git
 Repo:git://github.com/kruton/connectbot.git
 
+Market Version:1.7.1
+Market Version Code:323
 
 #Can't build these versions with SDK tools r7 due to build.xml issues
 #Build Version:1.7.1,323,19fbcefef5251cdfac97
 #Build Version:1.7.0,314,5fbae7cc763edf1056c4
-
diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt
index f515884e..240994b5 100644
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@@ -1,13 +1,15 @@
-License:GPLv2
 Category:Multimedia
+License:GPLv2
 Web Site:http://crengine.sourceforge.net
 Source Code:http://sourceforge.net/scm/?type=git&group_id=191284
 Issue Tracker:http://sourceforge.net/tracker/?group_id=191284
 Donate:http://sourceforge.net/project/project_donations.php?group_id=191284
+
 Summary:E-book reader.
 Description:
 An e-book reader. Supported formats: FB2, TXT, RTF, TCR, HTML, EPUB, CHM.
 .
+
 Repo Type:git
 Repo:git://crengine.git.sourceforge.net/gitroot/crengine/crengine
 
@@ -48,6 +50,11 @@ Build Version:3.0.53-19,264,cr3.0.53-19,subdir=android,rm=android/build.properti
 Build Version:3.0.54-5,275,cr3.0.54-5,subdir=android,rm=android/build.properties,buildjni=yes
 Build Version:3.0.54-9,279,cr3.0.54-9,subdir=android,rm=android/build.properties,buildjni=yes
 Build Version:3.0.54-33,303,cr3.0.54-33,subdir=android,rm=android/build.properties,buildjni=yes
+Build Version:3.0.54-38,308,cr3.0.54-38,subdir=android,rm=android/build.properties,buildjni=yes
+Build Version:3.0.54-47,447,cr3.0.54-47,subdir=android,rm=android/build.properties,buildjni=yes
+Build Version:3.0.55-5,505,cr3.0.55-5,subdir=android,rm=android/build.properties,buildjni=yes
+
+Update Check Mode:Market
+Market Version:3.0.55-5
+Market Version Code:505
 
-Market Version:3.0.54-33
-Market Version Code:303
diff --git a/metadata/org.crocodile.sbautologin.txt b/metadata/org.crocodile.sbautologin.txt
index 0e095088..6e0012c2 100644
--- a/metadata/org.crocodile.sbautologin.txt
+++ b/metadata/org.crocodile.sbautologin.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3+
 Category:Internet
+License:GPLv3+
 Web Site:http://code.google.com/p/sbautologin/
 Source Code:http://code.google.com/p/sbautologin/source/checkout
 Issue Tracker:http://code.google.com/p/sbautologin/issues/list
+
 Summary:Autologin for Starbucks WLAN
 Description:
 Automatically accepts the Terms Of Service when logging into
@@ -13,10 +13,9 @@ a Starbucks WLAN.
 Repo Type:hg
 Repo:https://code.google.com/p/sbautologin/
 
-
 #Temporarily disabled - won't build on the build server due to lack of
 #org.junit (but it's installed!)
 #Build Version:1.6,7,62
-
 Market Version:1.5
 Market Version Code:6
+
diff --git a/metadata/org.curiouscreature.android.shelves.txt b/metadata/org.curiouscreature.android.shelves.txt
index 20e28bcd..4791f9b1 100644
--- a/metadata/org.curiouscreature.android.shelves.txt
+++ b/metadata/org.curiouscreature.android.shelves.txt
@@ -1,17 +1,21 @@
-License:Apache2
 Category:Office
+License:Apache2
 Web Site:http://code.google.com/p/shelves/
 Source Code:http://code.google.com/p/shelves/source/checkout
 Issue Tracker:http://code.google.com/p/shelves/issues/list
+
 Summary:Book collection manager
 Description:
 Shelves lets you manage and search your collection of books from your phone.
 You can add books by scanning their barcodes, using Web searches or entering
 information manually.
 .
+
 Repo Type:svn
 Repo:http://shelves.googlecode.com/svn/trunk/Shelves
+
 Build Version:1.0,1,26,oldsdkloc=yes
-Use Built:Yes
+
 Market Version:1.5
 Market Version Code:2
+
diff --git a/metadata/org.damazio.notifier.txt b/metadata/org.damazio.notifier.txt
index 50baf595..7bee1b20 100644
--- a/metadata/org.damazio.notifier.txt
+++ b/metadata/org.damazio.notifier.txt
@@ -1,14 +1,15 @@
-Use Built:Yes
-License:BSD
 Category:System
+License:BSD
 Web Site:http://code.google.com/p/android-notifier/
 Source Code:http://code.google.com/p/android-notifier/source/checkout
 Issue Tracker:http://code.google.com/p/android-notifier/issues/list
+
 Summary:Notifications from device to desktop
 Description:
 Sends notifications (for example, phone ringing) from the device to a desktop machine
 running the dedicated client software. Get the desktop application from the web site.
 .
+
 Repo Type:svn
 Repo:http://android-notifier.googlecode.com/svn/trunk/AndroidNotifier
 
@@ -16,3 +17,4 @@ Build Version:0.2.8,11,315,fixtrans=yes,prebuild=mkdir libs && mv lib/locale_pla
 
 Market Version:0.2.8
 Market Version Code:11
+
diff --git a/metadata/org.droidseries.txt b/metadata/org.droidseries.txt
index b35231ca..f220226f 100644
--- a/metadata/org.droidseries.txt
+++ b/metadata/org.droidseries.txt
@@ -1,5 +1,5 @@
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://code.google.com/p/droidseries/
 Source Code:http://gitorious.org/droidseries
 Issue Tracker:http://code.google.com/p/droidseries/issues/list
@@ -19,3 +19,4 @@ Build Version:0.1.5-6,13,a72bc0a
 
 Market Version:0.1.5-6
 Market Version Code:13
+
diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt
index c1fd7c06..73204beb 100644
--- a/metadata/org.eehouse.android.xw4.txt
+++ b/metadata/org.eehouse.android.xw4.txt
@@ -1,12 +1,14 @@
-License:GPLv2
 Category:Games
+License:GPLv2
 Web Site:http://xwords.sourceforge.net/android.php
 Source Code:http://xwords.sourceforge.net/source.php
 Issue Tracker:
+
 Summary:A Scrabble-like game
 Description:
 An implementation of a game with the same rules as Scrabble.
 .
+
 Repo Type:git
 Repo:git://xwords.git.sourceforge.net/gitroot/xwords/xwords
 
@@ -15,10 +17,10 @@ Repo:git://xwords.git.sourceforge.net/gitroot/xwords/xwords
 #Build Version:4.4 beta 18,11,android_beta_18,subdir=xwords4/android/XWords4,fixtrans=yes
 #Build Version:4.4 beta 23,16,!Translation files are not valid
 #Build Version:4.4 beta 26,19,!Missing resources? android_beta_26,subdir=xwords4/android/XWords4
-Build Version:4.4 beta 33,26,android_beta_33,subdir=xwords4/android/XWords4
-Build Version:4.4 beta 38,30,android_beta_38,subdir=xwords4/android/XWords4
-Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,target=android-8,prebuild=cd .. && ./scripts/genvers.sh >ant_out.txt
-
+Build Version:4.4 beta 33,26,android_beta_33,subdir=xwords4/android/XWords4,buildjni=yes
+Build Version:4.4 beta 38,30,android_beta_38,subdir=xwords4/android/XWords4,buildjni=yes
+Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buildjni=yes,target=android-8,prebuild=cd .. && ./scripts/genvers.sh >ant_out.txt
 
 Market Version:4.4
 Market Version Code:33
+
diff --git a/metadata/org.example.pushupbuddy.txt b/metadata/org.example.pushupbuddy.txt
index 59d17ce7..79c001ab 100644
--- a/metadata/org.example.pushupbuddy.txt
+++ b/metadata/org.example.pushupbuddy.txt
@@ -1,17 +1,20 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:https://launchpad.net/pushupbuddy/
 Source Code:https://code.launchpad.net/~rheo/pushupbuddy/trunk
 Issue Tracker:https://bugs.launchpad.net/pushupbuddy/
+
 Summary: Measures and logs push-ups using the proximity sensor.
 Description:
 Uses the proximity sensor of your phone to log your push-up workout.
 
 .
+
 Repo Type:bzr
 Repo:lp:~rheo/pushupbuddy/trunk
+
 Build Version:1.0,1,1,bindir=bin/,oldsdkloc=yes
 
 Market Version:1.0
 Market Version Code:1
+
diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index 13dc4789..9c68ac5f 100644
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -1,14 +1,15 @@
-Use Built:Yes
-License:GPLv2+
 Category:System
+License:GPLv2+
 Web Site:http://f-droid.org/repository
 Source Code:http://gitorious.org/f-droid/fdroidclient
 Issue Tracker:http://f-droid.org/issues
+
 Summary:FOSS application repository
 Description:
 FDroid is a... wait a minute. You're running it, how can you not know what
 it is?
 .
+
 Repo Type:git
 Repo:git://gitorious.org/f-droid/fdroidclient.git
 
@@ -16,7 +17,6 @@ Repo:git://gitorious.org/f-droid/fdroidclient.git
 #Build Version:0.12,3,651696a49be2cd7db5ce6a2fa8185e31f9a20035
 #Build Version:0.13,4,4f677285cc2cf0b7e7feb5c9acf61791bec15fbc
 #Build Version:0.16,7,78325dad91a263437ca4ea1210bd494446c4d003
-
 Build Version:0.17,8,c626ce5f6d3e10ae15942f01ff028be310cc695a
 Build Version:0.18,9,a6c9ed8d06b19315df9ba9041324f78139f7d238
 Build Version:0.19,10,540b7d0522f4d67a4896697f7342e4c75b4cbf59
@@ -25,5 +25,7 @@ Build Version:0.21,12,49fa56aa6626a190f2d711120b69e435e9e615b1
 Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68
 Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172
 Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2
+Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b
 
+Update Check Mode:None
 
diff --git a/metadata/org.fdroid.taskstrid.txt b/metadata/org.fdroid.taskstrid.txt
index 38b1e1ab..30d34cb1 100644
--- a/metadata/org.fdroid.taskstrid.txt
+++ b/metadata/org.fdroid.taskstrid.txt
@@ -1,15 +1,18 @@
 Disabled:Still various non-free issues to be resolved
-Use Built:Yes
+Category:None
 License:GPLv2
 Web Site:http://gitorious.org/astrid-foss
 Source Code:http://gitorious.org/astrid-foss
 Issue Tracker:
+
 Summary:Task management tool
 Description:
 A task management tool, based on the popular Astrid. It comes with features like reminders, tagging and
 widgets, but without Astrid features such as ads and proprietary add-ons.
 .
+
 Repo Type:git
 Repo:git://gitorious.org/astrid-foss/astrid-foss.git
+
 Build Version:3.6.4,170,f583967d77a28f7a83392095d7edb1537dfe8a73,submodules=yes,prebuild=sed -i "s@\.\./astridApi@astridApi@" default.properties
 
diff --git a/metadata/org.fosdem.txt b/metadata/org.fosdem.txt
index 8aa7218d..2352d042 100644
--- a/metadata/org.fosdem.txt
+++ b/metadata/org.fosdem.txt
@@ -1,13 +1,14 @@
-Use Built:Yes
-License:GPL
 Category:Office
+License:GPL
 Web Site:http://fosdem.org
 Source Code:http://sourceforge.net/projects/fosdem-android/develop
 Issue Tracker:http://sourceforge.net/tracker/?group_id=283580
+
 Summary:FOSDEM schedule
 Description:
 FOSDEM schedule application.
 .
+
 Repo Type:svn
 Repo:http://fosdem-android.svn.sourceforge.net/svnroot/fosdem-android
 
@@ -16,3 +17,4 @@ Build Version:1.0.3,5,!Source for this market version not in repo
 
 Market Version:1.0.3
 Market Version Code:5
+
diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt
index 72bc7d5b..37514868 100644
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@@ -1,9 +1,10 @@
-License:GPLv2+
 Category:Multimedia
+License:GPLv2+
 Web Site:http://www.fbreader.org/FBReaderJ/
 Source Code:https://github.com/geometer/FBReaderJ
 Issue Tracker:
 Donate:http://www.fbreader.org/donation/make.php
+
 Summary:An e-book reader
 Description:
 An e-book reader.
@@ -26,13 +27,11 @@ Build Version:1.1.2,10102,1.1.2,antcommand=package
 Build Version:1.1.8,101081,1.1.8,antcommand=package
 Build Version:1.1.9,101091,1.1.9,antcommand=package
 Build Version:1.1.10,101101,13ee5d79431815dd694e,antcommand=package
-
-Build Version:1.2.2,102021,e63c553aeb032da828b270a735f0171d8d22c54c,buildjni=yes,target=android-9,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
-Build Version:1.2.3,102031,46d83bb4351c2f6ec51e0d9aa6202c86c1297e7f,buildjni=yes,target=android-9,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
-Build Version:1.2.4,102041,6426bcf131d4,buildjni=yes,target=android-9,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.2.2,102021,e63c553aeb032da828b270a735f0171d8d22c54c,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.2.3,102031,46d83bb4351c2f6ec51e0d9aa6202c86c1297e7f,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.2.4,102041,6426bcf131d4,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.2.6,102061,1.2.6,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
 
 Market Version:1.2.5
 Market Version Code:102051
 
-
-
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index 464757a6..eb8cc517 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -1,7 +1,9 @@
-License:GPLv2+
 Category:Multimedia
+License:GPLv2+
 Web Site:http://xmp.sourceforge.net/
 Source Code:http://sourceforge.net/projects/xmp/develop
+Issue Tracker:
+
 Summary:Tracker module player
 Description:
 The Extended Module Player, or xmp, is a portable module player. Xmp plays
@@ -10,9 +12,9 @@ Apple IIgs and PC. This is an experimental port built with the Android NDK
 and a Java interface. All module formats are supported, but external file
 compressors are not.
 .
+
 Repo Type:git
 Repo:git://xmp.git.sourceforge.net/gitroot/xmp/xmp
-Use Built:Yes
 
 # This is one of those projects that put the changelog in the version
 # number, so fix that with insertversion.
@@ -22,3 +24,4 @@ insertversion=2.1.0[^"]*
 
 Market Version:2.4.0
 Market Version Code:20
+
diff --git a/metadata/org.hermit.audalyzer.txt b/metadata/org.hermit.audalyzer.txt
index 6c0294d5..400cec70 100644
--- a/metadata/org.hermit.audalyzer.txt
+++ b/metadata/org.hermit.audalyzer.txt
@@ -1,8 +1,9 @@
-License:GPLv2
 Category:Multimedia
+License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Audalyzer
 Source Code:http://code.google.com/p/moonblink/source/checkout
 Issue Tracker:http://code.google.com/p/moonblink/issues/list
+
 Summary:Audio analyser
 Description:
 Realtime spectrum analysis of audio (via the microphone).
@@ -14,7 +15,6 @@ Repo:http://moonblink.googlecode.com/svn/trunk/
 #Need to build the associated (in the repo) libraries first...
 #Build Version:1.14,15,774,subdir=Audalyzer
 #Build Version:1.15,16,954,subdir=Audalyzer
-
 Market Version:1.15
 Market Version Code:16
 
diff --git a/metadata/org.hermit.dazzle.txt b/metadata/org.hermit.dazzle.txt
new file mode 100644
index 00000000..6e943f51
--- /dev/null
+++ b/metadata/org.hermit.dazzle.txt
@@ -0,0 +1,25 @@
+Category:System
+License:GPLv2
+Web Site:https://code.google.com/p/moonblink/wiki/Dazzle
+Source Code:https://moonblink.googlecode.com/svn/trunk/Dazzle/
+Issue Tracker:https://code.google.com/p/moonblink/issues/list
+
+Summary:Configurable switcher widget
+Description:
+Dazzle is a configurable switcher widget; it allows you to create one or more
+switcher widgets, in four sizes, with your choice of controls. You can choose
+from WiFi, Bluetooth, GPS, airplane mode, and brightness controls; on
+supported devices, brightness lets you toggle between auto and manual modes.
+.
+
+Repo Type:svn
+Repo:http://moonblink.googlecode.com/svn/trunk
+
+Market Version:2.9
+Market Version Code:12
+
+# Build fails, probably also needs to build ../HermitLibrary
+#Build Version:2.9,12,907,subdir=Dazzle,target=android-4,prebuild=\
+#	cp build.xml local.properties ../HermitAndroid/ && \
+#	cd ../HermitAndroid/ && \
+#	cp default.properties project.properties
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index 24c6385c..82c127ed 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -1,13 +1,16 @@
-License:GPLv2
 Category:Games
+License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/ScrambledNet
 Source Code:http://code.google.com/p/moonblink/source/checkout
 Issue Tracker:http://code.google.com/p/moonblink/issues/list
+
 Summary:Puzzle game
 Description:
 A puzzle game where the player is given a network diagram with the parts of
 the network randomly rotated and must rotate them to connect all the terminals
 to the server. A port of the KDE game "knetwalk".
 .
+
 Market Version:5.0.2
 Market Version Code:28
+
diff --git a/metadata/org.hermit.tricorder.txt b/metadata/org.hermit.tricorder.txt
index 6e4c7081..26a0f248 100644
--- a/metadata/org.hermit.tricorder.txt
+++ b/metadata/org.hermit.tricorder.txt
@@ -1,11 +1,14 @@
-License:GPLv2
 Category:Games
+License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Tricorder
 Source Code:http://code.google.com/p/moonblink/source/checkout
 Issue Tracker:http://code.google.com/p/moonblink/issues/list
+
 Summary:Fully functional Star Trek style Tricorder
 Description:
 Turns your Android device into a functional Tricorder in the style of Star Trek.
 .
+
 Market Version:5.12
 Market Version Code:41
+
diff --git a/metadata/org.jessies.mathdroid.txt b/metadata/org.jessies.mathdroid.txt
index e4e96053..ad836277 100644
--- a/metadata/org.jessies.mathdroid.txt
+++ b/metadata/org.jessies.mathdroid.txt
@@ -1,19 +1,19 @@
-
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:https://code.google.com/p/enh/wiki/Mathdroid
 Source Code:https://code.google.com/p/enh/source/checkout
 Issue Tracker:
-Donate:
+
 Summary:Calculator
 Description:
 A calculator with full on-screen history and many functions.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://enh.googlecode.com/svn/trunk
 
-Build Version:2.5,25,525,oldsdkloc=yes,target=android-9,subdir=mathdroid,prebuild=rm src/org/jessies/test && mkdir src/org/jessies/test && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Assert.java -O src/org/jessies/test/Assert.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Test.java -O src/org/jessies/test/Test.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/TestHelper.java -O src/org/jessies/test/TestHelper.java
+Build Version:2.5,25,525,oldsdkloc=yes,target=android-10,subdir=mathdroid,prebuild=rm -rf src/org/jessies/test && mkdir src/org/jessies/test && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Assert.java -O src/org/jessies/test/Assert.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Test.java -O src/org/jessies/test/Test.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/TestHelper.java -O src/org/jessies/test/TestHelper.java
 
 Market Version:2.5
 Market Version Code:25
+
diff --git a/metadata/org.jfedor.frozenbubble.txt b/metadata/org.jfedor.frozenbubble.txt
index a1f5a8ca..89a7c4d2 100644
--- a/metadata/org.jfedor.frozenbubble.txt
+++ b/metadata/org.jfedor.frozenbubble.txt
@@ -1,16 +1,14 @@
-Use Built:Yes
-License:GPLv2
 Category:Games
+License:GPLv2
 Web Site:http://code.google.com/p/frozenbubbleandroid/
 Source Code:http://code.google.com/p/frozenbubbleandroid/source/checkout
 Issue Tracker:http://code.google.com/p/frozenbubbleandroid/issues/list
+
 Summary:Bubble shooting game
 Description:
 A bubble shooting game. Knock the bubbles down by forming clusters of three
 or more bubbles.
 .
-Market Version:1.11
-Market Version Code:12
 
 Repo Type:svn
 Repo:http://frozenbubbleandroid.googlecode.com/svn/
@@ -20,3 +18,6 @@ Build Version:1.8,9,16
 Build Version:1.10,11,18
 Build Version:1.11,12,r19
 
+Market Version:1.12
+Market Version Code:13
+
diff --git a/metadata/org.johanhil.flygtider.txt b/metadata/org.johanhil.flygtider.txt
index c91fa5f2..12d262fa 100644
--- a/metadata/org.johanhil.flygtider.txt
+++ b/metadata/org.johanhil.flygtider.txt
@@ -1,16 +1,17 @@
-License:Apache2
 Category:Office
+License:Apache2
 Web Site:http://code.google.com/p/flygtider/
 Source Code:http://code.google.com/p/flygtider/source/checkout
 Issue Tracker:http://code.google.com/p/flygtider/issues/list
+
 Summary:Flight status info for Swedish airports
 Description:
 Flygtider is an Android application that lists information about flights
 arriving to/departing from most Swedish airports.
 .
+
 Repo Type:svn
 Repo:http://flygtider.googlecode.com/svn/trunk
-Use Built:Yes
 
 # Several versions, including the one available in the market, are
 # missing from the Subversion repository.
@@ -19,3 +20,4 @@ Build Version:0.61,8,!This version was never committed
 
 Market Version:0.61
 Market Version Code:8
+
diff --git a/metadata/org.jtb.alogcat.txt b/metadata/org.jtb.alogcat.txt
index da8dfccc..783afe49 100644
--- a/metadata/org.jtb.alogcat.txt
+++ b/metadata/org.jtb.alogcat.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:http://code.google.com/p/alogcat/
 Source Code:http://code.google.com/p/alogcat/source/checkout
 Issue Tracker:http://code.google.com/p/alogcat/issues/list
+
 Summary:Log viewer
 Description:
 Log viewer - an app equivalent of logcat from the Android shell, or
diff --git a/metadata/org.jtb.droidlife.txt b/metadata/org.jtb.droidlife.txt
index ace9f521..ad5af9e2 100644
--- a/metadata/org.jtb.droidlife.txt
+++ b/metadata/org.jtb.droidlife.txt
@@ -1,8 +1,9 @@
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://code.google.com/p/droidlife/
 Source Code:http://code.google.com/p/droidlife/source/checkout
 Issue Tracker:http://code.google.com/p/droidlife/issues/list
+
 Summary:Conway's Game of Life
 Description:
 An implementation of Conway's Game of Life.
@@ -15,3 +16,4 @@ Build Version:2.4.1,21,22
 
 Market Version:2.4.1
 Market Version Code:21
+
diff --git a/metadata/org.jtb.httpmon.txt b/metadata/org.jtb.httpmon.txt
index 3bfd21a1..36b69422 100644
--- a/metadata/org.jtb.httpmon.txt
+++ b/metadata/org.jtb.httpmon.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:http://code.google.com/p/httpmon/
 Source Code:http://code.google.com/p/httpmon/source/checkout
 Issue Tracker:http://code.google.com/p/httpmon/issues/list
+
 Summary:HTTP monitor
 Description:
 A simple HTTP monitoring application. Get notified when remote web sites are
 down.
 .
+
 Market Version:0.4.10
 Market Version Code:27
+
diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt
index 2aaa395b..7f335230 100644
--- a/metadata/org.kost.externalip.txt
+++ b/metadata/org.kost.externalip.txt
@@ -1,8 +1,9 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:https://code.google.com/p/external-ip/
 Source Code:https://code.google.com/p/external-ip/source/checkout
 Issue Tracker:https://code.google.com/p/external-ip/issues/list
+
 Summary:Android application to display IP addresses
 Description:
 Simple application to display IP addresses in form that you can copy&paste them.
@@ -17,3 +18,4 @@ Build Version:1.2,3,431da48bfb10,target=android-8
 
 Market Version:1.2
 Market Version Code:3
+
diff --git a/metadata/org.kreed.vanilla.txt b/metadata/org.kreed.vanilla.txt
index b02d1f3a..0fa8a57b 100644
--- a/metadata/org.kreed.vanilla.txt
+++ b/metadata/org.kreed.vanilla.txt
@@ -1,6 +1,9 @@
-License:GPLv3+
 Category:Multimedia
+License:GPLv3+
+Web Site:
 Source Code:https://github.com/kreed/vanilla
+Issue Tracker:
+
 Summary:Simple and streamlined music player
 Description:
 Vanilla Music Player is designed to be simple and streamlined. The playback
@@ -8,11 +11,12 @@ screen is clean and minimal. Music is played from a continuous stream of
 random songs from your music library with the ability for you to enqueue
 songs of your choosing.
 .
+
 Repo Type:git
 Repo:https://github.com/kreed/vanilla.git
-Use Built:Yes
 
 Build Version:0.1,16,4169dd05b3ac321555bb8436fd2a90f93e52b49d
 
 Market Version:0.1
 Market Version Code:16
+
diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index 9eb77350..4688a50e 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -1,10 +1,14 @@
-License:GPLv2+
 Category:Internet
+License:GPLv2+
 Web Site:http://www.linphone.org
 Source Code:http://www.linphone.org/eng/download/git.html
+Issue Tracker:
+
 Summary:SIP (VOIP) client
 Description:
 A SIP (VOIP) client.
 .
+
 Market Version:1.2.2
 Market Version Code:1220
+
diff --git a/metadata/org.mailboxer.saymyname.txt b/metadata/org.mailboxer.saymyname.txt
index ea5977e2..38651391 100644
--- a/metadata/org.mailboxer.saymyname.txt
+++ b/metadata/org.mailboxer.saymyname.txt
@@ -1,14 +1,17 @@
 Disabled:Issues with a) Google Analytics usage tracking, b) ads, c) vague licensing
 AntiFeatures:Ads,Tracking
-License:GPLv2
 Category:Office
+License:GPLv2
 Web Site:http://tomtasche.at/p/SayMyName
 Source Code:http://github.com/TomTasche/SayMyName
 Issue Tracker:http://code.google.com/p/roadtoadc/issues/list
+
 Summary:Text to speech on incoming caller name
 Description:
 SayMyName reads out loud the name saved in your address book and tells you
 who's calling. Also works with incoming SMS and email via K-9 Mail.
 .
+
 Market Version:2.5.4.6 (http://goo.gl/N10G)
 Market Version Code:131
+
diff --git a/metadata/org.marcus905.wifi.ace.txt b/metadata/org.marcus905.wifi.ace.txt
index de1263fd..6eb679ca 100644
--- a/metadata/org.marcus905.wifi.ace.txt
+++ b/metadata/org.marcus905.wifi.ace.txt
@@ -1,16 +1,20 @@
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/android-wifi-ace/
 Source Code:http://code.google.com/p/android-wifi-ace/source/checkout
 Issue Tracker:http://code.google.com/p/android-wifi-ace/issues/list
+
 Summary: WiFi Advanced Configuration Editor
 Description:
 WiFi ACE lets you fine tune the settings of your configured wireless
 networks, such as BSSID, ciphers, WEP keys and various WPA options.
 .
+
 Repo Type:svn
 Repo:http://android-wifi-ace.googlecode.com/svn/trunk/WiFiACE
+
 Build Version:0.10,20100924,13
-Use Built:Yes
+
 Market Version:0.10
 Market Version Code:20100924
+
diff --git a/metadata/org.mixare.txt b/metadata/org.mixare.txt
index 7c09c235..d97e78ec 100644
--- a/metadata/org.mixare.txt
+++ b/metadata/org.mixare.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Navigation
+License:GPLv3
 Web Site:http://www.mixare.org/
 Source Code:http://github.com/mixare/mixare
 Issue Tracker:http://code.google.com/p/mixare/issues/list
+
 Summary:Augmented reality browser
 Description:
 An augmented reality browser.
@@ -16,3 +16,4 @@ Build Version:0.6.6,14,v0.6.6
 
 Market Version:0.7.3
 Market Version Code:20
+
diff --git a/metadata/org.moparisthebest.appbak.txt b/metadata/org.moparisthebest.appbak.txt
index 1d704df1..dd338ae3 100644
--- a/metadata/org.moparisthebest.appbak.txt
+++ b/metadata/org.moparisthebest.appbak.txt
@@ -1,12 +1,15 @@
-License:GPL
 Category:System
+License:GPL
 Web Site:http://android.moparisthebest.org/index.php/apps/appbak
 Source Code:http://android.moparisthebest.org/src/AppBak_v1.0.7z
 Issue Tracker:
+
 Summary:Back up list of installed apps
 Description:
 Simple way to back up (and restore) a list of installed applications to a file
 on your SD card.
 .
+
 Market Version:1.0
 Market Version Code:2
+
diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index 679dc16e..98d68311 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -1,10 +1,14 @@
-License:MPL
 Category:Internet
+License:MPL
 Web Site:http://www.firefox.com
 Source Code:http://hg.mozilla.org/
 Issue Tracker:
+
 Summary:Firefox Mobile
 Description:
 Firefox Mobile web browser.
 .
 
+Market Version:9.0
+Market Version Code:2011121613
+
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index a4435fb9..bc0438bb 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -1,14 +1,15 @@
-Use Built:Yes
-License:GPLv2+
 Category:Multimedia
+License:GPLv2+
 Web Site:http://code.google.com/p/daap-client/
 Source Code:http://code.google.com/p/daap-client/source/checkout
 Issue Tracker:http://code.google.com/p/daap-client/issues/list
+
 Summary:DAAP Client
 Description:
 Client for DAAP (Digital Audio Access Protocol) servers. Supports streaming,
 queuing, playlists, and searching.
 .
+
 Repo Type:svn
 Repo:http://daap-client.googlecode.com/svn/trunk
 
@@ -18,3 +19,4 @@ Build Version:.9.6.2,38,!No corresponding source in repo
 
 Market Version:.9.6.2
 Market Version Code:38
+
diff --git a/metadata/org.mustard.android.txt b/metadata/org.mustard.android.txt
index 1a131b31..d95751af 100644
--- a/metadata/org.mustard.android.txt
+++ b/metadata/org.mustard.android.txt
@@ -1,9 +1,10 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://mustard.macno.org
 Source Code:http://gitorious.org/~macno/mustard/macnos-clone/
 Issue Tracker:https://bugs.launchpad.net/mustardroid
 Donate:http://mustard.macno.org/donate
+
 Summary:Microblogging client for StatusNet/identi.ca
 Description:
 Mustard is the first full-featured statusnet (like identica) client application for android.
@@ -12,3 +13,4 @@ It has many features like attachments, geolocation and avatar update. It support
 
 Market Version:0.3.0
 Market Version Code:126
+
diff --git a/metadata/org.mythdroid.txt b/metadata/org.mythdroid.txt
index 3222abae..3a6b0537 100644
--- a/metadata/org.mythdroid.txt
+++ b/metadata/org.mythdroid.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://code.google.com/p/mythdroid/
 Source Code:http://code.google.com/p/mythdroid/source/checkout
 Issue Tracker:http://code.google.com/p/mythdroid/issues/list
-Donate:
+
 Summary:MythTV remote control system
 Description:
 A remote control system for MythTV featuring:
@@ -29,4 +28,5 @@ Repo Type:svn
 Repo:http://mythdroid.googlecode.com/svn/trunk/
 
 Build Version:0.4.3,4,244,prebuild=mv lib libs
+Build Version:0.5.3,53,572,prebuild=mv lib libs,target=android-11
 
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index eef30390..10a2a797 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -1,13 +1,16 @@
-License:GPLv2
 Category:Navigation
+License:GPLv2
 Web Site:http://sourceforge.net/projects/navit/
 Source Code:http://navit.svn.sourceforge.net/viewvc/navit
 Issue Tracker:http://trac.navit-project.org/
+
 Summary:Car navigation system
 Description:
 Modular car navigation system with GPS tracking, realtime routing engine and
 support for various vector map formats. This is a beta version which may not
 work very well!
 .
+
 Market Version:navit 0.5.0
 Market Version Code:4785
+
diff --git a/metadata/org.openintents.flashlight.txt b/metadata/org.openintents.flashlight.txt
new file mode 100644
index 00000000..6fcb1ce1
--- /dev/null
+++ b/metadata/org.openintents.flashlight.txt
@@ -0,0 +1,21 @@
+Disabled:Build problem
+Category:Office
+License:Apache2
+Web Site:http://code.google.com/p/openintents
+Source Code:http://code.google.com/p/openintents/source/browse/#svn%2Ftrunk%2Fflashlight%2FFlashlight
+Issue Tracker:http://code.google.com/p/openintents/issues
+
+Summary:A flashlight to see in the dark
+Description:
+A flashlight with color settings.
+It can use the phone's screen, or the flash of the phone's camera if there is one.
+.
+
+Repo Type:svn
+Repo:http://openintents.googlecode.com/svn/trunk/flashlight/Flashlight
+
+Build Version:1.1,10011,3971,target=android-15
+
+Market Version:1.1
+Market Version Code:10011
+
diff --git a/metadata/org.openintents.notepad.txt b/metadata/org.openintents.notepad.txt
index e58af144..757ddef5 100644
--- a/metadata/org.openintents.notepad.txt
+++ b/metadata/org.openintents.notepad.txt
@@ -1,11 +1,14 @@
-License:Apache2
 Category:Office
+License:Apache2
 Web Site:http://www.openintents.org/en/notepad
 Source Code:https://code.google.com/p/openintents/source/checkout
 Issue Tracker:https://code.google.com/p/openintents/issues/list
+
 Summary:Notepad
 Description:
 OI Notepad allows to create, edit, send, and delete notes.
 .
+
 Market Version:1.2.3
 Market Version Code:10065
+
diff --git a/metadata/org.opensatnav.txt b/metadata/org.opensatnav.txt
index 0dd4a74f..d41eac3c 100644
--- a/metadata/org.opensatnav.txt
+++ b/metadata/org.opensatnav.txt
@@ -1,10 +1,12 @@
-License:GPLv3
 Category:Navigation
+License:GPLv3
 Web Site:https://launchpad.net/opensatnav
 Source Code:https://code.launchpad.net/opensatnav
 Issue Tracker:https://bugs.launchpad.net/opensatnav
+
 Summary:Satellite Navigation
 Description:
 Satellite Navitation using OpenStreetMap data. Supports car, bicycle and
 pedestrian modes of transport.
 .
+
diff --git a/metadata/org.paulmach.textedit.txt b/metadata/org.paulmach.textedit.txt
index d017a31c..d243f01a 100644
--- a/metadata/org.paulmach.textedit.txt
+++ b/metadata/org.paulmach.textedit.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:http://textedit.paulmach.com/
 Source Code:https://github.com/paulmach/Text-Edit-for-Android
 Issue Tracker:https://github.com/paulmach/Text-Edit-for-Android/issues
+
 Summary:A text editor
 Description:
 Text Edit is a simple notepad application. It opens, edits and saves text files on the
@@ -12,6 +12,7 @@ SD card.
 Unfortunately, this app is not recommended for large files. This is a limitation of the
 text display mechanism in the Android OS.
 .
+
 Repo Type:git
 Repo:https://github.com/paulmach/Text-Edit-for-Android.git
 
@@ -20,3 +21,4 @@ Build Version:1.4.1,14,cddfa34997bf3da10586,target=android-8,patch=set1.4.1.patc
 
 Market Version:1.5
 Market Version Code:15
+
diff --git a/metadata/org.penghuang.tools.rotationlock.txt b/metadata/org.penghuang.tools.rotationlock.txt
new file mode 100644
index 00000000..d9dad556
--- /dev/null
+++ b/metadata/org.penghuang.tools.rotationlock.txt
@@ -0,0 +1,22 @@
+Category:System
+License:GPLv2
+Web Site:https://market.android.com/details?id=org.penghuang.tools.rotationlock
+Source Code:https://github.com/phuang/RotationLock
+Issue Tracker:https://github.com/phuang/RotationLock/issues
+
+Summary:Rotation Lock
+Description:
+Turn on/off Auto-rotate screen quickly by long pressing search button.
+
+When you are lying on bed. The screen changes to landscape. Have to open system settings to disable Auto-rotate screen. Did you find it is really inconvenient? This app provides a super easy way for switching this setting.
+And it provides a state icon to indicate the current setting.
+.
+
+Repo Type:git
+Repo:https://github.com/phuang/RotationLock
+
+Build Version:1.4,5,7c5d43c2ed17a9329abf6b6af07f150e7d0cbd5b,target=android-4
+
+Market Version:1.4
+Market Version Code:5
+
diff --git a/metadata/org.piwik.mobile.txt b/metadata/org.piwik.mobile.txt
index 35cad9ca..faefaebf 100644
--- a/metadata/org.piwik.mobile.txt
+++ b/metadata/org.piwik.mobile.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://piwik.org/
 Source Code:http://dev.piwik.org/trac/browser/mobile
 Issue Tracker:
+
 Summary:Client for Piwik
 Description:
 Piwik is an open-source web analytics package. Piwik Mobile is a client that gives
 you access to your statistics.
 .
+
 Market Version:1.6.2
 Market Version Code:10
+
diff --git a/metadata/org.pocketworkstation.pckeyboard.txt b/metadata/org.pocketworkstation.pckeyboard.txt
index 4d1f84ef..b6f7dd3e 100644
--- a/metadata/org.pocketworkstation.pckeyboard.txt
+++ b/metadata/org.pocketworkstation.pckeyboard.txt
@@ -1,17 +1,15 @@
-Use Built:Yes
-License:Apache2
 Category:System
-Name:Hacker's Keyboard
+License:Apache2
 Web Site:http://code.google.com/p/hackerskeyboard/
 Source Code:http://code.google.com/p/hackerskeyboard/source/checkout
 Issue Tracker:http://code.google.com/p/hackerskeyboard/issues/list
-Donate:
+
+Name:Hacker's Keyboard
 Summary:5-row keyboard
 Description:
 A five row soft-keyboard with additional punctuation, and tab and ctrl keys.
 .
 
-
 Repo Type:hg
 Repo:https://hackerskeyboard.googlecode.com/hg/
 
@@ -21,3 +19,4 @@ Build Version:v1.22,1022,154e21230e81,subdir=java,target=android-11,buildjni=yes
 
 Market Version:v1.27
 Market Version Code:1027
+
diff --git a/metadata/org.scoutant.blokish.txt b/metadata/org.scoutant.blokish.txt
index b8b88b1d..90753194 100644
--- a/metadata/org.scoutant.blokish.txt
+++ b/metadata/org.scoutant.blokish.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Games
+License:GPLv3
 Web Site:http://blokish.scoutant.org/
 Source Code:https://github.com/scoutant/blokish
 Issue Tracker:https://github.com/scoutant/blokish/issues
-Donate:
+
 Summary:Board game
 Description:
 A strategy board game.
@@ -12,10 +12,11 @@ A strategy board game.
 Repo Type:git
 Repo:git://github.com/scoutant/blokish.git
 
-Build Version:0.5,1,ca2e9096c6d5140c14e7,target=android-9
-Build Version:1.4,7,82ca58cdd26797f9ba9519e79c54031282d066af,target=android-9
-Build Version:1.5,8,e6ab83e8832f03d78bf3f8deae33acb22a7ba520,target=android-9
-Build Version:1.6,9,ebd1b966b70e,target=android-9
+Build Version:0.5,1,ca2e9096c6d5140c14e7,target=android-10
+Build Version:1.4,7,82ca58cdd26797f9ba9519e79c54031282d066af,target=android-10
+Build Version:1.5,8,e6ab83e8832f03d78bf3f8deae33acb22a7ba520,target=android-10
+Build Version:1.6,9,ebd1b966b70e,target=android-10
 
 Market Version:1.6
 Market Version Code:9
+
diff --git a/metadata/org.sipdroid.sipua.txt b/metadata/org.sipdroid.sipua.txt
index 735464d2..21db3585 100644
--- a/metadata/org.sipdroid.sipua.txt
+++ b/metadata/org.sipdroid.sipua.txt
@@ -1,11 +1,14 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://sipdroid.org/
 Source Code:http://code.google.com/p/sipdroid/source/checkout
 Issue Tracker:http://code.google.com/p/sipdroid/issues/list
+
 Summary:A SIP (VOIP) client
 Description:
 A SIP (VOIP) client with video calling capabilities.
 .
+
 Market Version:2.4
 Market Version Code:87
+
diff --git a/metadata/org.sixgun.ponyexpress.txt b/metadata/org.sixgun.ponyexpress.txt
index dea9c33d..263a69c7 100644
--- a/metadata/org.sixgun.ponyexpress.txt
+++ b/metadata/org.sixgun.ponyexpress.txt
@@ -1,15 +1,16 @@
-Use Built:Yes
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://wiki.sixgun.org/ponyexpress/start
 Source Code:http://gitorious.org/ponyexpress
 Issue Tracker:
+
 Summary:SixGun Productions mobile application
 Description:
 Mobile application for SixGun Productions - producers of the Linux Outlaws podcast
 and more. Download and play podcasts and join identi.ca conversations about them
 direct from this application.
 .
+
 Repo Type:git
 Repo:git://gitorious.org/ponyexpress/mainline.git
 
@@ -17,7 +18,8 @@ Build Version:0.4.1,5,d64eace51a0c053fc8356ddd6b54a1372617a470
 Build Version:0.4.2,8,38eb1f2141225a95c8a96fedfbdfcf34beeeeb9b
 Build Version:0.4.3,9,0.4.3
 Build Version:1.0,11,efc427322038febb25d6ca909bf8c4157f685839
-Build Version:1.1,12,1.1,target=android-9
+Build Version:1.1,12,1.1,target=android-10
 
 Market Version:1.1
 Market Version Code:12
+
diff --git a/metadata/org.sparkleshare.android.txt b/metadata/org.sparkleshare.android.txt
index 735fa5fe..7d57ae4e 100644
--- a/metadata/org.sparkleshare.android.txt
+++ b/metadata/org.sparkleshare.android.txt
@@ -1,8 +1,9 @@
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:http://www.sparkleshare.org
 Source Code:https://github.com/NewProggie/SparkleShare-Android
 Issue Tracker:https://github.com/NewProggie/SparkleShare-Android/issues
+
 Summary:distributed collaboration and sharing tool
 Description:
 SparkleShare is a collaboration and sharing tool that is designed to keep
@@ -16,3 +17,7 @@ Repo Type:git
 Repo:https://github.com/NewProggie/SparkleShare-Android.git
 
 Build Version:1.0,1,a9e23f0f9ae6161a786bf48cb48ab3dec20110c9,prebuild=rm -rf gen/ && rm -rf bin/,target=android-7
+
+Market Version:1.0
+Market Version Code:1
+
diff --git a/metadata/org.swiftp.txt b/metadata/org.swiftp.txt
index 52a5f673..ceefe403 100644
--- a/metadata/org.swiftp.txt
+++ b/metadata/org.swiftp.txt
@@ -1,23 +1,23 @@
-License:GPLv3+
 Category:Internet
+License:GPLv3+
 Web Site:http://code.google.com/p/swiftp/
 Source Code:http://code.google.com/p/swiftp/source/checkout
 Issue Tracker:http://code.google.com/p/swiftp/issues/list
 Donate:http://www.swiftp.org/donate.html
+
 Summary:FTP server
 Description:
 An FTP server allowing remote access to files on your SD card (or any files on the
 device, optionally, if you have root access).
 .
 
-Market Version:1.24
-Market Version Code:17
 Repo Type:svn
 Repo:http://swiftp.googlecode.com/svn/trunk/
 
+Market Version:1.24
+Market Version Code:17
+
 #Can't build this version - see http://code.google.com/p/swiftp/issues/detail?id=128
 #Build Version:1.24,17,69,target=android-3
-
 #Can't build this version - res/values/strings.xml:117: error: Apostrophe not preceded by \
 #Build Version:1.23,15,66,target=android-3
-
diff --git a/metadata/org.thialfihar.android.apg.txt b/metadata/org.thialfihar.android.apg.txt
index 8fc18a11..c97ebedc 100644
--- a/metadata/org.thialfihar.android.apg.txt
+++ b/metadata/org.thialfihar.android.apg.txt
@@ -1,13 +1,16 @@
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:http://code.google.com/p/android-privacy-guard/
 Source Code:http://code.google.com/p/android-privacy-guard/source/checkout
 Issue Tracker:http://code.google.com/p/android-privacy-guard/issues/list
+
 Summary:OpenPGP port - encrypt email and files
 Description:
 APG is a port of OpenPGP for Android. Use it to encrypt and decrypt files, and in
 conjunction with K-9 Mail, to seamlessly add support for encyrpting and decrypting
 emails, as well as adding and verifying digital signatures.
 .
+
 Market Version:1.0.8
 Market Version Code:10899
+
diff --git a/metadata/org.thoughtcrime.securesms.txt b/metadata/org.thoughtcrime.securesms.txt
index 00ca9444..8dbee37c 100644
--- a/metadata/org.thoughtcrime.securesms.txt
+++ b/metadata/org.thoughtcrime.securesms.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:Cryptography
+License:GPLv3
 Web Site:http://www.whispersys.com/
 Source Code:https://github.com/WhisperSystems/TextSecure
 Issue Tracker:
-Donate:
+
 Summary:SMS Encryption
 Description:
 TextSecure is a drop-in replacement for the standard text messaging application,
@@ -16,5 +16,8 @@ with someone else also using TextSecure.
 Repo Type:git
 Repo:https://github.com/WhisperSystems/TextSecure.git
 
-Build Version:0.5.7,21,6a30867fd481474e8634b508d524863bc8a6b565,target=android-9
+Build Version:0.5.7,21,6a30867fd481474e8634b508d524863bc8a6b565,target=android-10
+
+Market Version:0.5.7
+Market Version Code:21
 
diff --git a/metadata/org.tomdroid.txt b/metadata/org.tomdroid.txt
index 63d97982..196a078e 100644
--- a/metadata/org.tomdroid.txt
+++ b/metadata/org.tomdroid.txt
@@ -1,18 +1,21 @@
-Use Built:Yes
-License:GPLv3+
 Category:Office
+License:GPLv3+
 Web Site:https://launchpad.net/tomdroid
 Source Code:https://code.launchpad.net/~tomdroid-maintainers/tomdroid/main
 Issue Tracker:https://bugs.launchpad.net/tomdroid
+
 Summary:Note taker
 Description:
 A note taking application. A port of the popular desktop application Tomboy.
 
 This is an early release, and does not yet have editing support!
 .
+
 Repo Type:bzr
 Repo:lp:tomdroid
+
 Build Version:0.4.1,6,214
 
 Market Version:0.4.1
 Market Version Code:6
+
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 7efbaa34..79082fc4 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -1,12 +1,16 @@
-License:BSD
 Category:Internet
+License:BSD
 Web Site:http://www.torproject.org/docs/android.html.en
 Source Code:https://svn.torproject.org/svn/projects/android/
 Issue Tracker:https://trac.torproject.org/projects/tor
+
 Summary:Tor client
 Description:
 A Tor client allowing private internet access via a local SOCKS or HTTP proxy. On a rooted
 device, the proxying can be completely transparent.
 .
-Market Version:0.2.3.7-alpha-orbot-1.0.6
-Market Version Code:21
+
+Update Check Mode:Market
+Market Version:0.2.3.10-alpha-orbot-1.0.7-RC1
+Market Version Code:23
+
diff --git a/metadata/org.transdroid.txt b/metadata/org.transdroid.txt
index a3703b49..4121bdee 100644
--- a/metadata/org.transdroid.txt
+++ b/metadata/org.transdroid.txt
@@ -1,8 +1,9 @@
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://www.transdroid.org/
 Source Code:http://code.google.com/p/transdroid/source/checkout
 Issue Tracker:http://code.google.com/p/transdroid/issues/list
+
 Summary:Remote control for Bittorrent clients
 Description:
 Transdroid is an Android remote client for your torrent application running on a
@@ -10,5 +11,7 @@ server or home computer. Currently Transmission, uTorrent, Bittorrent, Deluge, V
 and rTorrent are supported. It can show the active torrents, pause, resume or remove
 them and new torrents can be added via URL, RSS feed or using the integrated search.
 .
+
 Market Version:1.0.4
 Market Version Code:136
+
diff --git a/metadata/org.ttrssreader.txt b/metadata/org.ttrssreader.txt
index 859aaa57..0b3043ff 100644
--- a/metadata/org.ttrssreader.txt
+++ b/metadata/org.ttrssreader.txt
@@ -1,27 +1,24 @@
-Use Built:Yes
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://code.google.com/p/ttrss-reader-fork/
 Source Code:http://code.google.com/p/ttrss-reader-fork/source/checkout
 Issue Tracker:http://code.google.com/p/ttrss-reader-fork/issues/list
 Donate:http://code.google.com/p/ttrss-reader-fork/wiki/Donations
+
 Summary:An RSS reader for Tiny Tiny RSS
 Description:
 An offline reader that works with the Tiny Tiny RSS web-based feed reader/aggregator..
 .
+
 Repo Type:hg
 Repo:https://ttrss-reader-fork.googlecode.com/hg/
 
 Build Version:0.8.4,840,v0.8.4,subdir=ttrss-reader
-
 #This has the wrong version code in the repo (850 instead of 851)
 Build Version:0.8.5,850,v0.8.5,subdir=ttrss-reader
-
 Build Version:0.8.6,860,v0.8.6,subdir=ttrss-reader
-
 Build Version:0.8.8,880,5faddbaaf7,subdir=ttrss-reader
 Build Version:0.8.8,881,!Same as 880 just different code in repo
-
 Build Version:0.8.9,892,9ba20fcfb6,subdir=ttrss-reader,target=android-8
 Build Version:0.9.1,911,0.9.1,subdir=ttrss-reader,target=android-8
 # Tag is hosed for 0.9.3
@@ -34,12 +31,11 @@ Build Version:1.03,1032,c374163ba16f,subdir=ttrss-reader,target=android-8
 Build Version:1.04,1040,1.04,subdir=ttrss-reader,target=android-8
 Build Version:1.05,1050,bb0bbb042e7c,subdir=ttrss-reader,target=android-8
 Build Version:1.07,1075,1.07 (4),subdir=ttrss-reader,target=android-8
-
 #This is not building - No resource identifier found for attribute 'marginRight' in package 'android'
 #Build Version:1.08,1080,1.08,subdir=ttrss-reader,target=android-8
-
 Build Version:1.21,1210,1.21,subdir=ttrss-reader,target=android-8
 Build Version:1.22,1220,1.22,subdir=ttrss-reader,target=android-8
 
 Market Version:1.22
 Market Version Code:1220
+
diff --git a/metadata/org.vudroid.txt b/metadata/org.vudroid.txt
index 79cc3675..fb5825ad 100644
--- a/metadata/org.vudroid.txt
+++ b/metadata/org.vudroid.txt
@@ -1,13 +1,14 @@
-Use Built:Yes
-License:GPLv3
 Category:Multimedia
+License:GPLv3
 Web Site:http://code.google.com/p/vudroid/
 Source Code:http://code.google.com/p/vudroid/source/checkout
 Issue Tracker:http://code.google.com/p/vudroid/issues/list
+
 Summary:DjVu and PDF document reader
 Description:
 A document reader for DjVu and PDF files.
 .
+
 Repo Type:svn
 Repo:http://vudroid.googlecode.com/svn/trunk/
 
@@ -17,3 +18,4 @@ Build Version:1.4,5,56,buildjni=yes,target=android-8
 
 Market Version:1.4
 Market Version Code:5
+
diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt
index dcafbb58..27b8c831 100644
--- a/metadata/org.wahtod.wififixer.txt
+++ b/metadata/org.wahtod.wififixer.txt
@@ -1,14 +1,15 @@
-Use Built:Yes
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://wififixer.wordpress.com
 Source Code:https://github.com/Zanshinmu/Wifi-Fixer
 Issue Tracker:https://github.com/Zanshinmu/Wifi-Fixer/issues
 Donate:http://wififixer.wordpress.com/donate/
+
 Summary:Resets broken WiFi connections
 Description:
 Detects and resets a broken WiFi connection.
 .
+
 Repo Type:git
 Repo:https://github.com/Zanshinmu/Wifi-Fixer.git
 
@@ -23,3 +24,4 @@ Build Version:0.9.0.1,915,!commit 7155ca938dc1 but can't compile for some reason
 
 Market Version:0.9.0.1
 Market Version Code:915
+
diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt
index 0c9540fd..bca296e3 100644
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv2
 Category:Internet
+License:GPLv2
 Web Site:http://android.wordpress.org/
 Source Code:https://android.trac.wordpress.org/browser
 Issue Tracker:http://android.trac.wordpress.org/
+
 Summary:WordPress client
 Description:
 A client for WordPress blogs, which allows post creation and editing, and comment
@@ -21,5 +21,6 @@ Repo:http://android.svn.wordpress.org/trunk/
 Build Version:1.3.9,31,202,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8
 Build Version:1.4.1,33,228,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8
 
-Market Version:2.0.1
-Market Version Code:39
+Market Version:2.0.3
+Market Version Code:42
+
diff --git a/metadata/org.xbmc.android.remote.txt b/metadata/org.xbmc.android.remote.txt
index e178818e..31381ea3 100644
--- a/metadata/org.xbmc.android.remote.txt
+++ b/metadata/org.xbmc.android.remote.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPLv2
 Category:Multimedia
+License:GPLv2
 Web Site:http://code.google.com/p/android-xbmcremote/
 Source Code:http://code.google.com/p/android-xbmcremote/source/checkout
 Issue Tracker:http://code.google.com/p/android-xbmcremote/issues/list
+
 Summary:Remote control for XBMC Media Center
 Description:
 The official remote control for XBMC Media Center.
@@ -17,5 +17,6 @@ Repo:http://android-xbmcremote.googlecode.com/svn/trunk/XBMC%20Remote
 Build Version:0.8.5-beta1,730,730,encoding=utf-8,prebuild=mv lib libs && mv lib-src/org/codehaus src/org/
 Build Version:0.8.6-beta1,768,768,encoding=utf-8,prebuild=mv lib libs && mv lib-src/org/codehaus src/org/
 
-Market Version:0.8.7-beta1
-Market Version Code:807
+Market Version:0.8.8-beta1
+Market Version Code:808
+
diff --git a/metadata/org.xcsoar.txt b/metadata/org.xcsoar.txt
new file mode 100644
index 00000000..7df8fdb1
--- /dev/null
+++ b/metadata/org.xcsoar.txt
@@ -0,0 +1,21 @@
+Category:Navigation
+License:GPLv2
+Web Site:http://xcsoar.org/
+Source Code:http://git.xcsoar.org/cgit/master/xcsoar.git/
+Issue Tracker:http://xcsoar.org/trac/report
+
+Summary:Tactical glide computer for Para/Soaring Pilots
+Description:
+XCSoar is a tactical glide computer for soaring and para glider pilots. It
+supports navigation, airspace warnings, final glide calculations, wind
+calculation, collision avoidance and many many more features.
+.
+
+Repo Type:git
+Repo:http://git.xcsoar.org/cgit/master/xcsoar.git/
+
+Market Version:6.2.4
+Market Version Code:51
+
+#Far too difficult to build - binary in repo
+#Build Version:6.2.4,51,95a3ad045eb05cb69b11b274f27c7eae387b9c40
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index d14360fb..588509ab 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-
-License:GPLv3+
 Category:Internet
+License:GPLv3+
 Web Site:http://www.yaaic.org
 Source Code:http://github.com/pocmo/Yaaic/
 Issue Tracker:http://github.com/pocmo/Yaaic/issues
+
 Summary:IRC client
 Description:
 Yaaic (Yet Another Android IRC Client) is an Internet Relay Chat (IRC) client.
@@ -15,7 +14,6 @@ Repo:https://github.com/pocmo/Yaaic.git
 
 #Last binary version...
 #Build Version:0.6.1,8,4d04ca810df9f859d8e5,subdir=application,bindir=builds/ant
-
 Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant
 Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant
 Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant
diff --git a/metadata/org.yaxim.androidclient.txt b/metadata/org.yaxim.androidclient.txt
index e74f65fb..e062c333 100644
--- a/metadata/org.yaxim.androidclient.txt
+++ b/metadata/org.yaxim.androidclient.txt
@@ -1,13 +1,14 @@
-Use Built:Yes
-License:GPLv2
 Category:Internet
+License:GPLv2
 Web Site:http://yaxim.org
 Source Code:https://github.com/ge0rg/yaxim
 Issue Tracker:https://github.com/pfleidi/yaxim/issues
+
 Summary:XMPP client
 Description:
 An XMPP client.
 .
+
 Repo Type:git
 Repo:https://github.com/ge0rg/yaxim.git
 
@@ -19,5 +20,6 @@ Build Version:0.8.0,9,0.8.0,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=and
 Build Version:0.8.1,10,0.8.1,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
 Build Version:0.8.2,11,0.8.2,oldsdkloc=yes,submodules=yes,fixtrans=yes,target=android-10
 
-Market Version:0.8.2
-Market Version Code:11
+Market Version:0.8.3
+Market Version Code:12
+
diff --git a/metadata/org.zirco.txt b/metadata/org.zirco.txt
index 4dd34cba..c1296ce3 100644
--- a/metadata/org.zirco.txt
+++ b/metadata/org.zirco.txt
@@ -1,10 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Internet
+License:GPLv3
 Web Site:http://code.google.com/p/zirco-browser
 Source Code:http://code.google.com/p/zirco-browser/source/checkout
 Issue Tracker:http://code.google.com/p/zirco-browser/issues/list
-Donate:
+
 Summary:Web browser with ad blocker
 Description:
 A web browser featuring:
@@ -17,15 +16,17 @@ A web browser featuring:
 *Ad-blocker
 .
 
-Repo Type:svn
-Repo:http://zirco-browser.googlecode.com/svn/trunk/
+Repo Type:git-svn
+Repo:http://zirco-browser.googlecode.com/svn/trunk
 
 Build Version:0.3.6,10,315
 Build Version:0.3.7,11,329
 Build Version:0.3.8,12,339
 Build Version:0.3.9,13,367
 Build Version:0.4.1,15,407
-Build Version:0.4.2,16,438,target=android-9
+Build Version:0.4.2,16,438,target=android-10
+Build Version:0.4.3,17,443,target=android-10
+
+Market Version:0.4.3
+Market Version Code:17
 
-Market Version:0.4.2
-Market Version Code:16
diff --git a/metadata/pl.magot.vetch.ancal.txt b/metadata/pl.magot.vetch.ancal.txt
index 3666055e..985ac3f1 100644
--- a/metadata/pl.magot.vetch.ancal.txt
+++ b/metadata/pl.magot.vetch.ancal.txt
@@ -1,14 +1,15 @@
 Disabled:Conflicting copyright message, see http://code.google.com/p/ancal/issues/detail?id=8
-Use Built:Yes
-License:MIT
 Category:Office
+License:MIT
 Web Site:http://code.google.com/p/ancal/
 Source Code:http://code.google.com/p/ancal/source/checkout
 Issue Tracker:http://code.google.com/p/ancal/issues/list
+
 Summary:Calendar
 Description:
 A calendar application.
 .
+
 Repo Type:svn
 Repo:http://ancal.googlecode.com/svn/trunk/
 
@@ -16,3 +17,4 @@ Build Version:1.6,32,23,fixtrans=yes
 
 Market Version:1.5
 Market Version Code:31
+
diff --git a/metadata/remuco.client.android.txt b/metadata/remuco.client.android.txt
new file mode 100644
index 00000000..7860f8f3
--- /dev/null
+++ b/metadata/remuco.client.android.txt
@@ -0,0 +1,28 @@
+Category:Multimedia
+License:GPLv3
+Web Site:https://code.google.com/p/remuco/
+Source Code:https://code.google.com/p/remuco/source/browse/
+Issue Tracker:https://code.google.com/p/remuco/wiki/Issues?tm=3
+Donate:http://flattr.com/thing/141543/Remuco
+
+Summary:Remote control for Linux media players
+Description:
+Remuco is a duplex remote control system for Linux media players and mobile
+phones equipped with Bluetooth or WiFi.
+
+With Remuco, you can remotely control your favorite media player. You can
+switch to the next, previous, or any other media within the current playlist,
+browse your media library and activate other playlists, rate your media,
+adjust volume, and more. On the mobile phone it displays information about
+the current media, including cover art.
+
+Remuco can be used with Amarok, Audacious, Banshee, Clementine, Exaile,
+gmusicbrowser, MPD, MPlayer, Rhythmbox, Songbird, Totem, TVtime, VLC and
+XMMS2. 
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/remuco/
+
+Build Version:0.9.6,1,0.9.6,subdir=client/android,prebuild=cp -R ../common/src .,target=android-10
+
diff --git a/metadata/ru.gelin.android.weather.notification.txt b/metadata/ru.gelin.android.weather.notification.txt
index b7689b37..37d83ccc 100644
--- a/metadata/ru.gelin.android.weather.notification.txt
+++ b/metadata/ru.gelin.android.weather.notification.txt
@@ -1,11 +1,13 @@
-License:GPLv2
 Category:Internet
+License:GPLv2
 Web Site:https://code.google.com/p/weather-notification-android/
 Source Code:https://code.google.com/p/weather-notification-android/source/browse/
 Issue Tracker:https://code.google.com/p/weather-notification-android/issues/list
-Summary: Displays the air temperature and other weather conditions in the Android notification bar. 
-Description:Simple application which displays the air temperature
-and other weather conditions in the Android notification bar.
+
+Summary:Weather info in notification bar
+Description:
+Simple application which displays the air temperature
+and other weather conditions in the notification bar.
 The air temperature is always visible like a system clock. 
 .
 
@@ -16,3 +18,4 @@ Build Version:0.2-beta2,23,253d9dc3022a,target=android-4
 
 Market Version:0.2-beta2
 Market Version Code:23
+
diff --git a/metadata/ru.orangesoftware.financisto.txt b/metadata/ru.orangesoftware.financisto.txt
new file mode 100644
index 00000000..7b535a56
--- /dev/null
+++ b/metadata/ru.orangesoftware.financisto.txt
@@ -0,0 +1,27 @@
+Category:Office
+License:GPLv2
+Web Site:http://financisto.com/
+Source Code:http://bazaar.launchpad.net/~financisto-dev/financisto/trunk/files
+Issue Tracker:https://bugs.launchpad.net/financisto
+
+Summary:Personal finance manager
+Description:
+Personal finance manager
+- Multiple accounts with multiple currencies
+- Scheduled and recurring transactions
+- Transfers with downloadable currency rates
+- Location based transactions
+- Hierarchial categories with custom attributes
+- Projects to organize transactions
+- Recurring budgets based on categories and projects
+- Advanced reporting and filtering
+.
+
+Repo Type:bzr
+Repo:lp:financisto
+
+Market Version:1.5.4u1
+Market Version Code:59
+
+# Build fails, wrong path to GreenDroid library
+#Build Version:1.5.4,57,303,target=android-4
diff --git a/metadata/se.johanhil.clipboard.txt b/metadata/se.johanhil.clipboard.txt
index 97a7e9e1..82aa8639 100644
--- a/metadata/se.johanhil.clipboard.txt
+++ b/metadata/se.johanhil.clipboard.txt
@@ -1,11 +1,11 @@
+Category:System
 # There is no license notice in the source, probably because any
 # such notice would be longer than the code itself.
 License:
-Category:System
 Web Site:https://github.com/johanhil/copy-to-clipboard
 Source Code:https://github.com/johanhil/copy-to-clipboard
 Issue Tracker:https://github.com/johanhil/copy-to-clipboard/issues
-Donate:
+
 Summary:Copy to clipboard via the share menu
 Description:
 Copy to Clipboard integrates in to the Share menu, allowing you to
@@ -15,9 +15,12 @@ SMS/e-mail/tweet/etc.
 This is useful when you want to share text to an application that does
 not implement the regular "send to" functionality, such as GTalk.
 .
+
 Repo Type:git
 Repo:https://github.com/johanhil/copy-to-clipboard.git
-Use Built:Yes
+
 Build Version:1.0,2,c6c466770fb7215d957118216c2414ae69ca1bc8,target=4
+
 Market Version:1.0
 Market Version Code:2
+
diff --git a/metadata/se.johanhil.duckduckgo.txt b/metadata/se.johanhil.duckduckgo.txt
index ca215c56..88efb27b 100644
--- a/metadata/se.johanhil.duckduckgo.txt
+++ b/metadata/se.johanhil.duckduckgo.txt
@@ -1,16 +1,16 @@
-Use Built:Yes
-License:Apache2
 Category:Internet
+License:Apache2
 Web Site:https://github.com/johanhil/ddg-android
 Source Code:https://github.com/johanhil/ddg-android
 Issue Tracker:https://github.com/johanhil/ddg-android/issues
-Donate:
-Summary:Duck Duck Go search provider
+
+Summary:DuckDuckGo search provider
 Description:
-Integrates the search engine Duck Duck Go with the Android OS. It adds
+Integrates the search engine DuckDuckGo with the Android OS. It adds
 another web search provider to the system and some neat suggestions
 for the user.
 .
+
 Repo Type:git
 Repo:https://github.com/johanhil/ddg-android.git
 
@@ -18,3 +18,4 @@ Build Version:0.1,1,5a8b23c01eff6560bb9f5a815187c389f421b2b2,target=android-4
 
 Market Version:0.1
 Market Version Code:1
+
diff --git a/metadata/se.peterbjorkman.android.trafikinfo.txt b/metadata/se.peterbjorkman.android.trafikinfo.txt
index 044d109f..cead3237 100644
--- a/metadata/se.peterbjorkman.android.trafikinfo.txt
+++ b/metadata/se.peterbjorkman.android.trafikinfo.txt
@@ -1,17 +1,21 @@
-License:GPLv3+
 Category:Navigation
+License:GPLv3+
 Web Site:http://android.trafikinfo.nu/
 Source Code:http://code.google.com/p/trafikinfoandroid/source/checkout
 Issue Tracker:http://code.google.com/p/trafikinfoandroid/issues/list
+
 Summary:Show Swedish traffic information
 Description:
 This application shows traffic information received from Trafikverket,
 the Swedish Transport Administration.
 .
+
 Repo Type:svn
 Repo:http://trafikinfoandroid.googlecode.com/svn/trunk
+
 Build Version:0.9,12,628,encoding=utf-8
 Build Version:0.9.1,13,630,encoding=utf-8
-Use Built:Yes
+
 Market Version:0.9.1
 Market Version Code:13
+
diff --git a/metadata/seanfoy.wherering.txt b/metadata/seanfoy.wherering.txt
index c8f0da89..7522ea05 100644
--- a/metadata/seanfoy.wherering.txt
+++ b/metadata/seanfoy.wherering.txt
@@ -1,12 +1,15 @@
-License:GPLv3
 Category:Navigation
+License:GPLv3
 Web Site:http://code.google.com/p/wherering/
 Source Code:http://code.google.com/p/wherering/source/checkout
 Issue Tracker:http://code.google.com/p/wherering/issues/list
+
 Summary:Automatically change ring mode by location
 Description:
 Automatically changes the phone's ring mode (silent, vibrate, etc) according to your
 current location.
 .
+
 Market Version:1.99.0
 Market Version Code:99
+
diff --git a/metadata/template b/metadata/template
index a25143bc..fbc6619d 100644
--- a/metadata/template
+++ b/metadata/template
@@ -1,9 +1,10 @@
-License:
 Category:
+License:
 Web Site:
 Source Code:
 Issue Tracker:
 Donate:
+
 Summary:
 Description:
 
diff --git a/metadata/tkj.android.homecontrol.mythmote.txt b/metadata/tkj.android.homecontrol.mythmote.txt
index b2874feb..92a64389 100644
--- a/metadata/tkj.android.homecontrol.mythmote.txt
+++ b/metadata/tkj.android.homecontrol.mythmote.txt
@@ -1,16 +1,20 @@
-License:GPLv2
 Category:Multimedia
+License:GPLv2
 Web Site:http://code.google.com/p/mythmote/
 Source Code:http://code.google.com/p/mythmote/source/checkout
 Issue Tracker:http://code.google.com/p/mythmote/issues/list
+
 Summary:Remote control for MythTV
 Description:
 A network remote control for MythTV.
 .
-Market Version:1.5.1
-Market Version Code:10
 
 Repo Type:svn
 Repo:http://mythmote.googlecode.com/svn/trunk/
 
 #Build Version:1.4.0,8,126,rm=src/tkj/android/homecontrol/mythmote/R.java
+
+Update Check Mode:Market
+Market Version:1.6.0
+Market Version Code:11
+
diff --git a/metadata/to.networld.android.divedroid.txt b/metadata/to.networld.android.divedroid.txt
index 8cbe702f..cc1edc16 100644
--- a/metadata/to.networld.android.divedroid.txt
+++ b/metadata/to.networld.android.divedroid.txt
@@ -1,8 +1,9 @@
-Use Built:Yes
-License:GPLv3
 Category:Office
+License:GPLv3
 Web Site:http://divedroid.android.networld.to
 Source Code:git://networld.to/var/scm/android/DiveDroid.git
+Issue Tracker:
+
 Summary:Scuba Dive Logbook
 Description:
 Android Dive Logbook. Based on http://scubadive.networld.to
@@ -22,7 +23,3 @@ Repo:git://networld.to/var/scm/android/DiveDroid.git
 
 Build Version:0.6,1,c50b1e638253cedf32dce49ef836fd30ba6071f9,encoding=utf-8,prebuild=mkdir libs && cd libs && wget http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.3.zip && unzip -j jaxen-1.1.3.zip jaxen-1.1.3/jaxen-1.1.3.jar && rm *.zip && wget -O org.dom4j.jar http://sourceforge.net/projects/dom4j/files/dom4j-2.0.0-ALPHA-2/dom4j-2.0.0-ALPHA-2.jar/download && wget http://achartengine.googlecode.com/files/achartengine-0.5.0.jar && cd ..
 
-
-
-
-
diff --git a/metadata/to.networld.android.foafviewer.txt b/metadata/to.networld.android.foafviewer.txt
index eae041b6..dc85f7d4 100644
--- a/metadata/to.networld.android.foafviewer.txt
+++ b/metadata/to.networld.android.foafviewer.txt
@@ -1,8 +1,10 @@
-Use Built:Yes
-License:GPLv3
+Disabled:Build problem
 Category:Office
+License:GPLv3
 Web Site:http://foafviewer.android.networld.to
 Source Code:git://networld.to/var/scm/android/FOAFViewer.git
+Issue Tracker:
+
 Summary:FOAF (Friend Of A Friend) Viewer
 Description:
 FOAF (Friend Of A Friend) Viewer with support for recursive
@@ -15,7 +17,6 @@ Repo:git://networld.to/var/scm/android/FOAFViewer.git
 
 Build Version:0.11,3,FOAFViewer_v0.11,prebuild=mkdir libs && cd libs && wget http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.3.zip && unzip -j jaxen-1.1.3.zip jaxen-1.1.3/jaxen-1.1.3.jar && rm *.zip && wget -O org.dom4j.jar http://sourceforge.net/projects/dom4j/files/dom4j-2.0.0-ALPHA-2/dom4j-2.0.0-ALPHA-2.jar/download && cd ..
 
-Disabled:Build problem
 #
 # Dependencies resolved I think (see above), but there is still a build error:
 #
@@ -24,4 +25,3 @@ Disabled:Build problem
 # [javac] required: java.util.List<org.dom4j.Element>
 # [javac] 			return this.document.selectNodes("");
 #
-
diff --git a/metadata/tuioDroid.impl.txt b/metadata/tuioDroid.impl.txt
index 2152f44e..2e551240 100644
--- a/metadata/tuioDroid.impl.txt
+++ b/metadata/tuioDroid.impl.txt
@@ -1,9 +1,9 @@
-License:GPLv3
 Category:System
+License:GPLv3
 Web Site:https://code.google.com/p/tuiodroid/
 Source Code:https://code.google.com/p/tuiodroid/source/checkout
 Issue Tracker:https://code.google.com/p/tuiodroid/issues/list
-Donate:
+
 Summary:TUIO tracker
 Description:
 A TUIO tracker which allows multi-touch control input, which is sent to a
@@ -17,3 +17,4 @@ Build Version:1.0,4,28,subdir=TUIOdroid,prebuild=rm -rf bin && rm -rf gen,target
 
 Market Version:1.0
 Market Version Code:4
+
diff --git a/metadata/urbanstew.RehearsalAssistant.txt b/metadata/urbanstew.RehearsalAssistant.txt
index 877e18ba..8ec8be16 100644
--- a/metadata/urbanstew.RehearsalAssistant.txt
+++ b/metadata/urbanstew.RehearsalAssistant.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:GPL
 Category:Office
+License:GPL
 Web Site:http://urbanstew.org/rehearsalassistant/
 Source Code:http://sourceforge.net/projects/rehearsalassist/develop
 Issue Tracker:http://sourceforge.net/tracker/?group_id=226240
+
 Summary:A voice/sound recording tool
 Description:
 A voice / sound recording utility with two modes of operation:
@@ -13,6 +13,7 @@ A voice / sound recording utility with two modes of operation:
 
 Either mode allows you to review and e-mail the recordings afterward.
 .
+
 Repo Type:svn
 Repo:https://rehearsalassist.svn.sourceforge.net/svnroot/rehearsalassist/android/trunk
 
@@ -21,3 +22,4 @@ Build Version:0.9,26,!Source missing - see https://sourceforge.net/tracker/index
 
 Market Version:0.9
 Market Version Code:26
+
diff --git a/metadata/vu.de.urpool.quickdroid.txt b/metadata/vu.de.urpool.quickdroid.txt
index afacccd5..3c351a08 100644
--- a/metadata/vu.de.urpool.quickdroid.txt
+++ b/metadata/vu.de.urpool.quickdroid.txt
@@ -1,9 +1,9 @@
-Use Built:Yes
-License:Apache2
 Category:System
+License:Apache2
 Web Site:http://code.google.com/p/quickdroid/
 Source Code:http://code.google.com/p/quickdroid/source/checkout
 Issue Tracker:http://code.google.com/p/quickdroid/issues/list
+
 Summary:Quickly search apps, contacts, bookmarks and music.
 Description:
 Quickly search, find and launch apps, contacts, bookmarks, artists,
@@ -16,8 +16,9 @@ Repo Type:svn
 Repo:http://quickdroid.googlecode.com/svn/trunk
 
 Build Version:2.9.4,31,65,subdir=Quickdroid,target=android-7
-Build Version:3.0,37,75,subdir=Quickdroid,target=android-9
-Build Version:3.0.1,38,76,subdir=Quickdroid,target=android-9
+Build Version:3.0,37,75,subdir=Quickdroid,target=android-10
+Build Version:3.0.1,38,76,subdir=Quickdroid,target=android-10
 
 Market Version:4.0.1
 Market Version Code:41
+
diff --git a/checkmarket.py b/rewritemeta.py
similarity index 52%
rename from checkmarket.py
rename to rewritemeta.py
index f8e5c80c..e3535da2 100755
--- a/checkmarket.py
+++ b/rewritemeta.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# checkmarket.py - part of the FDroid server tools
-# Copyright (C) 2011, Ciaran Gultnieks, ciaran@ciarang.com
+# rewritemeta.py - part of the FDroid server tools
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,16 +17,32 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import subprocess
+import sys
+import os
+import shutil
+import re
+import urllib
+import time
+from optparse import OptionParser
+import HTMLParser
+import common
 
 #Read configuration...
-repo_name = None
-repo_description = None
-repo_icon = None
-repo_url = None
 execfile('config.py')
 
-subprocess.call('./run.sh ' + market_user + ' ' + market_password
-    + ' ' + market_deviceid,
-    cwd='marketcheck', shell=True)
+
+# Parse command line...
+parser = OptionParser()
+parser.add_option("-v", "--verbose", action="store_true", default=False,
+                  help="Spew out even more information than normal")
+(options, args) = parser.parse_args()
+
+# Get all apps...
+apps = common.read_metadata(options.verbose)
+
+for app in apps:
+    print "Writing " + app['id']
+    common.write_metadata(os.path.join('metadata', app['id']) + '.txt', app)
+
+print "Finished."
 
diff --git a/scanner.py b/scanner.py
index 843c287f..2f30b439 100755
--- a/scanner.py
+++ b/scanner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # scanner.py - part of the FDroid server tools
@@ -24,9 +24,12 @@ import re
 import urllib
 import time
 import subprocess
+import traceback
 from optparse import OptionParser
 import HTMLParser
 import common
+from common import BuildException
+from common import VCSException
 
 #Read configuration...
 execfile('config.py')
@@ -36,6 +39,8 @@ execfile('config.py')
 parser = OptionParser()
 parser.add_option("-v", "--verbose", action="store_true", default=False,
                   help="Spew out even more information than normal")
+parser.add_option("-p", "--package", default=None,
+                  help="Scan only the specified package")
 (options, args) = parser.parse_args()
 
 # Get all apps...
@@ -47,93 +52,73 @@ problems = []
 
 for app in apps:
 
-    if app['disabled']:
+    skip = False
+    if options.package and app['id'] != options.package:
+        skip = True
+    elif app['Disabled']:
         print "Skipping %s: disabled" % app['id']
+        skip = True
     elif not app['builds']:
         print "Skipping %s: no builds specified" % app['id']
+        skip = True
 
-    if (app['disabled'] is None and app['repo'] != '' 
-            and app['repotype'] != '' and len(app['builds']) > 0):
+    if not skip:
 
         print "Processing " + app['id']
 
-        build_dir = 'build/' + app['id']
+        try:
 
-        # Set up vcs interface and make sure we have the latest code...
-        vcs = common.getvcs(app['repotype'], app['repo'], build_dir)
+            build_dir = 'build/' + app['id']
 
-        refreshed_source = False
+            # Set up vcs interface and make sure we have the latest code...
+            vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
+
+            refreshed_source = False
 
 
-        for thisbuild in app['builds']:
+            for thisbuild in app['builds']:
 
-            if thisbuild['commit'].startswith('!'):
-                print ("..skipping version " + thisbuild['version'] + " - " +
-                        thisbuild['commit'][1:])
-            else:
-                print "..scanning version " + thisbuild['version']
+                if thisbuild['commit'].startswith('!'):
+                    print ("..skipping version " + thisbuild['version'] + " - " +
+                            thisbuild['commit'][1:])
+                else:
+                    print "..scanning version " + thisbuild['version']
 
-                if not refreshed_source:
-                    vcs.refreshlocal()
+                    # Prepare the source code...
+                    root_dir = common.prepare_source(vcs, app, thisbuild,
+                            build_dir, sdk_path, ndk_path, javacc_path,
+                            not refreshed_source)
                     refreshed_source = True
 
-                # Optionally, the actual app source can be in a subdirectory...
-                if thisbuild.has_key('subdir'):
-                    root_dir = os.path.join(build_dir, thisbuild['subdir'])
-                else:
-                    root_dir = build_dir
+                    # Scan for common known non-free blobs:
+                    usual_suspects = ['flurryagent.jar',
+                                      'paypal_mpl.jar',
+                                      'libGoogleAnalytics.jar',
+                                      'admob-sdk-android.jar']
+                    for r,d,f in os.walk(build_dir):
+                        for curfile in f:
+                            if curfile.lower() in usual_suspects:
+                                msg = 'Found probable non-free blob ' + os.path.join(r, curfile)
+                                msg += ' in ' + app['id'] + ' ' + thisbuild['version']
+                                problems.append(msg)
 
-                # Get a working copy of the right revision...
-                if options.verbose:
-                    print "Resetting repository to " + thisbuild['commit']
-                vcs.reset(thisbuild['commit'])
+                    # Presence of a jni directory without buildjni=yes might
+                    # indicate a problem...
+                    if (os.path.exists(os.path.join(root_dir, 'jni')) and 
+                            thisbuild.get('buildjni', 'no') != 'yes'):
+                        msg = 'Found jni directory, but buildjni is not enabled'
+                        msg += ' in ' + app['id'] + ' ' + thisbuild['version']
+                        problems.append(msg)
 
-                # Initialise submodules if requred...
-                if thisbuild.get('submodules', 'no')  == 'yes':
-                    vcs.initsubmodules()
-
-                # Generate (or update) the ant build file, build.xml...
-                if (thisbuild.get('update', 'yes') == 'yes' and
-                       not thisbuild.has_key('maven')):
-                    parms = [os.path.join(sdk_path, 'tools', 'android'),
-                             'update', 'project', '-p', '.']
-                    parms.append('--subprojects')
-                    if thisbuild.has_key('target'):
-                        parms.append('-t')
-                        parms.append(thisbuild['target'])
-                    if subprocess.call(parms, cwd=root_dir) != 0:
-                        print "Failed to update project"
-                        sys.exit(1)
-
-                # Delete unwanted file...
-                if thisbuild.has_key('rm'):
-                    os.remove(os.path.join(build_dir, thisbuild['rm']))
-
-                # Run a pre-build command if one is required...
-                if thisbuild.has_key('prebuild'):
-                    if subprocess.call(thisbuild['prebuild'],
-                            cwd=root_dir, shell=True) != 0:
-                        print "Error running pre-build command"
-                        sys.exit(1)
-
-                # Apply patches if any
-                if 'patch' in thisbuild:
-                    for patch in thisbuild['patch'].split(';'):
-                        print "Applying " + patch
-                        patch_path = os.path.join('metadata', app['id'], patch)
-                        if subprocess.call(['patch', '-p1',
-                                        '-i', os.path.abspath(patch_path)], cwd=build_dir) != 0:
-                            print "Failed to apply patch %s" % patch_path
-                            sys.exit(1)
-
-                # Scan for common known non-free blobs:
-                usual_suspects = ['flurryagent.jar', 'paypal_mpl.jar']
-                for r,d,f in os.walk(build_dir):
-                    for curfile in f:
-                        if curfile.lower() in usual_suspects:
-                            msg = 'Found probable non-free blob ' + os.path.join(r,file)
-                            msg += ' in ' + app['id'] + ' ' + thisbuild['version']
-                            problems.append(msg)
+        except BuildException as be:
+            msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be)
+            problems.append(msg)
+        except VCSException as vcse:
+            msg = "VCS error while scanning app %s: %s" % (app['id'], vcse)
+            problems.append(msg)
+        except Exception:
+            msg = "Could not scan app %s due to unknown error: %s" % (app['id'], traceback.format_exc())
+            problems.append(msg)
 
 print "Finished:"
 for problem in problems:
diff --git a/update.py b/update.py
index e6758d12..738eb528 100755
--- a/update.py
+++ b/update.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # update.py - part of the FDroid server tools
-# Copyright (C) 2010-11, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -101,7 +101,7 @@ for apkfile in glob.glob(os.path.join('repo','*.apk')):
         sys.exit(1)
     for line in output.splitlines():
         if line.startswith("package:"):
-            pat = re.compile(".*name='([a-zA-Z0-9.]*)'.*")
+            pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
             thisinfo['id'] = re.match(pat, line).group(1)
             pat = re.compile(".*versionCode='([0-9]*)'.*")
             thisinfo['versioncode'] = int(re.match(pat, line).group(1))
@@ -193,14 +193,14 @@ for app in apps:
                 bestapk = apk
 
     if bestver == 0:
-        if app['name'] is None:
-            app['name'] = app['id']
+        if app['Name'] is None:
+            app['Name'] = app['id']
         app['icon'] = ''
-        if app['disabled'] is None:
+        if app['Disabled'] is None:
             print "WARNING: Application " + app['id'] + " has no packages"
     else:
-        if app['name'] is None:
-            app['name'] = bestapk['name']
+        if app['Name'] is None:
+            app['Name'] = bestapk['name']
         app['icon'] = bestapk['icon']
 
 # Generate warnings for apk's with no metadata (or create skeleton
@@ -229,7 +229,7 @@ for apk in apks:
             print "       " + apk['name'] + " - " + apk['version']  
 
 #Sort the app list by name, then the web site doesn't have to by default:
-apps = sorted(apps, key=lambda app: app['name'].upper())
+apps = sorted(apps, key=lambda app: app['Name'].upper())
 
 # Create the index
 doc = Document()
@@ -283,14 +283,14 @@ apps_nopkg = 0
 
 for app in apps:
 
-    if app['disabled'] is None:
+    if app['Disabled'] is None:
 
         # Get a list of the apks for this app...
         gotmarketver = False
         apklist = []
         for apk in apks:
             if apk['id'] == app['id']:
-                if str(apk['versioncode']) == app['marketvercode']:
+                if str(apk['versioncode']) == app['Market Version Code']:
                     gotmarketver = True
                 apklist.append(apk)
 
@@ -303,23 +303,24 @@ for app in apps:
             root.appendChild(apel)
 
             addElement('id', app['id'], doc, apel)
-            addElement('name', app['name'], doc, apel)
-            addElement('summary', app['summary'], doc, apel)
+            addElement('name', app['Name'], doc, apel)
+            addElement('summary', app['Summary'], doc, apel)
             addElement('icon', app['icon'], doc, apel)
-            addElement('description', app['description'], doc, apel)
-            addElement('license', app['license'], doc, apel)
-            if 'category' in app:
-                addElement('category', app['category'], doc, apel)
-            addElement('web', app['web'], doc, apel)
-            addElement('source', app['source'], doc, apel)
-            addElement('tracker', app['tracker'], doc, apel)
-            if app['donate'] != None:
-                addElement('donate', app['donate'], doc, apel)
-            addElement('marketversion', app['marketversion'], doc, apel)
-            addElement('marketvercode', app['marketvercode'], doc, apel)
-            if not (app['antifeatures'] is None):
-                addElement('antifeatures', app['antifeatures'], doc, apel)
-            if app['requiresroot']:
+            addElement('description',
+                    common.parse_description(app['Description']), doc, apel)
+            addElement('license', app['License'], doc, apel)
+            if 'Category' in app:
+                addElement('category', app['Category'], doc, apel)
+            addElement('web', app['Web Site'], doc, apel)
+            addElement('source', app['Source Code'], doc, apel)
+            addElement('tracker', app['Issue Tracker'], doc, apel)
+            if app['Donate'] != None:
+                addElement('donate', app['Donate'], doc, apel)
+            addElement('marketversion', app['Market Version'], doc, apel)
+            addElement('marketvercode', app['Market Version Code'], doc, apel)
+            if not (app['AntiFeatures'] is None):
+                addElement('antifeatures', app['AntiFeatures'], doc, apel)
+            if app['Requires Root']:
                 addElement('requirements', 'root', doc, apel)
 
             # Sort the apk list into version order, just so the web site
@@ -370,38 +371,38 @@ for app in apps:
         if options.buildreport:
             if len(app['builds']) == 0:
                 print ("WARNING: No builds defined for " + app['id'] +
-                        " Source: " + app['source'])
+                        " Source: " + app['Source Code'])
                 warnings += 1
             else:
-                if app['marketvercode'] != '0':
+                if app['Market Version Code'] != '0':
                     gotbuild = False
                     for build in app['builds']:
-                        if build['vercode'] == app['marketvercode']:
+                        if build['vercode'] == app['Market Version Code']:
                             gotbuild = True
                     if not gotbuild:
                         print ("WARNING: No build data for market version of "
-                                + app['id'] + " (" + app['marketversion']
-                                + ") " + app['source'])
+                                + app['id'] + " (" + app['Market Version']
+                                + ") " + app['Source Code'])
                         warnings += 1
 
         # If we don't have the market version, check if there is a build
         # with a commit ID starting with '!' - this means we can't build it
         # for some reason, and don't want hassling about it...
-        if not gotmarketver and app['marketvercode'] != '0':
+        if not gotmarketver and app['Market Version Code'] != '0':
             for build in app['builds']:
-                if build['vercode'] == app['marketvercode']:
+                if build['vercode'] == app['Market Version Code']:
                     gotmarketver = True
 
         # Output a message of harassment if we don't have the market version:
-        if not gotmarketver and app['marketvercode'] != '0':
-            addr = app['source']
-            print "WARNING: Don't have market version (" + app['marketversion'] + ") of " + app['name']
+        if not gotmarketver and app['Market Version Code'] != '0':
+            addr = app['Source Code']
+            print "WARNING: Don't have market version (" + app['Market Version'] + ") of " + app['Name']
             print "         (" + app['id'] + ") " + addr
             warnings += 1
             if options.verbose:
                 # A bit of extra debug info, basically for diagnosing
                 # app developer mistakes:
-                print "         Market vercode:" + app['marketvercode']
+                print "         Market vercode:" + app['Market Version Code']
                 print "         Got:"
                 for apk in apks:
                     if apk['id'] == app['id']:
diff --git a/uploadquick.sh b/uploadquick.sh
new file mode 100755
index 00000000..19845818
--- /dev/null
+++ b/uploadquick.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+rsync -u -v -r --delete repo fdroid@f-droid.org:/home/fdroid/public_html
+