merge conflict solved and added new version

.gitignore

@@ -1,14 +1,14 @@
-config.py
+/config.py
-repo/
+/repo/
-archive/
+/archive/
-logs/
+/logs/
-built/
+/built/
-tmp/
+/tmp/
-builder/
+/builder/
 *~
 *.pyc
-unsigned/
+/unsigned/
-note
+/note
-misc/
+/misc/
-shmetadata/
+/shmetadata/
-shmextlib/
+/shmextlib/

build/.gitignore

@@ -1,3 +1,3 @@
-*/
+/*/
-!extlib/
+!/extlib/
-.fdroidvcs-*
+/.fdroidvcs-*

build/extlib/custom_rules.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="imported">
+ <target name="-post-compile">
+  <macrodef name="dex-helper">
+   <element name="external-libs" optional="yes"/>
+   <attribute name="nolocals" default="false"/>
+   <sequential>
+    <property name="out.dex.input.absolute.dir" value="${out.classes.absolute.dir}"/>
+    <path id="out.dex.jar.input.ref" path="${basedir}/libs/jcifs-1.3.17.jar"/>
+    <dex executable="${dx}" output="${intermediate.dex.file}" nolocals="@{nolocals}" verbose="${verbose}">
+     <path path="${out.dex.input.absolute.dir}"/>
+     <path refid="out.dex.jar.input.ref"/>
+     <external-libs/>
+    </dex>
+   </sequential>
+  </macrodef>
+ </target>
+</project>

build/extlib/ganymed-ssh/source.txt

@@ -0,0 +1 @@
+http://mvnrepository.com/artifact/ch.ethz.ganymed/ganymed-ssh2/

metadata/An.stop.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://code.google.com/p/anstop/
 Source Code:http://code.google.com/p/anstop/source/checkout

metadata/SpeedoMeterApp.main.txt

@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Public Domain
 Web Site:http://sourceforge.net/projects/androidspeedo/
 Source Code:http://sourceforge.net/projects/androidspeedo/

metadata/a2dp.Vol.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/a2dpvolume/
 Source Code:http://code.google.com/p/a2dpvolume/source/checkout
@@ -24,12 +24,27 @@ understands GPS data.
 Repo Type:hg
 Repo:http://code.google.com/p/a2dpvolume/
 
-Build Version:2.8.11,93,8eac7d
+Build:2.8.11,93
-Build Version:2.8.14,96,317d1cdf584a
+    commit=8eac7d
-Build Version:2.8.17,99,89248bd5da61
+
-Build Version:2.9.1,101,!remove because beta feebcb632fe9
+Build:2.8.14,96
-Build Version:2.9.4,104,8a57089be290
+    commit=317d1cdf584a
-Build Version:2.9.7,107,fec56a293772
+
+Build:2.8.17,99
+    commit=89248bd5da61
+
+Build:2.9.1,101
+    disable=remove because beta 
+    commit=feebcb632fe9
+
+Build:2.9.4,104
+    commit=8a57089be290
+
+Build:2.9.7,107
+    commit=fec56a293772
+
+Build:2.10.1,111
+    commit=f4c887a2b798
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest

metadata/aarddict.android.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://aarddict.org/android/
 Source Code:https://github.com/aarddict/android

metadata/acr.browser.barebones.txt

@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/anthonycr/Lightning-Browser
 Source Code:https://github.com/anthonycr/Lightning-Browser
@@ -17,27 +17,43 @@ Description:
 Repo Type:git
 Repo:https://github.com/anthonycr/Lightning-Browser.git
 
-Build Version:2.2.0,22,7a228d2a8c1,target=android-17,prebuild=\
+Build:2.2.0,22
-sed -i 's/int MAX_TABS=5\, MAX_BOOKMARKS=5/int MAX_TABS=15\, MAX_BOOKMARKS=50/g' \
+    commit=7a228d2a8c1
-src/acr/browser/barebones/Barebones.java
+    target=android-17
-Build Version:2.3.4,27,2afff6d2876,target=android-17,prebuild=\
+    prebuild=sed -i 's/int MAX_TABS=5, MAX_BOOKMARKS=5/int MAX_TABS=15, MAX_BOOKMARKS=50/g' src/acr/browser/barebones/Barebones.java
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
+
-src/acr/browser/barebones/Barebones.java
+Build:2.3.4,27
-Build Version:2.3.7,30,bba148f92e1,target=android-17,prebuild=\
+    commit=2afff6d2876
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
+    target=android-17
-src/acr/browser/barebones/Barebones.java
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-Build Version:2.3.12,36,d99e82b6cbbe8,target=android-17,prebuild=\
+
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
+Build:2.3.7,30
-src/acr/browser/barebones/Barebones.java
+    commit=bba148f92e1
-Build Version:2.4,37,deed4b7f3c487102,target=android-17,prebuild=\
+    target=android-17
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
-src/acr/browser/barebones/Barebones.java
+
-Build Version:2.4.3,42,103b4e40e113beaf,target=android-17,prebuild=\
+Build:2.3.12,36
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
+    commit=d99e82b6cbbe8
-src/acr/browser/barebones/Barebones.java
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.4,37
+    commit=deed4b7f3c487102
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.4.3,42
+    commit=103b4e40e113beaf
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.5.1.4,60
+    commit=a383f8e77871
+    target=android-18
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/' src/acr/browser/barebones/utilities/FinalVariables.java
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.4.3
+Current Version:2.5.1.4
-Current Version Code:42
+Current Version Code:60
 

metadata/am.ed.importcontacts.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://ed.am/dev/android/import-contacts
 Source Code:http://bzr.ed.am/android/import-contacts

metadata/android.androidVNC.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories: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

metadata/android.game.prboom.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/prboom4android/
 Source Code:http://code.google.com/p/prboom4android/source/list

metadata/android.tether.txt

@@ -1,5 +1,5 @@
 Disabled:Prebuilts
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/android-wifi-tether/
 Source Code:https://code.google.com/p/android-wifi-tether/source/list
@@ -27,7 +27,7 @@ ad-hoc mode) and (probably) a custom-kernel which supports netfilter
 
 Requires Root:Yes
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 
 Build Version:2.0.7,26,523,buildjni=yes

metadata/apps.babycaretimer.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/baby-care-timer
 Source Code:http://code.google.com/p/baby-care-timer/source/list

metadata/apps.droidnotify.txt

@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeAdd
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/droid-notify/
 Source Code:https://code.google.com/p/droid-notify/source/list
@@ -19,7 +19,7 @@ install the fully-featured proprietary version.
 Status: Newer versions have been published by the author but without source code.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 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/

metadata/arity.calculator.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/arity-calculator
 Source Code:http://code.google.com/p/arity-calculator/source/list

metadata/at.bitfire.davdroid.txt

@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://davdroid.bitfire.at/
 Source Code:https://github.com/rfc2822/davdroid
@@ -19,12 +19,26 @@ After installing the app, add a DAVdroid account using Settings/Account.
 Repo Type:git
 Repo:https://github.com/rfc2822/davdroid.git
 
-Build Version:0.3.2-alpha,5,v0.3.2-alpha
+Build:0.3.2-alpha,5
-Build Version:0.3.3-alpha,6,v0.3.3-alpha
+    commit=v0.3.2-alpha
-Build Version:0.3.4-alpha,7,v0.3.4-alpha
 
-Auto Update Mode:None
+Build:0.3.3-alpha,6
+    commit=v0.3.3-alpha
+
+Build:0.3.4-alpha,7
+    commit=v0.3.4-alpha
+
+Build:0.3.5-alpha,8
+    commit=v0.3.5-alpha
+
+Build:0.3.6-alpha,10
+    commit=v0.3.6-alpha
+
+Build:0.3.7-alpha,11
+    commit=v0.3.7-alpha
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.3.4-alpha
+Current Version:0.3.7-alpha
-Current Version Code:7
+Current Version Code:11
 

metadata/at.bitfire.gfxtablet.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:http://rfc2822.github.com/GfxTablet/
 Source Code:https://github.com/rfc2822/GfxTablet

metadata/at.dasz.KolabDroid.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/kolab-android
 Source Code:https://gitorious.org/kolab-android/kolab-android

metadata/at.tomtasche.reader.txt

@@ -1,10 +1,9 @@
 AntiFeatures:Tracking
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://reader.tomtasche.at
 Source Code:https://github.com/TomTasche/OpenDocument.droid
 Issue Tracker:https://github.com/TomTasche/OpenDocument.droid/issues
-# http://forum.xda-developers.com/donatetome.php?u=2074207
 FlattrID:117140
 
 Auto Name:OpenDocument Reader
@@ -17,85 +16,142 @@ including OpenOffice and LibreOffice.
 Anti-feature: Tracking. A recent version had code for sending
 some device info via HTTP POST to a appspot.com server.
 
-A proprietary ad library was removed before building.
+A proprietary ad library was removed before building. More recent versions
+have several more proprietary binaries.
 .
 
 Repo Type:git
 Repo:https://github.com/TomTasche/OpenDocument.droid.git
 
-Build Version:1.1.9,11,243eba4f441b3601de96
+Build:1.1.9,11
-Build Version:1.2,12,d174bed05a6026ddb5db
+    commit=243eba4f441b3601de96
-Build Version:1.2.3,15,8fe022fd67e5bb62c6d8
+
-Build Version:1.3.0,22,4b8ea7438125e90d43bdadfc042723a7a485a217,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
+Build:1.2,12
-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/
+    commit=d174bed05a6026ddb5db
-Build Version:2.0.6,33,!unknown build server problems b88d8bf6d,srclibs=\
+
-BillingLibrary@3ecc7cad9c;MobAdMob@2d5736;FilePicker@d12f209e8;aFileChooser@c3197bb151,prebuild=\
+Build:1.2.3,15
-sed -i 's@\(android.library.reference.1=\).*@\1$$aFileChooser$$@' project.properties && \
+    commit=8fe022fd67e5bb62c6d8
-sed -i 's@\(android.library.reference.2=\).*@\1$$FilePicker$$@' project.properties && \
+
-echo "android.library.reference.3=$$BillingLibrary$$" >> project.properties && \
+Build:1.3.0,22
-echo "android.library.reference.4=$$MobAdMob$$" >> project.properties && \
+    commit=4b8ea7438125e90d43bdadfc042723a7a485a217
-cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \
+    srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2
-rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests
+    prebuild=rm *.apk && \
+        cp -r $$JOpenDocument$$/src/* src/ && \
+        rm -rf src/test/
+
+Build:1.3.2,24
+    commit=4bcf9024ac9fb96bc5c03c3129f9d401272caaf0
+    srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2
+    prebuild=rm *.apk && \
+        rm libs/jopendocument.jar && \
+        cp -r $$JOpenDocument$$/src/* src/ && \
+        rm -rf src/test/
+
+Build:2.0.6,33
+    disable=!unknown build server problems b88d8bf6d
+    commit=unknown - see disabled
+    srclibs=BillingLibrary@3ecc7cad9c;MobAdMob@2d5736;FilePicker@d12f209e8;aFileChooser@c3197bb151
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$aFileChooser$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$FilePicker$$@' project.properties && \
+        echo "android.library.reference.3=$$BillingLibrary$$" >> project.properties && \
+        echo "android.library.reference.4=$$MobAdMob$$" >> project.properties && \
+        cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \
+        rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests
+
 #careful deleting lines in submodule source: they don't reappear
-Build Version:2.0.7,34,771437a702,init=\
+Build:2.0.7,34
-git config -f .gitmodules --remove-section submodule.test && \
+    commit=771437a702
-git rm --cached test && rm -rf test && \
+    init=git config -f .gitmodules --remove-section submodule.test && \
-sed -i 's/git@github.com:/https:\/\/github.com\//g' .gitmodules && \
+        git rm --cached test && \
-sed -i 's/git@github.com:/https:\/\/github.com\//g' .git/config && git submodule update --init,\
+        rm -rf test && \
-srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
+        sed -i 's/git@github.com:/https:\/\/github.com\//g' .gitmodules && \
-AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
+        sed -i 's/git@github.com:/https:\/\/github.com\//g' .git/config && \
-sed -i '42d' filepicker-android/src/io/filepicker/AuthActivity.java && \
+        git submodule update --init
-echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library
-rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar && \
+    srclibs=MobAdMob@2d5736
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+    prebuild=sed -i '42d' filepicker-android/src/io/filepicker/AuthActivity.java && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
+        echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
-Build Version:2.0.8,35,!broken v2.0.8,submodules=no,init=\
+        rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar && \
-rm -rf odf2html/.gitmodules odf2html/library/dep/commons && git submodule update --init && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
-git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
-cd odf2html/ && git checkout 008034b70714,\
+
-srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
+Build:2.0.8,35
-AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
+    disable=!broken v2.0.8
-echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+    commit=unknown - see disabled
-rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk \
+    submodules=no
-libs/android-support-v4.jar odf2html/library/odf2html.jar && \
+    init=rm -rf odf2html/.gitmodules odf2html/library/dep/commons && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+        git submodule update --init && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/,\
+        git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
-build=cd odf2html/library/ && ant -f dep/commons/library/build.xml && \
+        cd odf2html/ && \
-mkdir -p lib/ && mv dep/commons/library/commons.jar lib/ && \
+        git checkout 008034b70714
-cp lib/commons.jar ../../libs/ && ant && mv odf2html.jar ../../libs/
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library
-Build Version:2.0.8.2,37,!broken v2.0.8.2,submodules=no,init=\
+    srclibs=MobAdMob@2d5736
-rm -rf $(find . -name bin) && rm -rf $(find . -name gen) && \
+    prebuild=echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
-rm -rf odf2html/.gitmodules odf2html/library/dep/commons && git submodule update --init && \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar odf2html/library/odf2html.jar && \
-git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
-cd odf2html/library/dep/commons && git checkout f9ba1a9,\
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
-srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
+    build=cd odf2html/library/ && \
-AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
+        ant -f dep/commons/library/build.xml && \
-echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+        mkdir -p lib/ && \
-rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk \
+        mv dep/commons/library/commons.jar lib/ && \
-libs/android-support-v4.jar odf2html/library/odf2html.jar && \
+        cp lib/commons.jar ../../libs/ && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+        ant && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/,\
+        mv odf2html.jar ../../libs/
-build=cd odf2html/library/ && ant -f dep/commons/library/build.xml && \
+
-mkdir -p lib/ && mv dep/commons/library/commons.jar lib/ && \
+Build:2.0.8.2,37
-cp lib/commons.jar ../../libs/ && ant && mv odf2html.jar ../../libs/
+    disable=!broken v2.0.8.2
-Build Version:2.10.1,45,!won't build and probably crashy at v2.10.1,submodules=yes,init=\
+    commit=unknown - see disabled
-rm -rf $(find . -name bin) && rm -rf $(find . -name gen) && cd odf2html/library/dep && \
+    submodules=no
-rm -rf commons && git clone git://github.com/andiwand/commons.git && \
+    init=rm -rf $(find . -name bin) && \
-cd commons/ && git checkout cf34f179f,srclibs=MobAdMob@2d5736;NoAnalytics@533c6c1,\
+        rm -rf $(find . -name gen) && \
-update=.;aFileChooser/aFileChooser;ActionBarSherlock/actionbarsherlock;\
+        rm -rf odf2html/.gitmodules odf2html/library/dep/commons && \
-Android-RateThisApp/library;Android-AppMsg/library;pay-me/library,prebuild=\
+        git submodule update --init && \
-echo -e "android.library.reference.6=$$MobAdMob$$\n\
+        git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
-android.library.reference.7=$$NoAnalytics$$" >> project.properties && \
+        cd odf2html/library/dep/commons && \
-sed -i 's/1.6/1.7/g' odf2html/library/build.xml && \
+        git checkout f9ba1a9
-sed -i 's/1.6/1.7/g' odf2html/library/dep/commons/library/build.xml && \
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library
-rm -rf libs/GoogleAdMobAdsSdk*.jar libs/libGoogleAnalytics*.jar OpenDocument.apk \
+    srclibs=MobAdMob@2d5736
-libs/android-support-v4.jar,build=cd odf2html/library/dep/commons/library && \
+    prebuild=echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
-ant && cd ../../../ && ant && mv dep/commons/library/commons.jar \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar odf2html/library/odf2html.jar && \
-../../libs/ && mv odf2html.jar ../../libs/
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
+    build=cd odf2html/library/ && \
+        ant -f dep/commons/library/build.xml && \
+        mkdir -p lib/ && \
+        mv dep/commons/library/commons.jar lib/ && \
+        cp lib/commons.jar ../../libs/ && \
+        ant && \
+        mv odf2html.jar ../../libs/
+
+Build:2.10.1,45
+    disable=!won't build and probably crashy at v2.10.1
+    commit=v2.10.1
+    submodules=yes
+    init=rm -rf $(find . -name bin) && \
+        rm -rf $(find . -name gen) && \
+        cd odf2html/library/dep && \
+        rm -rf commons && \
+        git clone git://github.com/andiwand/commons.git && \
+        cd commons/ && \
+        git checkout cf34f179f
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/actionbarsherlock;Android-RateThisApp/library;Android-AppMsg/library;pay-me/library
+    srclibs=MobAdMob@2d5736;NoAnalytics@533c6c1
+    prebuild=echo -e "android.library.reference.6=$$MobAdMob$$\nandroid.library.reference.7=$$NoAnalytics$$" >> project.properties && \
+        sed -i 's/1.6/1.7/g' odf2html/library/build.xml && \
+        sed -i 's/1.6/1.7/g' odf2html/library/dep/commons/library/build.xml && \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar libs/libGoogleAnalytics*.jar OpenDocument.apk libs/android-support-v4.jar
+    build=cd odf2html/library/dep/commons/library && \
+        ant && \
+        cd ../../../ && \
+        ant && \
+        mv dep/commons/library/commons.jar ../../libs/ && \
+        mv odf2html.jar ../../libs/
+
+Build:2.12.6,59
+    disable=mutiple proprietary libraries (at least 3)
 
 Auto Update Mode:None
-# Device-variable; don't want to nuke submodules with Tags
+Update Check Mode:Static
-Update Check Mode:RepoManifest
+Current Version:2.12.6
-Current Version:2.12.4
+Current Version Code:59
-Current Version Code:57
 

metadata/at.univie.sensorium.txt

@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:
 Source Code:https://github.com/fmetzger/android-sensorium

metadata/au.com.darkside.XServer.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:http://my20percent.wordpress.com/2012/02/27/android-x-server
 Source Code:http://code.google.com/p/android-xserver/source/checkout

metadata/aws.apps.androidDrawables.txt

@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:http://aschillings.co.uk/html/android_resource_viewer.html
 Source Code:https://github.com/alt236/Android-Drawables---Android

metadata/aws.apps.usbDeviceEnumerator.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://aschillings.co.uk/html/usb_device_info.html
 Source Code:https://github.com/alt236/USB-Device-Info---Android

metadata/bander.notepad.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/banderlabs/
 Source Code:http://code.google.com/p/banderlabs/source/checkout

metadata/be.ppareit.swiftp_free.txt

@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://ppareit.github.com/swiftp
 Source Code:https://github.com/ppareit/swiftp

metadata/be.quentinloos.manille.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://quentinloos.be/projets/manille
 Source Code:https://github.com/Kent1/Manille

metadata/biz.codefuture.svgviewer.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:
 Source Code:https://github.com/cw/svg-viewer-android

metadata/biz.gyrus.yaab.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:https://bitbucket.org/gyrussolutions/yaab/wiki/Home
 Source Code:https://bitbucket.org/gyrussolutions/yaab/src
@@ -26,6 +26,7 @@ Build Version:1.9,14,release1.9,target=android-16
 Build Version:1.9.3,17,release1.9.3,target=android-17
 Build Version:1.9.5,19,release1.9.5,init=rm -rf bin gen
 Build Version:1.9.6,20,release1.9.6
+Build Version:1.9.7,21,release1.9.7
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/budo.budoist.txt

@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeNet
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/budowski/budoist/
 Source Code:https://github.com/budowski/budoist

metadata/bughunter2.smsfilter.txt

@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:Fair License
 Web Site:http://purl.org/net/smsfilter
 Source Code:http://purl.org/net/smsfilter

metadata/caldwell.ben.bites.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bites-android/
 Source Code:http://code.google.com/p/bites-android/source/checkout

metadata/caldwell.ben.trolly.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://sites.google.com/site/caldwellcode/
 Source Code:http://code.google.com/p/trolly/source/checkout
@@ -12,15 +12,18 @@ 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 Type:git-svn
-Repo:http://trolly.googlecode.com/svn/trunk
+Repo:http://trolly.googlecode.com/svn;trunk=trunk;tags=tags
 
 # 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
+Build:1.4,6
+    commit=trolly_1.4
+    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
 
 Auto Update Mode:None
-#Update Check Mode:Market
+Update Check Mode:Tags
-Update Check Mode:None
 Current Version:1.4
 Current Version Code:6
 

metadata/campyre.android.txt

@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:MIT
 Web Site:https://github.com/konklone/campyre
 Source Code:https://github.com/konklone/campyre

metadata/cc.co.eurdev.urecorder.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://bitbucket.org/thomasebell/urecord/
 Source Code:https://bitbucket.org/thomasebell/urecord/

metadata/cgeo.geocaching.txt

@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://www.cgeo.org
 Source Code:https://github.com/cgeo/c-geo-opensource

metadata/ch.blinkenlights.android.apnswitch.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/adrian-bl/APN-Switch
 Source Code:https://github.com/adrian-bl/APN-Switch

metadata/ch.blinkenlights.android.vanilla.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/adrian-bl/vanilla
 Source Code:https://github.com/adrian-bl/vanilla

metadata/ch.blinkenlights.battery.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://github.com/adrian-bl/bl-battstatus-android
 Source Code:https://github.com/adrian-bl/bl-battstatus-android

metadata/ch.fixme.cowsay.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://fixme.ch/wiki/Cowsay_for_Android
 Source Code:https://github.com/rorist/Cowsay-android

metadata/ch.fixme.status.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:
 Source Code:https://github.com/fixme-lausanne/MyHackerspace/
@@ -19,8 +19,12 @@ Build Version:1.6.1,10,56287be60f,prebuild=rm -rf apks/
 Build Version:1.7.1,14,e706cab0fd305,prebuild=rm -rf apks/
 Build Version:1.7.2,15,069efc060c192cc3a3c30996bc,prebuild=rm -rf apks/
 
+Build:1.7.3,16
+	commit=b57229c55c3ff
+	init=rm -rf apks/
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.7.2
+Current Version:1.7.3
-Current Version Code:15
+Current Version Code:16
 

metadata/ch.nexuscomputing.android.osciprimeics.txt

@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPL
 Web Site:http://www.osciprime.com/index.php
 Source Code:https://bitbucket.org/dalb8/osciiprime 

metadata/ch.rrelmy.android.batterymanager.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/rrelmy/BatteryLevel
 Source Code:https://github.com/rrelmy/BatteryLevel

metadata/ch.rrelmy.android.locationcachemap.txt

@@ -1,6 +1,6 @@
 #NonFreeDep can be removed with the Manifest patch below
 AntiFeatures:NonFreeDep
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/rrelmy/LocationCacheMap
 Source Code:https://github.com/rrelmy/LocationCacheMap

metadata/cm.aptoide.pt.txt

@@ -1,5 +1,5 @@
 Disabled:bad use of version control. non free libraries and inconsistent licensing
-Category:System
+Categories:System
 License:GPL
 Web Site:http://www.aptoide.com/
 Source Code:http://aptoide.org/trac

metadata/com.FireFart.Permissions2.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/FireFart/Permissions
 Source Code:https://github.com/FireFart/Permissions

metadata/com.MarcosDiez.shareviahttp.txt

@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:NewBSD
 Web Site:http://code.google.com/p/share-via-http
 Source Code:http://code.google.com/p/share-via-http/source/list

metadata/com.abcdjdj.rootverifier.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2+
 Web Site:
 Source Code:https://github.com/abcdjdj/RootVerifier-APP
@@ -15,10 +15,11 @@ don't know whether their device is rooted yet.
 Repo Type:git
 Repo:https://github.com/abcdjdj/RootVerifier-APP.git
 
-Build Version:1.2,3,ff498b24bee87
+Build:1.2,3
+    commit=ff498b24bee87
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.2
+Current Version:1.3
-Current Version Code:3
+Current Version Code:4
 

metadata/com.achep.widget.jellyclock.txt

@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/AChep/JellyBeanClock
 Source Code:https://github.com/AChep/JellyBeanClock

metadata/com.adam.aslfms.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/tgwizard/sls
 Source Code:https://github.com/tgwizard/sls

metadata/com.addi.txt

@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://code.google.com/p/addi/
 Source Code:http://code.google.com/p/addi/source/checkout

metadata/com.adstrosoftware.launchappops.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/adstro/launch-app-ops

metadata/com.agiro.scanner.android.txt

@@ -1,5 +1,5 @@
 Disabled:no source for this application any more
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/pakerfeldt/aGiro

metadata/com.alfray.asqare.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/asqare/
 Source Code:https://code.google.com/p/asqare/source/list

metadata/com.alfray.mandelbrot2.txt

@@ -1,5 +1,5 @@
 Disabled:Past sell by date
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/mandelbrot/
 Source Code:http://code.google.com/p/mandelbrot/source/checkout

metadata/com.alfray.timeriffic.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/timeriffic/
 Source Code:http://code.google.com/p/timeriffic/source/checkout

metadata/com.amphoras.tpthelper.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/Amphoras/TPT-Helper
 Source Code:https://github.com/Amphoras/TPT-Helper/tree/V2.0.3/TPT%20Helper

metadata/com.andrew.apollo.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:
 Source Code:https://github.com/adneal/Apollo-CM

metadata/com.android.inputmethod.norwegian.txt

@@ -1,5 +1,5 @@
 Disabled:Can't build dictionary libraries
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/scandinavian-keyboard/
 Source Code:http://code.google.com/p/scandinavian-keyboard/source/checkout

metadata/com.android.inputmethod.pinyin.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/CyanogenMod/
 Source Code:https://github.com/CyanogenMod/android_packages_inputmethods_PinyinIME/tree

metadata/com.android.keepass.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.keepassdroid.com/
 Source Code:http://github.com/bpellin/keepassdroid

metadata/com.android.music.txt

@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:
 Source Code:https://android.googlesource.com/platform/packages/apps/Music

metadata/com.android.quake.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/glesquake/
 Source Code:https://code.google.com/p/glesquake/source/checkout

metadata/com.android.shellms.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:https://github.com/try2codesecure/ShellMS
 Source Code:https://github.com/try2codesecure/ShellMS/blob/master/src/com/android/shellms/sendSMS.java
@@ -16,11 +16,16 @@ your computer.
 Repo Type:git
 Repo:git://github.com/try2codesecure/ShellMS.git
 
-Build Version:1.0,1,627f2a,init=rm -rf bin gen
+Build:1.0,1
-Build Version:1.1,2,v1.1,init=rm -rf bin gen
+    commit=627f2a
+    init=rm -rf bin gen
+
+Build:1.1,2
+    commit=v1.1
+    init=rm -rf bin gen
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.1
+Current Version:1.2
-Current Version Code:2
+Current Version Code:3
 

metadata/com.android2.calculator3.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/Xlythe/android_packages_apps_Calculator
 Source Code:https://github.com/Xlythe/android_packages_apps_Calculator

metadata/com.androidemu.gba.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://gameboid.sf.net
 Source Code:http://sf.net/p/gameboid/code/

metadata/com.androidemu.gbc.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://gbcoid.sf.net
 Source Code:http://sf.net/p/gbcoid/code/

metadata/com.androidemu.nes.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://nesoid.sf.net
 Source Code:http://sf.net/p/nesoid/code/

metadata/com.androidemu.snes.txt

@@ -1,4 +1,5 @@
-Category:Games
+Disabled:Non-free license
+Categories:Games
 License:Unknown
 Web Site:https://github.com/Pretz/SNesoid/
 Source Code:https://github.com/Pretz/SNesoid

metadata/com.androsz.electricsleepbeta.txt

@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:https://github.com/jondwillis/ElectricSleep
 Source Code:https://github.com/jondwillis/ElectricSleep

metadata/com.androzic.txt

@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://androzic.com
 Source Code:https://github.com/andreynovikov/Androzic

metadata/com.andybotting.tramhunter.txt

@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://tramhunter.andybotting.com
 Source Code:https://github.com/andybotting/tramhunter

metadata/com.angrydoughnuts.android.alarmclock.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://code.google.com/p/kraigsandroid/
 Source Code:https://code.google.com/p/kraigsandroid/source/checkout
@@ -16,14 +16,15 @@ Description:
 * Localizations: it, nl, pt, de, sr, hr, fr, es
 .
 
-Repo Type:svn
+Repo Type:git
-Repo:http://kraigsandroid.googlecode.com/svn/tags/
+Repo:https://code.google.com/p/kraigsandroid/
 
-Build Version:1.7,8,378
+Build:1.7,8
+    commit=alarmclock-1.7
+    subdir=android/alarmclock
 
 Auto Update Mode:None
-#Update Check Mode:Market
+Update Check Mode:Tags
-Update Check Mode:None
 Current Version:1.7
 Current Version Code:8
 

metadata/com.anoshenko.android.mahjongg.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/mahjonggbuilder/
 Source Code:http://code.google.com/p/mahjonggbuilder/source/checkout

metadata/com.anysoftkeyboard.languagepack.SSH.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/pi3ch/ssh_anysoftkeyboard
 Source Code:https://github.com/pi3ch/ssh_anysoftkeyboard

metadata/com.anysoftkeyboard.languagepack.catalan.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Catalan
@@ -18,7 +18,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Catalan
 
 Build Version:20110220,3,1560,patch=xml.patch,\
@@ -29,7 +29,7 @@ mkdir -p dict/ res/raw/ && gunzip -c libs/ca.xml.gz > dict/words.xml && rm -rf a
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20110220
 Current Version Code:3
 

metadata/com.anysoftkeyboard.languagepack.danish.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Danish
@@ -17,7 +17,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Danish
 
 Build Version:20100614,2,1081,patch=xml.patch,\
@@ -28,7 +28,7 @@ mkdir -p dict/ res/raw/ && gunzip -c libs/da.xml.gz > dict/words.xml && rm -rf a
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20100614
 Current Version Code:2
 

metadata/com.anysoftkeyboard.languagepack.esperanto.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Esperanto
@@ -17,7 +17,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Esperanto
 
 Build Version:20100613,2,1082,patch=xml.patch,\
@@ -28,7 +28,7 @@ mkdir -p dict/ res/raw/ && gunzip -c libs/eo.xml.gz > dict/words.xml && rm -rf a
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20100613
 Current Version Code:2
 

metadata/com.anysoftkeyboard.languagepack.french_xlarge.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/FrenchXLarge
@@ -21,7 +21,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/FrenchXLarge
 
 Build Version:20111029,1,2019,init=rm -rf bin/ gen/,update=force,\
@@ -33,7 +33,7 @@ wget http://softkeyboard.googlecode.com/svn/trunk/DictionaryTools/xml/fr_xlarge.
 -O dict/words.xml,build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20111029
 Current Version Code:1
 

metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/Stichoza
 Source Code:https://github.com/Stichoza/AnySoftKeyboardLanguagePackGeorgian

metadata/com.anysoftkeyboard.languagepack.greek.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Greek
@@ -18,7 +18,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Greek
 
 Build Version:20110717,3,1815,patch=xml.patch,\
@@ -29,7 +29,7 @@ mkdir -p dict/ res/raw/ && rm -rf assets/ && mv libs/gr.xml dict/words.xml,\
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20110717
 Current Version Code:3
 

metadata/com.anysoftkeyboard.languagepack.hebrew_large.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPL
 Web Site:https://github.com/AnySoftKeyboard/LanguagePack
 Source Code:https://github.com/AnySoftKeyboard/LanguagePack

metadata/com.anysoftkeyboard.languagepack.hungarian.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPL/MPL
 Web Site:
 Source Code:https://github.com/rhornig/anysoftkeyboard-hungarian

metadata/com.anysoftkeyboard.languagepack.malayalam.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://gitorious.org/~psuresh
 Source Code:https://gitorious.org/amalaki

metadata/com.anysoftkeyboard.languagepack.pali.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/yuttadhammo
 Source Code:https://github.com/yuttadhammo/ask-pali-keyboard

metadata/com.anysoftkeyboard.languagepack.persian.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.pedramhayati.com/2011/05/15/persianfarsi-language-for-android
 Source Code:https://github.com/pi3ch/persian_anysoftkeyboard

metadata/com.anysoftkeyboard.languagepack.russian2.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Unknown
 Web Site:https://github.com/pelya/AnySoftKeyboard-LanguagePack-Russian
 Source Code:https://github.com/pelya/AnySoftKeyboard-LanguagePack-Russian

metadata/com.anysoftkeyboard.languagepack.spain.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GNUFDL/CCBYSA
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Spain
@@ -18,7 +18,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Spain
 
 Build Version:20110717-smaller,2,1813,forceversion=yes,forcevercode=yes,\

metadata/com.anysoftkeyboard.languagepack.ukrainian.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GNUFDL
 Web Site:
 Source Code:https://github.com/AnySoftKeyboard/LanguagePack

metadata/com.anysoftkeyboard.theme.classic_pc.txt

@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/Themes/ClassicPC
@@ -15,7 +15,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboard themes menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/Themes/ClassicPC
 
 Build Version:1.0.1-201200304,2,2255,\
@@ -24,8 +24,7 @@ sed -i 's@\(reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
 sed -i '/key/d' project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
+Update Check Mode:RepoManifest
-Update Check Mode:None
 Current Version:1.0.1-201200304
 Current Version Code:2
 

metadata/com.aokp.backup.txt

@@ -1,5 +1,5 @@
 Disabled:Not much chance of keeping it updated
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/romanbb/AOKP_Backup
 Source Code:https://github.com/romanbb/AOKP_Backup

metadata/com.app2go.sudokufree.txt

@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://www.1gravity.com/
 Source Code:http://code.google.com/p/sudoku-pro-android/source/list

metadata/com.appengine.paranoid_android.lost.txt

@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:LGPL
 Web Site:https://sites.google.com/site/paranoidandroidproject/ContactOwner
 Source Code:https://code.google.com/p/contactowner/source/browse/

metadata/com.aripuca.tracker.txt

@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://code.google.com/p/aripuca-tracker
 Source Code:http://code.google.com/p/aripuca-tracker/source/checkout

metadata/com.artifex.mupdfdemo.txt

@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:AGPLv3+
 Web Site:http://mupdf.com/
 Source Code:http://git.ghostscript.com/?p=mupdf.git;a=summary