Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

Conflicts:
	metadata/org.tomdroid.txt

metadata/a2dp.Vol.txt

@@ -17,3 +17,6 @@ Repo:http://code.google.com/p/a2dpvolume/
 Build Version:2.8.11,93,8eac7d
 
 Update Check Mode:Market
+Current Version:2.8.11
+Current Version Code:93
+

metadata/com.aokp.backup.txt

@@ -18,6 +18,6 @@ Repo:https://github.com/romanbb/AOKP_Backup.git
 Build Version:1.51,22,531698
 
 Update Check Mode:RepoManifest
-Current Version:1.51
+Current Version:1.54
-Current Version Code:22
+Current Version Code:25
 

metadata/com.axelby.podax.txt

@@ -29,8 +29,7 @@ Build Version:3.3,16,606af2015873,target=android-14
 Build Version:3.5,18,62c2b93562b6,target=android-14
 Build Version:4.02,21,!e5da76325a5a build failure - submodules refer to deleted github repositories
 Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://github.com/thasmin/ViewPagerIndicator.git' into submodule path 'ViewPagerIndicator' failed
-#doesn't build but maybe you can get it to
+Build Version:4.5,28,acb8477a,submodules=yes,update=.;ViewPagerIndicator/library;ActionBarSherlock/library
-#Build Version:4.3,25,c44247910375d9660ebcdfda91c1c7b25586579b
 
 Update Check Mode:RepoManifest
 Current Version:4.5

metadata/com.bvalosek.cpuspy.txt

@@ -13,7 +13,8 @@ Repo Type:git
 Repo:https://github.com/bvalosek/cpuspy.git
 
 Build Version:0.4.0,9,908f9
-#now using maven
 
-Update Check Mode:RepoManifest
+Update Check Mode:Market
+Current Version:0.4.0
+Current Version Code:9
 

metadata/com.byagowi.persiancalendar.txt

@@ -15,6 +15,6 @@ Repo:https://github.com/ebraminio/DroidPersianCalendar.git
 Build Version:1.98,18,85329
 
 Update Check Mode:RepoManifest
-Current Version:1.98
+Current Version:1.99
-Current Version Code:18
+Current Version Code:19
 

metadata/com.episode6.android.appalarm.pro.txt

@@ -16,6 +16,6 @@ Repo:https://github.com/ghackett/AppAlarm.git
 Build Version:1.2.6,30,af9d89993212c67bfc510ed082381afc7abcd95a,target=android-10
 
 Update Check Mode:Market
-Current Version:1.2.6
+Current Version:1.2.7
-Current Version Code:30
+Current Version Code:31
 

metadata/com.nightshadelabs.anotherbrowser.txt

@@ -15,4 +15,6 @@ Repo:https://github.com/GodsMoon/Flashify.git
 Build Version:1.1,2,ee2ee
 
 Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:2
 

metadata/com.owncloud.android.txt

@@ -17,6 +17,6 @@ Repo:git://gitorious.org/owncloud/android-devel.git
 Build Version:1.3.1,103001,239be8fb4f,submodules=yes,prebuild=android update project -p actionbarsherlock/library
 
 Update Check Mode:RepoManifest
-Current Version:1.3.6
+Current Version:1.3.7
-Current Version Code:103006
+Current Version Code:103007
 

metadata/com.sam.hex.txt

@@ -15,3 +15,6 @@ Repo:https://github.com/Xlythe/HexGame_Android.git
 Build Version:2.2,13,900717,target=android-15
 
 Update Check Mode:RepoManifest
+Current Version:2.3
+Current Version Code:14
+

metadata/com.sinpo.xnfc.txt

@@ -19,4 +19,6 @@ Repo:http://nfcard.googlecode.com/svn/trunk/
 Build Version:1.2.120228,1,12,subdir=nfcard,target=android-15
 
 Update Check Mode:Market
+Current Version:1.2.120228
+Current Version Code:1
 

metadata/de.danoeh.antennapod.txt

@@ -1,3 +1,4 @@
+Category:None
 License:MIT
 Web Site:https://github.com/danieloeh/AntennaPod
 Source Code:https://github.com/danieloeh/AntennaPod
@@ -13,5 +14,9 @@ AntennaPod is still in beta and might lack some advanced features or have bugs.
 Repo Type:git
 Repo:https://github.com/danieloeh/AntennaPod.git
 
+Update Check Mode:Market
+Current Version:0.9.4.1
+Current Version Code:11
+
 #needs android-viewpageindicator
 #Build Version:0.9.2,7,d8d055cf24f09084b326510c1276fb04ab977fc5,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties

metadata/li.klass.fhem.txt

@@ -20,6 +20,6 @@ Build Version:1.5.8,58,19ebe524d48630db88c28d44872e5cbc84c885d6,init=rm ant.prop
 Build Version:1.7.0,70,!0de6e6f but now has proprietary software
 
 Update Check Mode:Market
-Current Version:1.8.2
+Current Version:1.8.5
-Current Version Code:82
+Current Version Code:85
 

metadata/me.shkschneider.dropbearserver.txt

