From 56ebfc0c18b1f6f83a3a0933c4c3ca3d28edc6ac Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 15 Feb 2012 07:07:49 +0000
Subject: [PATCH 01/22] Metadata: version updates

---
 metadata/com.google.android.stardroid.txt   | 2 +-
 metadata/com.matburt.mobileorg.txt          | 4 ++--
 metadata/com.textuality.lifesaver2.txt      | 4 ++--
 metadata/com.voidcode.diasporawebclient.txt | 5 ++---
 metadata/net.gorry.aicia.txt                | 4 ++--
 metadata/net.sourceforge.servestream.txt    | 4 ++--
 metadata/org.eehouse.android.xw4.txt        | 2 +-
 metadata/org.mult.daap.txt                  | 2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/metadata/com.google.android.stardroid.txt b/metadata/com.google.android.stardroid.txt
index 52427cad..4e1d568f 100644
--- a/metadata/com.google.android.stardroid.txt
+++ b/metadata/com.google.android.stardroid.txt
@@ -1,6 +1,6 @@
 # libs/libGoogleAnalytics.jar
 AntiFeatures:Tracking
-Category:None
+Category:Navigation
 License:Apache2
 Web Site:https://code.google.com/p/stardroid/
 Source Code:https://code.google.com/p/stardroid/source/browse/
diff --git a/metadata/com.matburt.mobileorg.txt b/metadata/com.matburt.mobileorg.txt
index 46555092..4b4b3018 100644
--- a/metadata/com.matburt.mobileorg.txt
+++ b/metadata/com.matburt.mobileorg.txt
@@ -16,6 +16,6 @@ Repo:https://github.com/matburt/mobileorg-android.git
 #Build Version:0.5.2,51,38dfe967ee99c71b12b8
 #Build Version:0.7.1,71,ac21586a40da6d7c643e1b12023b59aa05d13c14
 Update Check Mode:Market
-Current Version:0.8.0
-Current Version Code:80
+Current Version:0.8.2
+Current Version Code:82
 
diff --git a/metadata/com.textuality.lifesaver2.txt b/metadata/com.textuality.lifesaver2.txt
index 48cf6350..6e22514d 100644
--- a/metadata/com.textuality.lifesaver2.txt
+++ b/metadata/com.textuality.lifesaver2.txt
@@ -10,6 +10,6 @@ A simple backup and restore of your SMS and call logs.
 .
 
 Update Check Mode:Market
-Current Version:1.0
-Current Version Code:3
+Current Version:2.0
+Current Version Code:4
 
diff --git a/metadata/com.voidcode.diasporawebclient.txt b/metadata/com.voidcode.diasporawebclient.txt
index d2b03da5..c41a988a 100644
--- a/metadata/com.voidcode.diasporawebclient.txt
+++ b/metadata/com.voidcode.diasporawebclient.txt
@@ -13,7 +13,6 @@ 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-10
-
 Build Version:1.5,6,a153d5f996f284da44d5defa25ce601fd76b53ad,target=android-10,prebuild=\
 rm -rf gen/ && \
 rm -rf bin/ && \
@@ -22,6 +21,6 @@ mv google-api-translate-java-0.97.jar libs/ && \
 mv microsoft-translator-java-api-0.4-jar-with-dependencies.jar libs/
 
 Update Check Mode:Market
-Current Version:1.5
-Current Version Code:6
+Current Version:1.6
+Current Version Code:7
 
diff --git a/metadata/net.gorry.aicia.txt b/metadata/net.gorry.aicia.txt
index 92e95b5c..11c23a61 100644
--- a/metadata/net.gorry.aicia.txt
+++ b/metadata/net.gorry.aicia.txt
@@ -10,6 +10,6 @@ Internet Relay Chat client with a twin-pane view.
 .
 
 Update Check Mode:Market
-Current Version:2012.0117.1
-Current Version Code:201201171
+Current Version:2012.0211.1
+Current Version Code:201202111
 
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index a2e22bf3..bd444e57 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -22,6 +22,6 @@ Build Version:0.3.1,48,659,prebuild=mv lib/ libs/
 Build Version:0.4.4,54,957,prebuild=mv lib/ libs/
 
 Update Check Mode:Market
-Current Version:0.4.4
-Current Version Code:54
+Current Version:0.4.5
+Current Version Code:55
 
diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt
index 8c7aa946..e82cd4c3 100644
--- a/metadata/org.eehouse.android.xw4.txt
+++ b/metadata/org.eehouse.android.xw4.txt
@@ -23,5 +23,5 @@ Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buil
 
 Update Check Mode:Market
 Current Version:4.4
-Current Version Code:33
+Current Version Code:34
 
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index 1b2c8ad6..7208b30c 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -21,5 +21,5 @@ Build Version:.9.7,40,90,prebuild=rm -rf bin/
 
 Update Check Mode:Market
 Current Version:.9.7
-Current Version Code:41
+Current Version Code:43
 

From 40201fdf48aa21974ed171ec48882e5ac4469912 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 15 Feb 2012 02:18:32 +0200
Subject: [PATCH 02/22] update.py: Allow to output pretty (human-readable)
 index.xml .

---
 update.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/update.py b/update.py