@@ -1,41 +0,0 @@
-Disabled:Can't build properly (yet?) - see comment
-#there are dropbear binaries in the repo from an external source but they can be built
-#from https://github.com/shkschneider/android_external_dropbear . 
-Category:System
-License:GPLv2+
-Web Site:http://shkschneider.me
-Source Code:https://github.com/shkschneider/android_DropBearServer
-Issue Tracker:https://github.com/shkschneider/android_DropBearServer/issues
-
-Summary:An SSH server, based on dropbear
-Description:
-It allows you to easily install, configure and run a Secured SHell on your Android phone.
-SSH is a secured (encrypted) protocol that is used on millions of GNU/Linux servers to issue commands remotely.
-
-If you don’t know what ‘root’ or ‘ssh’ means, you should not install this!
-
-* You will be able to gain shell access, just like ‘adb shell’
-* You will be able to put and pull files via ‘scp’ or similar
-
-This rich front-end to DropBear allows you to easily configure tons of things:
-
-* Allows root access (optional)
-* Allows non-root access (sdcard read/write)
-* Install DropBear
-* Start/Stop the server
-* Manage credentials (publickeys or master password)
-* Loads public keys from SDCard
-* and much more!
-.
-
-Requires Root:Yes
-
-Repo Type:git
-Repo:https://github.com/shkschneider/android_DropBearServer.git
-
-Build Version:1.7.0,170,b943a751dc
-
-Update Check Mode:Market
-Current Version:1.9.4
-Current Version Code:194
-

metadata/net.bible.android.activity.txt

@@ -1,3 +1,4 @@
+Category:Reading
 License:LGPL
 Web Site:http://code.google.com/p/and-bible/
 Source Code:https://github.com/mjdenham/and-bible
@@ -21,3 +22,8 @@ Repo Type:git
 Repo:https://github.com/mjdenham/and-bible.git
 
 Build Version:1.5.5,79,7d7e23e88da2ea9ce598fc6c454e52b508d70c48,subdir=AndBible,target=android-8
+
+Update Check Mode:Market
+Current Version:1.6.0
+Current Version Code:83
+

metadata/net.cactii.mathdoku.txt

@@ -15,6 +15,6 @@ Repo:http://mathdoku.googlecode.com/svn/trunk/
 Build Version:1.8,70,70
 
 Update Check Mode:Market
-Current Version:1.95c
+Current Version:1.95d
-Current Version Code:76
+Current Version Code:77
 

metadata/orbitlivewallpaperfree.puzzleduck.com.txt

@@ -15,6 +15,6 @@ Repo:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper.git
 Build Version:1.0,1,3cdb9d,subdir=Orbital-Live-Wallpaper
 
 Update Check Mode:RepoManifest
-Current Version:1.0
+Current Version:1.2
-Current Version Code:1
+Current Version Code:3
 

metadata/org.andstatus.app.txt

@@ -18,6 +18,6 @@ Repo:git://github.com/andstatus/andstatus.git
 Build Version:1.9.1,61,92a6933279,extlibs=android/android-support-v4.jar,target=android-15
 
 Update Check Mode:RepoManifest
-Current Version:1.9.1
+Current Version:1.10.0
-Current Version Code:61
+Current Version Code:62
 

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:42
+Current Version Code:43
 

metadata/org.epstudios.morbidmeter.txt

@@ -15,4 +15,6 @@ Repo:https://github.com/mannd/morbidmeter-android.git
 Build Version:1.2.1,4,48f92
 
 Update Check Mode:RepoManifest
+Current Version:1.2.1
+Current Version Code:4
 

metadata/org.mozilla.firefox_beta.txt

@@ -20,5 +20,5 @@ Warning: the issue tracker link is not mobile-friendly.
 #They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/
 Update Check Mode:Market
 Current Version:15.0
-Current Version Code:2012081423
+Current Version Code:2012082117
 

metadata/org.projectvoodoo.audiomeasurementsplayer.txt

@@ -2,6 +2,7 @@ Category:Multimedia
 License:GPL
 Web Site:https://github.com/project-voodoo/audio-measurements-player-app
 Source Code:https://github.com/project-voodoo/audio-measurements-player-app
+Issue Tracker:
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=curio%40free%2efr&item_name=Donate%20to%20Supercurio
 
 Summary:Tool for making audio measurements
@@ -19,4 +20,6 @@ Repo:https://github.com/project-voodoo/audio-measurements-player-app.git
 Build Version:1.1.4,8,6fcff
 
 Update Check Mode:RepoManifest
+Current Version:1.1.4
+Current Version Code:8
 

metadata/org.scoutant.blokish.txt

@@ -20,6 +20,6 @@ Build Version:1.7,10,!requires proprietary "heyzap" library
 Build Version:1.8,11,a297e22247bb1ef7ecd4e764124703488354626d,target=android-10
 
 Update Check Mode:Market
-Current Version:1.8
+Current Version:1.9
-Current Version Code:11
+Current Version Code:12
 

metadata/org.tomdroid.txt

@@ -16,10 +16,10 @@ Repo:lp:tomdroid
 
 Build Version:0.4.1,6,214
 Build Version:0.5.0,7,248
-#safe to use?
-#Build Version:0.7.1,10,400
 
+#No such revision
+#Build Version:0.7.0,9,362.1.1
 Update Check Mode:Market
-Current Version:0.4.1
+Current Version:0.5.0
-Current Version Code:6
+Current Version Code:7
 

metadata/ru.orangesoftware.financisto.txt

@@ -21,8 +21,8 @@ Repo Type:bzr
 Repo:lp:financisto
 
 Update Check Mode:Market
-Current Version:1.6.0
+Current Version:1.6.1
-Current Version Code:77
+Current Version Code:78
 
 # Build fails, wrong path to GreenDroid library
 #Build Version:1.5.4,57,303,target=android-4

metadata/uk.co.jarofgreen.JustADamnCompass.txt

@@ -15,4 +15,6 @@ Repo:https://github.com/jarofgreen/Just-A-Damn-Compass.git
 Build Version:1.1,2,32e3d60ecadac260f71da17a6cb4b22084c5bcc2,target=android-8
 
 Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:2