index 367d7544..a77faa2c 100755
--- a/update.py
+++ b/update.py
@@ -53,6 +53,8 @@ parser.add_option("-i", "--interactive", default=False, action="store_true",
 parser.add_option("-e", "--editor", default="/etc/alternatives/editor",
                   help="Specify editor to use in interactive mode. Default "+
                       "is /etc/alternatives/editor")
+parser.add_option("", "--pretty", action="store_true", default=False,
+                  help="Produce human-readable index.xml")
 (options, args) = parser.parse_args()
 
 
@@ -439,7 +441,10 @@ for app in apps:
         apps_disabled += 1
 
 of = open(os.path.join('repo','index.xml'), 'wb')
-output = doc.toxml()
+if options.pretty:
+    output = doc.toprettyxml()
+else:
+    output = doc.toxml()
 of.write(output)
 of.close()
 

From 5e75683009b0bcac5f3dfbbfff857ca56ee93ba8 Mon Sep 17 00:00:00 2001
From: Dominik <dominik@dominikschuermann.de>
Date: Tue, 14 Feb 2012 23:51:08 +0100
Subject: [PATCH 03/22] AdAway 1.25

---
 metadata/org.adaway.txt | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index c4067233..2db52cb3 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -7,7 +7,17 @@ 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.
+AdAway is an open source ad blocker for Android using the hosts file.
+
+
+Permissions:
+- Root access: To write hosts file to system partition
+- Internet access: To download hosts files
+- Modify/delete SD card content: To export lists to sd card
+- Wakelock: Wake up phone when AdAway updates in background
+
+Translations:
+Help translating AdAway on https://www.transifex.net/projects/p/adaway
 .
 
 Requires Root:Yes
@@ -23,8 +33,9 @@ Build Version:1.20,21,695e3801e4081026c8f7213a2345fc451d5eb89c,subdir=org_adaway
 Build Version:1.21,22,65138c11cc8b6affd28b68e125fbc1dff0886a4e,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
 Build Version:1.23,24,!no source in repo
 Build Version:1.24,25,f811e53e1e1d2ee047b18715fd7d2072b90ae76b,subdir=org_adaway/,buildjni=yes,prebuild=android update project -p ../com_actionbarsherlock
+Build Version:1.25,26,ff97932761cdee68638dc2550751a64b2cbe18e7,subdir=org_adaway/,buildjni=yes,prebuild=android update project -p ../com_actionbarsherlock
 
 Update Check Mode:Market
-Current Version:1.24
-Current Version Code:25
+Current Version:1.25
+Current Version Code:26
 

From 12b6fb7771d4417587409867dd7809bd4eb1f3f6 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 15 Feb 2012 07:25:58 +0000
Subject: [PATCH 04/22] Metadata: adjusted adaway description

---
 metadata/org.adaway.txt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index 2db52cb3..ab4c67b2 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -5,16 +5,15 @@ 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
+Summary:Ad blocker
 Description:
-AdAway is an open source ad blocker for Android using the hosts file.
-
+An ad blocker using the hosts file.
 
 Permissions:
-- Root access: To write hosts file to system partition
-- Internet access: To download hosts files
-- Modify/delete SD card content: To export lists to sd card
-- Wakelock: Wake up phone when AdAway updates in background
+*Root access: To write hosts file to system partition
+*Internet access: To download hosts files
+*Modify/delete SD card content: To export lists to sd card
+*Wakelock: Wake up phone when AdAway updates in background
 
 Translations:
 Help translating AdAway on https://www.transifex.net/projects/p/adaway

From 73dcbb0699804c17ba8e870b6127389cb14c33f9 Mon Sep 17 00:00:00 2001
From: Michael Haas <laga@laga.ath.cx>
Date: Tue, 14 Feb 2012 14:56:36 +0100
Subject: [PATCH 05/22] Add android frontend for home automation softwarwe
 fhem.

---
 metadata/li.klass.fhem.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 metadata/li.klass.fhem.txt

diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
new file mode 100644
index 00000000..4f65a87f
--- /dev/null
+++ b/metadata/li.klass.fhem.txt
@@ -0,0 +1,23 @@
+Category:Internet
+License:GPLv2
+Web Site:http://yaxim.org
+Source Code:https://github.com/klassm/andFHEM
+Issue Tracker:https://github.com/klassm/andFHEM/issues
+
+Summary:FHEM client
+Description:
+An android client for the FHEM software for home automation.
+.
+
+Repo Type:git
+# remove ant.properties which forces a keystore
+# needs sdk.dir/tools in $PATH
+Repo:https://github.com/klassm/andFHEM.git
+
+Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.properties,prebuild=cd .. && git clone https://github.com/JakeWharton/ActionBarSherlock.git JakeWharton-ActionBarSherlock-436230d && \
+cd JakeWharton-ActionBarSherlock-436230d/library && \
+android update project -p . && \
+ant debug && \
+cd ../../li.klass.fhem
+
+

From 02b66c59b46e033e6284bff3aa2b15fb8abbf1d3 Mon Sep 17 00:00:00 2001
From: Michael Haas <laga@laga.ath.cx>
Date: Tue, 14 Feb 2012 14:58:13 +0100
Subject: [PATCH 06/22] Fix andfhem website

---
 metadata/li.klass.fhem.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
index 4f65a87f..3cf74bd8 100644
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@@ -1,6 +1,6 @@
 Category:Internet
 License:GPLv2
-Web Site:http://yaxim.org
+Web Site:http://andfhem.klass.li/
 Source Code:https://github.com/klassm/andFHEM
 Issue Tracker:https://github.com/klassm/andFHEM/issues
 

From 6214998f664f45835cf1560fb9a4b02e4c5b2f6c Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 15 Feb 2012 07:54:06 +0000
Subject: [PATCH 07/22] Metadata: use srclib for fhem

---
 metadata/li.klass.fhem.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
index 3cf74bd8..6748aaa0 100644
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@@ -10,14 +10,8 @@ An android client for the FHEM software for home automation.
 .
 
 Repo Type:git
-# remove ant.properties which forces a keystore
-# needs sdk.dir/tools in $PATH
 Repo:https://github.com/klassm/andFHEM.git
 
-Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.properties,prebuild=cd .. && git clone https://github.com/JakeWharton/ActionBarSherlock.git JakeWharton-ActionBarSherlock-436230d && \
-cd JakeWharton-ActionBarSherlock-436230d/library && \
-android update project -p . && \
-ant debug && \
-cd ../../li.klass.fhem
+Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 

From 9ed02069b84ff73a26af83012802f7714b266781 Mon Sep 17 00:00:00 2001
From: Nicolas Raoul <nicolas.raoul@gmail.com>
Date: Mon, 13 Feb 2012 19:53:10 +0900
Subject: [PATCH 08/22] Added compass from MIUI.
 http://f-droid.org/forums/topic/miui-compass/

---
 metadata/net.micode.compass.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 metadata/net.micode.compass.txt

diff --git a/metadata/net.micode.compass.txt b/metadata/net.micode.compass.txt
new file mode 100644
index 00000000..ddc6d6c6
--- /dev/null
+++ b/metadata/net.micode.compass.txt
@@ -0,0 +1,18 @@
+Category:Navigation
+License:Apache2
+Web Site:http://www.micode.net
+Source Code:https://github.com/MiCode/Compass
+Issue Tracker:https://github.com/MiCode/Compass/issues
+
+Summary:Compass
+Description:
+Compass from MIUI.
+.
+
+Repo Type:git
+Repo:https://github.com/MiCode/Compass.git
+
+Build Version:0.1,1,077fdb627bb7511f52cde8eddfdc24c2409e4190,target=android-8
+
+Current Version:0.1
+Current Version Code:1

From eab72a312708c37ef4cad5d7c4cb9dd569e54a8e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 15 Feb 2012 20:41:03 +0200
Subject: [PATCH 09/22] Add forceversion/forcevercode options to replace
 insertversion/insertvercode.

Unlike insertversion/insertvercode which accept pattern for old version/code,
which yet need to be prepared, then tested, and with that still named
confusingly, forceversion/forcevercode are boolean-style parameters which,
if specified for build, replace whatever version/code specified in
AndroidManifest.xml with the values from recipe.
---
 common.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/common.py b/common.py
index b020df0a..8fb0f2cd 100644
--- a/common.py
+++ b/common.py
@@ -736,7 +736,7 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
         f.write(props)
         f.close()
 
-    # Insert version code and number into the manifest if necessary...
+    # deprecated, use forceversion/forcevercode instead
     if build.has_key('insertversion'):
         if subprocess.call(['sed','-i','s/' + build['insertversion'] +
             '/' + build['version'] +'/g',
@@ -748,6 +748,18 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
             'AndroidManifest.xml'], cwd=root_dir) !=0:
             raise BuildException("Failed to amend manifest")
 
+    # Insert version code and number into the manifest if necessary...
+    if build.has_key('forceversion'):
+        if subprocess.call(['sed','-r','-i',
+            's/android:versionName="[^"]+"/android:versionName="' + build['version'] + '"/g',
+            'AndroidManifest.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend manifest")
+    if build.has_key('forcevercode'):
+        if subprocess.call(['sed','-r','-i',
+            's/android:versionCode="[^"]+"/android:versionCode="' + build['vercode'] + '"/g',
+            'AndroidManifest.xml'], cwd=root_dir) !=0:
+            raise BuildException("Failed to amend manifest")
+
     # Delete unwanted file...
     if build.has_key('rm'):
         dest = os.path.join(build_dir, build['rm'])

From 071642155e4b63ee479167e21e18727b4c876c1c Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 16 Feb 2012 22:57:54 +0200
Subject: [PATCH 10/22] Replace insertversion/insertvercode with force*
 variants.

---
 metadata/com.google.android.diskusage.txt | 2 +-
 metadata/org.helllabs.android.xmp.txt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index fb41d22a..5a2f3015 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -14,7 +14,7 @@ Repo:http://diskusage.googlecode.com/svn/trunk/
 
 Build Version:2.0.4,2004,61,prebuild=mkdir libs && cp extra/system.jar libs/
 #Note - version name/code is wrong in the repo - we replace it
-Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,insertversion=2.0.4,insertvercode=2004
+Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,forceversion=yes,forcevercode=yes
 Build Version:2.1.3,2103,65,prebuild=mkdir libs && cp extra/system.jar libs/
 Build Version:3.0alpha2,3001,!repo version incorrect,prebuild=mkdir libs && cp extra/system.jar libs/
 Build Version:3.0alpha3,3005,!no source in repo,prebuild=mkdir libs && cp extra/system.jar libs/
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index fed13459..02401be8 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -17,10 +17,10 @@ Repo Type:git
 Repo:git://xmp.git.sourceforge.net/gitroot/xmp/xmp
 
 # This is one of those projects that put the changelog in the version
-# number, so fix that with insertversion.
+# number, so fix that with forceversion.
 Build Version:2.1.0,15,639549fda2111cb800fabe468b4a64bf4ae27003,\
 buildjni=yes,subdir=src/android/project,target=android-8,\
-insertversion=2.1.0[^"]*
+forceversion=yes
 
 Update Check Mode:Market
 Current Version:2.4.0

From 10567fc0cca2e53e20b4fbfd69dc50109ad65a6f Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 16 Feb 2012 22:59:24 +0200
Subject: [PATCH 11/22] Remove support for deprecated
 insertversion/insertvercode

No longer occur in metadata.
---
 common.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/common.py b/common.py
index 8fb0f2cd..8043eadd 100644
--- a/common.py
+++ b/common.py
@@ -736,18 +736,6 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
         f.write(props)
         f.close()
 
-    # deprecated, use forceversion/forcevercode instead
-    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")
-
     # Insert version code and number into the manifest if necessary...
     if build.has_key('forceversion'):
         if subprocess.call(['sed','-r','-i',

From bd6619ee0188e9339f7556da91b334f50445c969 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 16 Feb 2012 23:04:41 +0200
Subject: [PATCH 12/22] Update docs for forceversion/forcevercode.

---
 README      | 11 +++++++----
 fdroid.texi | 14 ++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 140b6a0d..baaeaa7a 100644
--- a/README
+++ b/README
@@ -160,10 +160,13 @@ configuration to the build. These are:
                    AndroidManifest.xml.
  antcommand=xxx  - Specify an alternate ant command (target) instead of the
                    default 'release'.
- insertversion=x - If specified, the pattern 'x' in the AndroidManifest.xml is
-                   replaced with the version number for the build.
- insertvercode=x - If specified, the pattern 'x' in the AndroidManifest.xml is
-                   replaced with the version code for the build.
+ forceversion=yes - If specified, the package version in AndroidManifest.xml is
+                   replaced with the version number for the build as specified
+                   in recipe. Useful for cases when upstream repo missed to
+                   update it for specific tag, or to build an arbitrary revision.
+ forcevercode=yes - If specified, the package vercode in the AndroidManifest.xml is
+                   replaced with the version code for the build. See also
+                   forceversion.
  update=no	   By default, 'android update project' is used to generate or
                    update the build.xml file. Specifying update=no bypasses
                    that.
diff --git a/fdroid.texi b/fdroid.texi
index e3a3e89e..f586de93 100644
--- a/fdroid.texi
+++ b/fdroid.texi
@@ -364,13 +364,15 @@ the directory that contains AndroidManifest.xml.
 Specify an alternate ant command (target) instead of the default
 'release'.
 
-@item insertversion=x
-If specified, the pattern 'x' in the AndroidManifest.xml is replaced
-with the version number for the build.
+@item forceversion=yes
+If specified, the package version in AndroidManifest.xml is replaced
+with the version number for the build as specified in recipe. Useful
+for cases when upstream repo missed to update it for specific tag,
+or to build an arbitrary revision.
 
-@item insertvercode=x
-If specified, the pattern 'x' in the AndroidManifest.xml is replaced
-with the version code for the build.
+@item forcevercode=yes
+If specified, the package vercode in the AndroidManifest.xml is replaced
+with the version code for the build. See also forceversion.
 
 @item update=no
 By default, 'android update project' is used to generate or update the

From f88f5b740430906b93aa2b4080caad2221a9660a Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 10:38:49 +0000
Subject: [PATCH 13/22] Some more wip on build server integration

---
 build.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.py b/build.py
index 5356aac6..fc97f058 100755
--- a/build.py
+++ b/build.py
@@ -147,15 +147,18 @@ for app in apps:
 
                         # Load and parse the SSH config...
                         sshconfig = paramiko.SSHConfig()
-                        sshconfig.parse('builder/sshconfig')
+                        sshf = open('builder/sshconfig', 'r')
+                        sshconfig.parse(sshf)
+                        sshf.close()
                         sshconfig = sshconfig.lookup(vagranthost)
 
                         # Open SSH connection...
                         ssh = paramiko.SSHClient()
-                        ssh.set_missing_host_key_policy(paramiko.AcceptPolicy)
-                        ssh.connect(sshconfig['HostName'], username=sshconfig['Username'],
-                            port=sshconfig['Port'], timeout=10, look_for_keys=False,
-                            key_filename=sshconfig['IdentityFile'])
+                        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+                        print sshconfig
+                        ssh.connect(sshconfig['hostname'], username=sshconfig['user'],
+                            port=int(sshconfig['port']), timeout=10, look_for_keys=False,
+                            key_filename=sshconfig['identityfile'])
 
                         # Get an SFTP connection...
                         ftp = ssh.open_sftp()
@@ -178,7 +181,7 @@ for app in apps:
                                 lastdir = r
                                 for ff in f:
                                     ftp.put(os.path.join(r, ff), ff)
-                        ftp.send_dir(app['id'])
+                        send_dir(app['id'])
                         # TODO: send relevant extlib directories too
                         ftp.chdir('/home/vagrant')
 

From a154301fa465d135bb48c446f751a6d6585b2cfe Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 10:39:04 +0000
Subject: [PATCH 14/22] Metadata: various version updates

---
 metadata/com.fsck.k9.txt                   |  4 ++--
 metadata/com.matburt.mobileorg.txt         |  4 ++--
 metadata/info.staticfree.android.units.txt |  4 +---
 metadata/li.klass.fhem.txt                 |  3 +++
 metadata/net.androgames.level.txt          |  7 +++++--
 metadata/net.healeys.lexic.txt             |  1 +
 metadata/net.osmand.plus.txt               |  4 ++--
 metadata/net.osmand.txt                    |  4 ++--
 metadata/org.wordpress.android.txt         | 10 ++++------
 metadata/stericson.busybox.donate.txt      |  5 +++--
 10 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 56a07181..099c4215 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -16,6 +16,6 @@ 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
-Current Version:4.005
-Current Version Code:14023
+Current Version:4.006
+Current Version Code:14024
 
diff --git a/metadata/com.matburt.mobileorg.txt b/metadata/com.matburt.mobileorg.txt
index 4b4b3018..998f56fe 100644
--- a/metadata/com.matburt.mobileorg.txt
+++ b/metadata/com.matburt.mobileorg.txt
@@ -16,6 +16,6 @@ Repo:https://github.com/matburt/mobileorg-android.git
 #Build Version:0.5.2,51,38dfe967ee99c71b12b8
 #Build Version:0.7.1,71,ac21586a40da6d7c643e1b12023b59aa05d13c14
 Update Check Mode:Market
-Current Version:0.8.2
-Current Version Code:82
+Current Version:0.8.3
+Current Version Code:83
 
diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt
index 66b07181..4b68bd33 100644
--- a/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@ -14,9 +14,7 @@ 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,rm Units.apk && rm extra/*.jar && rm -rf libs/ && mv lib/ libs/
+Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,prebuild=rm Units.apk && mv lib/ libs/
 
 Update Check Mode:Market
 Current Version:1.0
diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
index 6748aaa0..71f09cda 100644
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@@ -14,4 +14,7 @@ Repo:https://github.com/klassm/andFHEM.git
 
 Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
+Update Check Mode:Market
+Current Version:1.5.0
+Current Version Code:51
 
diff --git a/metadata/net.androgames.level.txt b/metadata/net.androgames.level.txt
index 0b23df58..d5e005e5 100644
--- a/metadata/net.androgames.level.txt
+++ b/metadata/net.androgames.level.txt
@@ -20,8 +20,11 @@ Repo Type:svn
 Repo:http://androgames-sample.googlecode.com/svn/Market-apps/Level/trunk/
 
 Build Version:1.8.0,27,75
+Build Version:1.9.0,29,79
+Build Version:1.9.1,30,!No source in repo
+
 
 Update Check Mode:Market
-Current Version:1.8.0
-Current Version Code:27
+Current Version:1.9.1
+Current Version Code:30
 
diff --git a/metadata/net.healeys.lexic.txt b/metadata/net.healeys.lexic.txt
index ce9a66e9..89339839 100644
--- a/metadata/net.healeys.lexic.txt
+++ b/metadata/net.healeys.lexic.txt
@@ -14,6 +14,7 @@ Repo Type:hg
 Repo:https://code.google.com/p/lexic/
 
 Build Version:0.8.1,41,5ffa6d7ee6a4,target=android-8,subdir=trunk
+Build Version:0.8.1,41,!Market version code different but same version
 
 Update Check Mode:Market
 Current Version:0.8.1
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 02ae14fb..9a3d2477 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -23,6 +23,6 @@ Build Version:0.6.9,42,v0.6.9,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw
 Build Version:0.6.9',43,!No corresponding source for whatever this is
 
 Update Check Mode:Market
-Current Version:0.7.0
-Current Version Code:46
+Current Version:0.7.1
+Current Version Code:48
 
diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt
index aaa098f9..c78376bd 100644
--- a/metadata/net.osmand.txt
+++ b/metadata/net.osmand.txt
@@ -17,6 +17,6 @@ Build Version:0.5.2,25,efc0e83a,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir asse
 Build Version:0.5.3,26,8e9d76ea685ea75d6c08,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw
 
 Update Check Mode:Market
-Current Version:0.7.0
-Current Version Code:46
+Current Version:0.7.1
+Current Version Code:47
 
diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt
index d37f3ac0..b6bc75b2 100644
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@@ -9,10 +9,6 @@ Description:
 A client for WordPress blogs, which allows post creation and editing, and comment
 viewing, replying and moderation. Supports multiple blogs, both wordpress-hosted
 (wordpress.com) and self-hosted.
-
-This version is patched to remove privacy violations - the official build periodically,
-and without permission, sends tracking details, including a unique identifier for your
-phone, and information about your mobile network, to the developer's server.
 .
 
 Repo Type:git-svn
@@ -21,8 +17,10 @@ Repo:http://android.svn.wordpress.org/
 Build Version:1.3.9,31,202,subdir=trunk,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,subdir=trunk,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:2.0.6,45,642,subdir=branches/2.0.6,encoding=utf-8
+Build Version:2.0.6,45,642,subdir=branches/2.0.6,encoding=utf-8
+Build Version:2.0.7,46,646,subdir=branches/2.0.7,encoding=utf-8
 
 Update Check Mode:Market
-Current Version:2.0.6
-Current Version Code:45
+Current Version:2.0.7
+Current Version Code:46
 
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index 752542a2..713cabc7 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -1,3 +1,4 @@
+Disabled:Can't build the binaries without patching c libraries
 Category:System
 License:Apache 2.0
 Web Site:http://code.google.com/p/busybox-android/
@@ -29,6 +30,6 @@ Build Version:7.2,104,!No source available
 Build Version:7.5,105,!No source available
 
 Update Check Mode:Market
-Current Version:7.5
-Current Version Code:105
+Current Version:7.5.1
+Current Version Code:106
 

From 7237933b9baa763c03a0033ec2231b92e9b74a70 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 12:33:32 +0000
Subject: [PATCH 15/22] Additional gitignore

---
 builder/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builder/.gitignore b/builder/.gitignore
index 7fc03613..b8dee1d4 100644
--- a/builder/.gitignore
+++ b/builder/.gitignore
@@ -1 +1,2 @@
 sshconfig
+.vagrant

From 9d6f5bf8876730dcacafcedb2bc2ffa0cd7eda07 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 12:57:58 +0000
Subject: [PATCH 16/22] Stats, etc.

---
 stats/known_apks.txt          |  11 +
 stats/latestapps.txt          |  14 +-
 stats/total_downloads_app.txt | 412 +++++++++++++++++-----------------
 3 files changed, 228 insertions(+), 209 deletions(-)

diff --git a/stats/known_apks.txt b/stats/known_apks.txt
index 917b3876..3da68353 100644
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@@ -156,6 +156,7 @@ com.android.keepass_83.apk com.android.keepass 2011-12-31
 com.android.keepass_84.apk com.android.keepass 2012-01-19
 com.android.keepass_85.apk com.android.keepass 2012-01-24
 com.angrydoughnuts.android.alarmclock_8.apk com.angrydoughnuts.android.alarmclock 2011-05-19
+com.anoshenko.android.mahjongg_14.apk com.anoshenko.android.mahjongg 2012-02-12
 com.appengine.paranoid_android.lost_12.apk com.appengine.paranoid_android.lost 2012-01-08
 com.ath0.rpn_10.apk com.ath0.rpn 2012-02-11
 com.ath0.rpn_9.apk com.ath0.rpn 2012-02-10
@@ -206,6 +207,7 @@ com.funambol.androidsync_9.apk com.funambol.androidsync 2011-01-09
 com.ghostsq.commander_110.apk com.ghostsq.commander 2011-05-18
 com.ghostsq.commander_160.apk com.ghostsq.commander 2012-01-24
 com.ghostsq.commander_163.apk com.ghostsq.commander 2012-02-06
+com.ghostsq.commander_164.apk com.ghostsq.commander 2012-02-15
 com.ghostsq.commander_94.apk com.ghostsq.commander 2011-04-02
 com.ghostsq.commander_97.apk com.ghostsq.commander 2011-04-02
 com.google.android.diskusage_2004.apk com.google.android.diskusage 2011-01-31
@@ -317,6 +319,7 @@ dk.andsen.asqlitemanager_7.apk dk.andsen.asqlitemanager 2011-12-05
 dk.andsen.asqlitemanager_9.apk dk.andsen.asqlitemanager 2011-12-08
 edu.nyu.cs.omnidroid.app_6.apk edu.nyu.cs.omnidroid.app 2011-10-04
 edu.rit.poe.atomix_2.apk edu.rit.poe.atomix 2011-03-02
+fennec-10.0.1.multi.android-arm.apk org.mozilla.firefox 2012-02-14
 fennec-10.0.multi.android-arm.apk org.mozilla.firefox 2012-02-01
 fennec-5.0.multi.eabi-arm.apk org.mozilla.firefox
 fennec-6.0.multi.eabi-arm.apk org.mozilla.firefox
@@ -338,6 +341,7 @@ info.lamatricexiste.network_42.apk info.lamatricexiste.network 2011-07-06
 info.lamatricexiste.network_43.apk info.lamatricexiste.network 2012-02-04
 info.staticfree.android.units_7.apk info.staticfree.android.units 2011-01-05
 info.staticfree.android.units_8.apk info.staticfree.android.units 2011-01-17
+info.staticfree.android.units_9.apk info.staticfree.android.units 2012-02-16
 k9-3.200-release.apk com.fsck.k9 2010-10-21
 k9-3.202-release.apk com.fsck.k9
 k9-3.204-release.apk com.fsck.k9
@@ -357,6 +361,7 @@ k9-3.800-release.apk com.fsck.k9 2011-05-25
 k9-4.001-release.apk com.fsck.k9 2011-12-28
 k9-4.003-release.apk com.fsck.k9 2012-01-08
 k9-4.005-release.apk com.fsck.k9 2012-01-28
+li.klass.fhem_51.apk li.klass.fhem 2012-02-15
 linphone-android-1.0.15.apk org.linphone 2010-11-16
 linphone-android-1.1.6.apk org.linphone
 linphone-android-1.2.1.apk org.linphone 2011-09-29
@@ -391,6 +396,7 @@ net.gaast.giggity_16.apk net.gaast.giggity 2012-01-28
 net.gaast.giggity_4.apk net.gaast.giggity 2011-02-04
 net.healeys.lexic_41.apk net.healeys.lexic 2012-02-09
 net.mafro.android.wakeonlan_12.apk net.mafro.android.wakeonlan 2011-11-24
+net.micode.compass_1.apk net.micode.compass 2012-02-15
 net.nightwhistler.pageturner_1.apk net.nightwhistler.pageturner 2012-02-03
 net.nightwhistler.pageturner_2.apk net.nightwhistler.pageturner 2012-02-04
 net.nightwhistler.pageturner_3.apk net.nightwhistler.pageturner 2012-02-11
@@ -443,6 +449,7 @@ org.adaway_20.apk org.adaway 2012-01-10
 org.adaway_21.apk org.adaway 2012-01-11
 org.adaway_22.apk org.adaway 2012-01-15
 org.adaway_25.apk org.adaway 2012-01-24
+org.adaway_26.apk org.adaway 2012-02-15
 org.adw.launcher_34.apk org.adw.launcher 2011-12-05
 org.androidsoft.games.memory.kids_13.apk org.androidsoft.games.memory.kids 2011-12-08
 org.coolreader_103.apk org.coolreader 2011-02-13
@@ -517,6 +524,7 @@ org.geometerplus.zlibrary.ui.android_102031.apk org.geometerplus.zlibrary.ui.and
 org.geometerplus.zlibrary.ui.android_102041.apk org.geometerplus.zlibrary.ui.android 2011-12-04
 org.geometerplus.zlibrary.ui.android_102061.apk org.geometerplus.zlibrary.ui.android 2012-01-06
 org.geometerplus.zlibrary.ui.android_103031.apk org.geometerplus.zlibrary.ui.android 2012-01-27
+org.geometerplus.zlibrary.ui.android_103061.apk org.geometerplus.zlibrary.ui.android 2012-02-14
 org.geometerplus.zlibrary.ui.android_9903.apk org.geometerplus.zlibrary.ui.android 2011-01-08
 org.geometerplus.zlibrary.ui.android_9911.apk org.geometerplus.zlibrary.ui.android 2011-02-02
 org.geometerplus.zlibrary.ui.android_9912.apk org.geometerplus.zlibrary.ui.android 2011-02-10
@@ -572,6 +580,7 @@ org.sixgun.ponyexpress_8.apk org.sixgun.ponyexpress 2011-02-09
 org.sixgun.ponyexpress_9.apk org.sixgun.ponyexpress 2011-03-26
 org.sparkleshare.android_1.apk org.sparkleshare.android 2012-01-02
 org.thoughtcrime.securesms_21.apk org.thoughtcrime.securesms 2012-01-02
+org.tof_17.apk org.tof 2012-02-12
 org.tomdroid_6.apk org.tomdroid 2011-01-17
 org.ttrssreader_1000.apk org.ttrssreader 2011-05-16
 org.ttrssreader_1002.apk org.ttrssreader 2011-05-19
@@ -609,6 +618,8 @@ org.wikipedia_3.apk org.wikipedia 2012-01-26
 org.wikipedia_4.apk org.wikipedia 2012-02-03
 org.wordpress.android_31.apk org.wordpress.android 2011-01-26
 org.wordpress.android_33.apk org.wordpress.android 2011-07-01
+org.wordpress.android_45.apk org.wordpress.android 2012-02-15
+org.wordpress.android_46.apk org.wordpress.android 2012-02-16
 org.xbmc.android.remote_730.apk org.xbmc.android.remote 2011-02-24
 org.xbmc.android.remote_768.apk org.xbmc.android.remote 2011-05-18
 org.yaaic_10.apk org.yaaic 2011-04-26
diff --git a/stats/latestapps.txt b/stats/latestapps.txt
index a9943fda..7dbc6ef5 100644
--- a/stats/latestapps.txt
+++ b/stats/latestapps.txt
@@ -1,10 +1,10 @@
+net.micode.compass
+li.klass.fhem
+org.jsharkey.sky
+uk.co.jarofgreen.JustADamnCompass
+org.tof
+com.anoshenko.android.mahjongg
+org.liberty.android.fantastischmemo
 com.ihunda.android.binauralbeat
 arity.calculator
 com.ath0.rpn
-net.healeys.lexic
-net.szym.barnacle
-com.tastycactus.timesheet
-org.nerdcircus.android.klaxon
-org.openintents.filemanager
-net.nightwhistler.pageturner
-org.openintents.newsreader
diff --git a/stats/total_downloads_app.txt b/stats/total_downloads_app.txt
index 4fba7a9c..d3684bb3 100644
--- a/stats/total_downloads_app.txt
+++ b/stats/total_downloads_app.txt
@@ -1,213 +1,221 @@
 # Total downloads by application, since October 2011
-ALL 209885
-An.stop 924
-aarddict.android 778
-android.androidVNC 1173
-apps.droidnotify 227
-at.tomtasche.reader 97
-caldwell.ben.trolly 721
+ALL 223113
+An.stop 977
+aarddict.android 979
+android.androidVNC 1230
+apps.droidnotify 287
+arity.calculator 163
+at.tomtasche.reader 117
+caldwell.ben.trolly 758
 cm.aptoide.pt 81
-cmupdaterapp.ui 1707
-com.FireFart.Permissions 976
-com.agiro.scanner.android 275
-com.alfray.mandelbrot2 615
-com.alfray.timeriffic 351
-com.andrewshu.android.reddit 988
-com.android.inputmethod.norwegian 146
-com.android.keepass 1634
-com.angrydoughnuts.android.alarmclock 1725
-com.appengine.paranoid_android.lost 292
-com.ath0.rpn 9
-com.axelby.podax 136
-com.beem.project.beem 1291
-com.boardgamegeek 603
-com.bwx.bequick 1109
-com.bwx.qs.battery 887
-com.chessclock.android 93
-com.ciarang.tallyphant 109
-com.commonsware.android.arXiv 555
-com.csipsimple 1044
-com.danga.squeezer 183
-com.digitallizard.nicecompass 272
-com.dozingcatsoftware.bouncy 1332
+cmupdaterapp.ui 1770
+com.FireFart.Permissions 1007
+com.agiro.scanner.android 280
+com.alfray.mandelbrot2 639
+com.alfray.timeriffic 369
+com.andrewshu.android.reddit 1021
+com.android.inputmethod.norwegian 147
+com.android.keepass 1675
+com.angrydoughnuts.android.alarmclock 1796
+com.anoshenko.android.mahjongg 85
+com.appengine.paranoid_android.lost 325
+com.ath0.rpn 49
+com.axelby.podax 156
+com.beem.project.beem 1342
+com.boardgamegeek 622
+com.bwx.bequick 1158
+com.bwx.qs.battery 953
+com.chessclock.android 97
+com.ciarang.tallyphant 125
+com.commonsware.android.arXiv 584
+com.csipsimple 1068
+com.danga.squeezer 190
+com.digitallizard.nicecompass 331
+com.dozingcatsoftware.bouncy 1394
 com.drodin.tuxrider 26
-com.eddyspace.networkmonitor 464
-com.eleybourn.bookcatalogue 1015
+com.eddyspace.networkmonitor 484
+com.eleybourn.bookcatalogue 1040
 com.episode6.android.appalarm.pro 3
-com.evancharlton.mileage 446
-com.example.android.maxpapers 968
-com.fsck.k9 3847
-com.funambol.androidsync 610
-com.ghostsq.commander 2586
-com.google.android.diskusage 1777
-com.google.android.maps.mytracks 541
-com.google.android.stardroid 65
-com.google.code.appsorganizer 1217
-com.google.zxing.client.android 3948
-com.googlecode.androidcells 421
-com.googlecode.chartdroid 260
-com.googlecode.droidwall 1682
-com.googlecode.talkmyphone 334
-com.gpl.rpg.AndorsTrail 2034
-com.hughes.android.dictionary 201
-com.ichi2.anki 1122
-com.ihunda.android.binauralbeat 12
-com.jadn.cc 303
-com.kirit.android.mintercept 999
-com.kmagic.solitaire 1415
-com.lecz.android.tiltmazes 986
-com.leinardi.kitchentimer 226
-com.liato.bankdroid 296
-com.matburt.mobileorg 649
-com.mobilepearls.sokoban 1000
-com.morphoss.acal 2981
-com.mp3tunes.android.player 70
-com.namelessdev.mpdroid 122
-com.nexes.manager 1422
-com.proch.practicehub 480
-com.replica.replicaisland 1070
-com.ringdroid 798
-com.roozen.SoundManager 690
-com.scottmain.android.searchlight 136
-com.serone.desktoplabel 510
-com.smorgasbork.hotdeath 537
-com.stericson.permissions 201
-com.tastycactus.timesheet 52
-com.teleca.jamendo 1117
-com.textuality.lifesaver2 379
-com.totsp.bookworm 500
-com.totsp.crossword.shortyz 136
-com.unitedcoders.android.gpodroid 161
-com.voidcode.diasporawebclient 538
-com.volosyukivan 807
-com.wanghaus.remembeer 110
-com.webworxshop.swallowcatcher 584
+com.evancharlton.mileage 464
+com.example.android.maxpapers 1020
+com.fsck.k9 3996
+com.funambol.androidsync 639
+com.ghostsq.commander 2959
+com.google.android.diskusage 1862
+com.google.android.maps.mytracks 542
+com.google.android.stardroid 83
+com.google.code.appsorganizer 1261
+com.google.zxing.client.android 4231
+com.googlecode.androidcells 422
+com.googlecode.chartdroid 267
+com.googlecode.droidwall 1746
+com.googlecode.talkmyphone 349
+com.gpl.rpg.AndorsTrail 2110
+com.hughes.android.dictionary 263
+com.ichi2.anki 1168
+com.ihunda.android.binauralbeat 169
+com.jadn.cc 340
+com.kirit.android.mintercept 1047
+com.kmagic.solitaire 1476
+com.lecz.android.tiltmazes 1039
+com.leinardi.kitchentimer 291
+com.liato.bankdroid 303
+com.matburt.mobileorg 688
+com.mobilepearls.sokoban 1044
+com.morphoss.acal 3088
+com.mp3tunes.android.player 73
+com.namelessdev.mpdroid 156
+com.nexes.manager 1497
+com.proch.practicehub 509
+com.replica.replicaisland 1127
+com.ringdroid 834
+com.roozen.SoundManager 725
+com.scottmain.android.searchlight 192
+com.serone.desktoplabel 532
+com.smorgasbork.hotdeath 572
+com.stericson.permissions 275
+com.tastycactus.timesheet 93
+com.teleca.jamendo 1168
+com.textuality.lifesaver2 399
+com.totsp.bookworm 521
+com.totsp.crossword.shortyz 148
+com.unitedcoders.android.gpodroid 180
+com.voidcode.diasporawebclient 581
+com.volosyukivan 831
+com.wanghaus.remembeer 115
+com.webworxshop.swallowcatcher 601
 com.zegoggles.smssync 693
-cz.hejl.chesswalk 513
-cz.romario.opensudoku 742
+cz.hejl.chesswalk 598
+cz.romario.opensudoku 790
 de.blau.android 24
 de.joergjahnke.c64.android 31
-de.shandschuh.slightbackup 502
-de.shandschuh.sparserss 1501
-de.ub0r.android.adBlock 1642
-dk.andsen.asqlitemanager 519
-edu.nyu.cs.omnidroid.app 633
-edu.rit.poe.atomix 848
-es.prodevelop.gvsig.mini 619
-fm.libre.droid 513
-fr.seeks 211
-goo.TeaTimer 594
-info.guardianproject.browser 427
-info.guardianproject.cacert 475
-info.guardianproject.otr.app.im 270
-info.lamatricexiste.network 2207
-info.staticfree.android.units 1175
-me.guillaumin.android.osmtracker 710
-mixedbit.speechtrainer 352
-name.bagi.levente.pedometer 862
-net.androgames.level 456
-net.avs234 373
-net.bytten.xkcdviewer 826
-net.cactii.mathdoku 598
-net.dahanne.android.regalandroid 250
-net.fercanet.LNM 924
-net.gaast.giggity 248
-net.healeys.lexic 16
-net.jaqpot.netcounter 838
-net.mafro.android.wakeonlan 458
-net.nightwhistler.pageturner 61
-net.osmand 811
-net.osmand.plus 2902
-net.pierrox.mcompass 395
-net.rocrail.androc 997
-net.sf.andbatdog.batterydog 1200
-net.sourceforge.servestream 494
-net.status.client.mobile 351
-net.sylvek.sharemyposition 355
-net.szym.barnacle 80
-net.tapi.handynotes 1100
-net.tedstein.AndroSS 1868
-net.tevp.postcode 178
-nl.sogeti.android.gpstracker 886
-nu.firetech.android.pactrack 66
-org.abrantix.rockon.rockonnggl 1258
-org.adaway 3645
-org.adw.launcher 1005
-org.andnav.osm 690
-org.androidsoft.games.memory.kids 416
-org.connectbot 1848
-org.coolreader 4302
-org.curiouscreature.android.shelves 218
-org.damazio.notifier 298
-org.droidseries 1006
-org.eehouse.android.xw4 1012
-org.example.pushupbuddy 358
-org.fdroid.fdroid 42586
+de.shandschuh.slightbackup 518
+de.shandschuh.sparserss 1568
+de.ub0r.android.adBlock 1703
+dk.andsen.asqlitemanager 571
+edu.nyu.cs.omnidroid.app 667
+edu.rit.poe.atomix 877
+es.prodevelop.gvsig.mini 651
+fm.libre.droid 541
+fr.seeks 227
+goo.TeaTimer 617
+info.guardianproject.browser 474
+info.guardianproject.cacert 495
+info.guardianproject.otr.app.im 315
+info.lamatricexiste.network 2362
+info.staticfree.android.units 1381
+li.klass.fhem 8
+me.guillaumin.android.osmtracker 772
+mixedbit.speechtrainer 372
+name.bagi.levente.pedometer 903
+net.androgames.level 528
+net.avs234 433
+net.bytten.xkcdviewer 863
+net.cactii.mathdoku 609
+net.dahanne.android.regalandroid 257
+net.fercanet.LNM 969
+net.gaast.giggity 264
+net.healeys.lexic 43
+net.jaqpot.netcounter 889
+net.mafro.android.wakeonlan 479
+net.micode.compass 74
+net.nightwhistler.pageturner 111
+net.osmand 857
+net.osmand.plus 3034
+net.pierrox.mcompass 469
+net.rocrail.androc 1018
+net.sf.andbatdog.batterydog 1256
+net.sourceforge.servestream 514
+net.status.client.mobile 369
+net.sylvek.sharemyposition 374
+net.szym.barnacle 150
+net.tapi.handynotes 1155
+net.tedstein.AndroSS 1937
+net.tevp.postcode 185
+nl.sogeti.android.gpstracker 908
+nu.firetech.android.pactrack 68
+org.abrantix.rockon.rockonnggl 1265
+org.adaway 3983
+org.adw.launcher 1087
+org.andnav.osm 747
+org.androidsoft.games.memory.kids 449
+org.connectbot 1967
+org.coolreader 4404
+org.curiouscreature.android.shelves 230
+org.damazio.notifier 304
+org.droidseries 1049
+org.eehouse.android.xw4 1049
+org.example.pushupbuddy 377
+org.fdroid.fdroid 44954
 org.fdroid.taskstrid 23
-org.fosdem 260
-org.geometerplus.zlibrary.ui.android 3056
-org.helllabs.android.xmp 299
-org.hermit.audalyzer 930
-org.hermit.netscramble 564
-org.hermit.tricorder 1344
-org.jessies.mathdroid 718
-org.jfedor.frozenbubble 3226
-org.jmoyer.NotificationPlus 96
-org.johanhil.flygtider 79
-org.jtb.alogcat 1208
-org.jtb.droidlife 944
-org.jtb.httpmon 441
-org.kost.externalip 879
-org.kreed.vanilla 822
-org.linphone 695
+org.fosdem 266
+org.geometerplus.zlibrary.ui.android 3294
+org.helllabs.android.xmp 311
+org.hermit.audalyzer 971
+org.hermit.netscramble 596
+org.hermit.tricorder 1403
+org.jessies.mathdroid 769
+org.jfedor.frozenbubble 3403
+org.jmoyer.NotificationPlus 116
+org.johanhil.flygtider 80
+org.jsharkey.sky 70
+org.jtb.alogcat 1255
+org.jtb.droidlife 975
+org.jtb.httpmon 457
+org.kost.externalip 915
+org.kreed.vanilla 863
+org.liberty.android.fantastischmemo 37
+org.linphone 717
 org.mailboxer.saymyname 31
-org.marcus905.wifi.ace 976
-org.mixare 908
-org.moparisthebest.appbak 931
-org.mozilla.firefox 7288
-org.mult.daap 436
-org.mustard.android 946
-org.mythdroid 307
-org.navitproject.navit 770
-org.nerdcircus.android.klaxon 37
-org.openintents.filemanager 187
+org.marcus905.wifi.ace 1051
+org.mixare 950
+org.moparisthebest.appbak 970
+org.mozilla.firefox 7849
+org.mult.daap 468
+org.mustard.android 968
+org.mythdroid 322
+org.navitproject.navit 805
+org.nerdcircus.android.klaxon 44
+org.openintents.filemanager 283
 org.openintents.newsreader 4
-org.opensatnav 1274
-org.paulmach.textedit 1606
-org.penghuang.tools.rotationlock 303
-org.piwik.mobile 140
-org.pocketworkstation.pckeyboard 2349
-org.scoutant.blokish 1493
-org.sipdroid.sipua 577
-org.sixgun.ponyexpress 363
-org.sparkleshare.android 122
-org.swiftp 541
-org.thialfihar.android.apg 986
-org.thoughtcrime.securesms 324
-org.tomdroid 481
-org.torproject.android 1121
-org.transdroid 708
-org.ttrssreader 1151
-org.vudroid 1553
-org.wahtod.wififixer 1150
-org.wikipedia 489
-org.wordpress.android 439
-org.xbmc.android.remote 447
-org.xcsoar 80
-org.yaaic 848
-org.yaxim.androidclient 894
-org.zirco 2237
+org.opensatnav 1343
+org.paulmach.textedit 1763
+org.penghuang.tools.rotationlock 364
+org.piwik.mobile 145
+org.pocketworkstation.pckeyboard 2455
+org.scoutant.blokish 1545
+org.sipdroid.sipua 618
+org.sixgun.ponyexpress 369
+org.sparkleshare.android 133
+org.swiftp 577
+org.thialfihar.android.apg 1027
+org.thoughtcrime.securesms 356
+org.tof 96
+org.tomdroid 511
+org.torproject.android 1188
+org.transdroid 737
+org.ttrssreader 1191
+org.vudroid 1637
+org.wahtod.wififixer 1197
+org.wikipedia 616
+org.wordpress.android 523
+org.xbmc.android.remote 464
+org.xcsoar 90
+org.yaaic 876
+org.yaxim.androidclient 919
+org.zirco 2339
 pl.magot.vetch.ancal 23
-remuco.client.android 217
-ru.gelin.android.weather.notification 710
-se.johanhil.clipboard 478
-se.johanhil.duckduckgo 977
-se.peterbjorkman.android.trafikinfo 124
-seanfoy.wherering 235
-stericson.busybox.donate 297
-tkj.android.homecontrol.mythmote 353
-to.networld.android.divedroid 223
-tuioDroid.impl 78
-urbanstew.RehearsalAssistant 421
-us.lindanrandy.cidrcalculator 207
-vu.de.urpool.quickdroid 838
+remuco.client.android 239
+ru.gelin.android.weather.notification 775
+se.johanhil.clipboard 494
+se.johanhil.duckduckgo 1042
+se.peterbjorkman.android.trafikinfo 125
+seanfoy.wherering 244
+stericson.busybox.donate 354
+tkj.android.homecontrol.mythmote 364
+to.networld.android.divedroid 229
+tuioDroid.impl 84
+uk.co.jarofgreen.JustADamnCompass 76
+urbanstew.RehearsalAssistant 442
+us.lindanrandy.cidrcalculator 242
+vu.de.urpool.quickdroid 875

From d38317f8bef784f7f9b1fb9e4364ca84f92ced86 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 14:37:43 +0000
Subject: [PATCH 17/22] Just get rid of bin/ and gen/ rather than failing scans

---
 common.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/common.py b/common.py
index 8043eadd..f51d892f 100644
--- a/common.py
+++ b/common.py
@@ -825,6 +825,13 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
     if basesrclib:
         srclibpaths.append(basesrclib)
 
+    # There should never be gen or bin directories in the source, so just get
+    # rid of them...
+    for baddir in ['gen', 'bin']:
+        badpath = os.path.join(root_dir, 'gen')
+        if os.path.exists(badpath):
+            shutil.rmtree(badpath)
+
     # Run a pre-build command if one is required...
     if build.has_key('prebuild'):
         prebuild = build['prebuild']
@@ -954,15 +961,6 @@ def scan_source(build_dir, root_dir, thisbuild):
         msg = 'Found jni directory, but buildjni is not enabled'
         problems.append(msg)
 
-    # Presence of these is not a problem as such, but they
-    # shouldn't be there and mess up our source tarballs...
-    if os.path.exists(os.path.join(root_dir, 'bin')):
-        msg = "There shouldn't be a bin directory"
-        problems.append(msg)
-    if os.path.exists(os.path.join(root_dir, 'gen')):
-        msg = "There shouldn't be a gen directory"
-        problems.append(msg)
-
     return problems
 
 

From bccc6ce7ec1db73223ca4bf58748ee3b39f7b2b6 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 14:38:31 +0000
Subject: [PATCH 18/22] Metadata: simplifications resulting from previous
 commit

---
 metadata/apps.droidnotify.txt               | 2 +-
 metadata/at.tomtasche.reader.txt            | 4 ++--
 metadata/com.ghostsq.commander.txt          | 2 +-
 metadata/com.stericson.permissions.txt      | 2 +-
 metadata/com.voidcode.diasporawebclient.txt | 2 +-
 metadata/org.jsharkey.sky.txt               | 2 +-
 metadata/org.sparkleshare.android.txt       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index b80f2858..303b9e27 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -17,7 +17,7 @@ Repo:http://droid-notify.googlecode.com/svn/trunk
 Build Version:2.20,27,707,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
 Build Version:2.22,29,759,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
 Build Version:2.23,30,760,encoding=utf-8,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
-Build Version:2.24,31,781,encoding=utf-8,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/ && rm -rf gen/ && rm -rf bin/
+Build Version:2.24,31,781,encoding=utf-8,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
 
 Update Check Mode:Market
 Current Version:2.24
diff --git a/metadata/at.tomtasche.reader.txt b/metadata/at.tomtasche.reader.txt
index b01ee393..c6131abe 100644
--- a/metadata/at.tomtasche.reader.txt
+++ b/metadata/at.tomtasche.reader.txt
@@ -17,8 +17,8 @@ Repo:https://github.com/TomTasche/OpenDocument.droid.git
 Build Version:1.1.9,11,243eba4f441b3601de96
 Build Version:1.2,12,d174bed05a6026ddb5db
 Build Version:1.2.3,15,8fe022fd67e5bb62c6d8
-Build Version:1.3.0,22,4b8ea7438125e90d43bdadfc042723a7a485a217,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && rm -rf bin/ && rm -rf gen/ && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
-Build Version:1.3.2,24,4bcf9024ac9fb96bc5c03c3129f9d401272caaf0,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && rm -rf bin/ && rm -rf gen/ && rm libs/jopendocument.jar && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
+Build Version:1.3.0,22,4b8ea7438125e90d43bdadfc042723a7a485a217,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
+Build Version:1.3.2,24,4bcf9024ac9fb96bc5c03c3129f9d401272caaf0,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && rm libs/jopendocument.jar && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
 
 Update Check Mode:Market
 Current Version:1.3.0
diff --git a/metadata/com.ghostsq.commander.txt b/metadata/com.ghostsq.commander.txt
index 3866b32a..d2d18a73 100644
--- a/metadata/com.ghostsq.commander.txt
+++ b/metadata/com.ghostsq.commander.txt
@@ -29,7 +29,7 @@ prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
 Build Version:1.40,160,302,\
 prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
 Build Version:1.40.1,163,307
-Build Version:1.40.2,164,314,prebuild=rm -rf gen/
+Build Version:1.40.2,164,314
 
 Update Check Mode:Market
 Current Version:1.40.2
diff --git a/metadata/com.stericson.permissions.txt b/metadata/com.stericson.permissions.txt
index fb1070dd..21e923a3 100644
--- a/metadata/com.stericson.permissions.txt
+++ b/metadata/com.stericson.permissions.txt
@@ -20,7 +20,7 @@ Requires Root:Yes
 Repo Type:git-svn
 Repo:http://android-permissions.googlecode.com/svn/trunk/
 
-Build Version:1.3,4,9,prebuild=rm -rf bin/ && rm -rf gen/ && mkdir libs && mv RootTools-1.0-sdk3-generic.jar libs
+Build Version:1.3,4,9,prebuild=mkdir libs && mv RootTools-1.0-sdk3-generic.jar libs
 
 Update Check Mode:None
 Current Version:1.3
diff --git a/metadata/com.voidcode.diasporawebclient.txt b/metadata/com.voidcode.diasporawebclient.txt
index c41a988a..73835630 100644
--- a/metadata/com.voidcode.diasporawebclient.txt
+++ b/metadata/com.voidcode.diasporawebclient.txt
@@ -12,7 +12,7 @@ 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-10
+Build Version:1.3,3,26d7120fea1af5835a17537bebeef6df523d57e6,target=android-10
 Build Version:1.5,6,a153d5f996f284da44d5defa25ce601fd76b53ad,target=android-10,prebuild=\
 rm -rf gen/ && \
 rm -rf bin/ && \
diff --git a/metadata/org.jsharkey.sky.txt b/metadata/org.jsharkey.sky.txt
index 743b3acc..7080d2a0 100644
--- a/metadata/org.jsharkey.sky.txt
+++ b/metadata/org.jsharkey.sky.txt
@@ -13,7 +13,7 @@ Repo Type:git-svn
 Repo:http://android-sky.googlecode.com/svn/trunk/
 
 #Generated by import.py - check this is the right version, and find the right commit!
-Build Version:1.0,1,2,subdir=Sky,prebuild=rm -rf Sky/ && rm -rf gen/
+Build Version:1.0,1,2,subdir=Sky,prebuild=rm -rf Sky/
 
 Update Check Mode:None
 
diff --git a/metadata/org.sparkleshare.android.txt b/metadata/org.sparkleshare.android.txt
index ec4ea16b..06a4e37b 100644
--- a/metadata/org.sparkleshare.android.txt
+++ b/metadata/org.sparkleshare.android.txt
@@ -16,7 +16,7 @@ browse your files right from your Android device.
 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
+Build Version:1.0,1,a9e23f0f9ae6161a786bf48cb48ab3dec20110c9,target=android-7
 
 Update Check Mode:Market
 Current Version:1.0

From 2f1951ef3221a7a12dcb73d691471bbc64ae7869 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 21:28:34 +0000
Subject: [PATCH 19/22] Platform tools r14 compatibility

---
 common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.py b/common.py
index f51d892f..db0432f3 100644
--- a/common.py
+++ b/common.py
@@ -709,7 +709,7 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
 
     # 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'):
+    for propfile in ('build.properties', 'default.properties', 'ant.properties'):
         if os.path.exists(os.path.join(root_dir, propfile)):
             if subprocess.call(['sed','-i','s/^key.store/#/',
                                 propfile], cwd=root_dir) !=0:

From 3f5c29c30f8bed7f0c967629fa9529daa6bfcafe Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 18 Feb 2012 21:30:18 +0000
Subject: [PATCH 20/22] Support force update of build.xml without target, for
 r14

---
 README                         |  7 +++++--
 common.py                      |  8 +++-----
 metadata/org.fdroid.fdroid.txt | 18 +++++++++---------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/README b/README
index baaeaa7a..d53154f8 100644
--- a/README
+++ b/README
@@ -167,9 +167,12 @@ configuration to the build. These are:
  forcevercode=yes - If specified, the package vercode in the AndroidManifest.xml is
                    replaced with the version code for the build. See also
                    forceversion.
- update=no	   By default, 'android update project' is used to generate or
+ update=xxx	   By default, 'android update project' is used to generate or
                    update the build.xml file. Specifying update=no bypasses
-                   that.
+                   that. Specifiying update=force forces rebuilding of the
+		   build.xml file at the same time - this is frequently needed
+		   with r14 of the Android platform tools. Be aware of any
+		   customisations in build.xml when using update=force.
  initfun=yes	   Enables a selection of mad hacks to make com.funambol.android
                    build. Probably not useful for any other application.
  buildjni=yes      Enables building of native code via the ndk-build script
diff --git a/common.py b/common.py
index db0432f3..a8547dde 100644
--- a/common.py
+++ b/common.py
@@ -688,7 +688,7 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
             raise BuildException("Error running init command")
 
     # Generate (or update) the ant build file, build.xml...
-    if (build.get('update', 'yes') == 'yes' and
+    if (build.get('update', 'yes') != 'no' and
         not build.has_key('maven')):
         parms = [os.path.join(sdk_path, 'tools', 'android'),
                 'update', 'project', '-p', '.']
@@ -696,10 +696,8 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
         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...
+        # Force build.xml update if necessary...
+        if build.get('update', 'yes') == 'force' or build.has_key('target'):
             buildxml = os.path.join(root_dir, 'build.xml')
             if os.path.exists(buildxml):
                 print 'Force-removing old build.xml'
diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index c910320b..4ca3ab73 100644
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -17,15 +17,15 @@ 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
-Build Version:0.20,11,ddacfb856ad66c1c367e20c9cbecbfb15fe00813
-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
+Build Version:0.17,8,c626ce5f6d3e10ae15942f01ff028be310cc695a,update=force
+Build Version:0.18,9,a6c9ed8d06b19315df9ba9041324f78139f7d238,update=force
+Build Version:0.19,10,540b7d0522f4d67a4896697f7342e4c75b4cbf59,update=force
+Build Version:0.20,11,ddacfb856ad66c1c367e20c9cbecbfb15fe00813,update=force
+Build Version:0.21,12,49fa56aa6626a190f2d711120b69e435e9e615b1,update=force
+Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68,update=force
+Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172,update=force
+Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2,update=force
+Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b,update=force
 
 Update Check Mode:None
 

From d6deb15c0a4197270a6a6516e42a74c8eb80f902 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 19 Feb 2012 12:16:41 +0000
Subject: [PATCH 21/22] Correction to d38317f

---
 common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.py b/common.py
index a8547dde..83836500 100644
--- a/common.py
+++ b/common.py
@@ -826,7 +826,7 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
     # There should never be gen or bin directories in the source, so just get
     # rid of them...
     for baddir in ['gen', 'bin']:
-        badpath = os.path.join(root_dir, 'gen')
+        badpath = os.path.join(root_dir, baddir)
         if os.path.exists(badpath):
             shutil.rmtree(badpath)
 

From 8e4cb9f5a3f0732cfa685afb6ddba859fd35b6cd Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 19 Feb 2012 21:09:30 +0000
Subject: [PATCH 22/22] Metadata: some more simplications resulting from
 d38317f8

---
 metadata/com.voidcode.diasporawebclient.txt    | 2 --
 metadata/de.shandschuh.sparserss.txt           | 2 +-
 metadata/org.mult.daap.txt                     | 2 +-
 metadata/stericson.busybox.donate.txt          | 1 -
 metadata/tuioDroid.impl.txt                    | 2 +-
 metadata/uk.co.jarofgreen.JustADamnCompass.txt | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/metadata/com.voidcode.diasporawebclient.txt b/metadata/com.voidcode.diasporawebclient.txt
index 73835630..9fecf5f3 100644
--- a/metadata/com.voidcode.diasporawebclient.txt
+++ b/metadata/com.voidcode.diasporawebclient.txt
@@ -14,8 +14,6 @@ Repo:https://github.com/voidcode/Diaspora-Webclient.git
 
 Build Version:1.3,3,26d7120fea1af5835a17537bebeef6df523d57e6,target=android-10
 Build Version:1.5,6,a153d5f996f284da44d5defa25ce601fd76b53ad,target=android-10,prebuild=\
-rm -rf gen/ && \
-rm -rf bin/ && \
 mkdir libs && \
 mv google-api-translate-java-0.97.jar libs/ && \
 mv microsoft-translator-java-api-0.4-jar-with-dependencies.jar libs/
diff --git a/metadata/de.shandschuh.sparserss.txt b/metadata/de.shandschuh.sparserss.txt
index 81f148be..e7cf8644 100644
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@@ -22,7 +22,7 @@ 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-10
-Build Version:1.3.2,71,217,target=android-10,prebuild=rm -rf bin/
+Build Version:1.3.2,71,217,target=android-10
 Build Version:1.3.3_4,75,!No corresponding source in repo
 
 Update Check Mode:Market
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index 7208b30c..1ebc8d55 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -17,7 +17,7 @@ Build Version:.9.1,30,62
 Build Version:.9.2,31,!Repo code is missing at least one file update - the manifest
 Build Version:.9.6.2,38,!No corresponding source in repo
 Build Version:.9.6.5,39,89
-Build Version:.9.7,40,90,prebuild=rm -rf bin/
+Build Version:.9.7,40,90
 
 Update Check Mode:Market
 Current Version:.9.7
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index 713cabc7..e2b36343 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -22,7 +22,6 @@ Repo Type:git-svn
 Repo:http://busybox-android.googlecode.com/svn/trunk/
 
 Build Version:7.1,103,3,target=android-8,prebuild=\
-rm -rf gen &&\
 cd src/stericson &&\
 svn co -r 133 http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools &&\
 cd ../..
diff --git a/metadata/tuioDroid.impl.txt b/metadata/tuioDroid.impl.txt
index 615a8f0e..83498484 100644
--- a/metadata/tuioDroid.impl.txt
+++ b/metadata/tuioDroid.impl.txt
@@ -13,7 +13,7 @@ remote address using the TUIO protocol.
 Repo Type:svn
 Repo:http://tuiodroid.googlecode.com/svn/trunk/
 
-Build Version:1.0,4,28,subdir=TUIOdroid,prebuild=rm -rf bin && rm -rf gen,target=android-11
+Build Version:1.0,4,28,subdir=TUIOdroid,target=android-11
 
 Update Check Mode:Market
 Current Version:1.0
diff --git a/metadata/uk.co.jarofgreen.JustADamnCompass.txt b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
index bcf5d3ea..b9897592 100644
--- a/metadata/uk.co.jarofgreen.JustADamnCompass.txt
+++ b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
@@ -12,7 +12,7 @@ A simple compass with no unnecessary extras.
 Repo Type:git
 Repo:https://github.com/jarofgreen/Just-A-Damn-Compass.git
 
-Build Version:1.1,2,32e3d60ecadac260f71da17a6cb4b22084c5bcc2,target=android-8,prebuild=rm -rf gen
+Build Version:1.1,2,32e3d60ecadac260f71da17a6cb4b22084c5bcc2,target=android-8
 
 Update Check Mode:Market