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

Conflicts:
	metadata/net.osmand.txt

metadata/com.funambol.androidsync.txt

@@ -25,6 +25,6 @@ Update Check Mode:Market
 #Source is now accessible, but the build is failing without an obvious error.
 #Need to look at this again.
 #Build Version:10.0.7,17,2671,subdir=tags/10.0.7,update=no,initfun=yes
-Current Version:11.0.11
+Current Version:11.0.14
-Current Version Code:31
+Current Version Code:34
 

metadata/com.jotabout.screeninfo.txt

@@ -3,13 +3,17 @@ License:MIT
 Web Site:http://digitaldumptruck.jotabout.com
 Source Code:https://github.com/mportuesisf/ScreenInfo
 Issue Tracker:https://github.com/mportuesisf/ScreenInfo/issues
-Donate:
 
 Summary:Display your screen configuration parameters
 Description:
-Shows the screen configuration for an Android device, including the screen size (small, normal, large, xlarge) and the density classification (ldpi, mpdi, hdpi, xhdpi). Also shows other screen metrics, as well as the calculated screen size in physical units. Users can email the report or share it to other apps such as Dropbox, etc.
+Shows the screen configuration for an Android device, including the screen
+size (small, normal, large, xlarge) and the density classification (ldpi,
+mpdi, hdpi, xhdpi). Also shows other screen metrics, as well as the
+calculated screen size in physical units. Users can email the report or
+share it to other apps such as Dropbox, etc.
 
-This information is useful for developers producing layouts for their Android applications, or to assist developers in customer support scenarios.
+This information is useful for developers producing layouts for their
+Android applications, or to assist developers in customer support scenarios.
 .
 
 Repo Type:git
@@ -18,3 +22,6 @@ Repo:git://github.com/mportuesisf/ScreenInfo.git
 Build Version:1.0.3,103,88919ec2ce,target=android-15
 
 Update Check Mode:Market
+Current Version:1.0.3
+Current Version Code:103
+

metadata/com.psrivastava.deviceframegenerator.txt

@@ -7,7 +7,12 @@ Donate:https://www.paypal.com/cgi-bin/webscr?cmd%3D_donations%26business%3D2BNJ6
 
 Summary:Realistic borders for screenshots
 Description:
-The device frame generator allows you to quickly wrap your app screenshots in real device artwork, providing better context for your screenshots. This android version allows you to generate screenshots through sharing in Android, as well as perform batch operations. Now with a new UI and compatible with all version of Android newer than Froyo (2.2). This is a beta product and reports to the issue tracker are welcome
+The device frame generator allows you to quickly wrap your app screenshots in
+real device artwork, providing better context for your screenshots. This
+android version allows you to generate screenshots through sharing in Android,
+as well as perform batch operations. Now with a new UI and compatible with all
+versions of Android newer than Froyo (2.2). This is a beta product and reports
+to the issue tracker are welcome
 .
 
 Repo Type:git

metadata/com.zoffcc.applications.aagtl.txt

@@ -6,7 +6,9 @@ Issue Tracker:
 
 Summary:Geocaching aid
 Description:
-Loosely based on AGTL, a geocaching app for Maemo/Meego. This uses info from geocaching.com so you will need an account there. Works completely offline (if you download the cache details beforehand) and uses OpenStreetMap maps.
+Loosely based on AGTL, a geocaching app for Maemo/Meego. This uses info from
+geocaching.com so you will need an account there. Works completely offline (if
+you download the cache details beforehand) and uses OpenStreetMap maps.
 .
 
 Repo Type:git-svn

metadata/cz.hejl.chesswalk.txt

@@ -13,8 +13,9 @@ Repo Type:git
 Repo:https://git.gitorious.org/chesswalk/chesswalk.git
 
 Build Version:1.5,7,4007173d,buildjni=yes
+Build Version:1.5.1,8,85bf592e,buildjni=yes
 
-Update Check Mode:None
+Update Check Mode:RepoManifest
-Current Version:1.5
+Current Version:1.5.1
-Current Version Code:7
+Current Version Code:8
 

metadata/de.danoeh.antennapod.txt

@@ -15,8 +15,8 @@ Repo Type:git
 Repo:https://github.com/danieloeh/AntennaPod.git
 
 Update Check Mode:Market
-Current Version:0.9.4.1
+Current Version:0.9.4.2
-Current Version Code:11
+Current Version Code:12
 
 #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/eu.vranckaert.worktime.txt

@@ -20,6 +20,6 @@ Build Version:1.1.3.a - UNSTABLE,107,273,target=android-11,patch=style.patch
 Build Version:1.1.4,165,541,target=android-11,patch=style.patch
 
 Update Check Mode:Market
-Current Version:1.1.7
+Current Version:1.1.8
-Current Version Code:192
+Current Version Code:199
 

metadata/faenza.adw.theme.txt

@@ -12,3 +12,6 @@ Repo Type:git-svn
 Repo:http://faenza-adw-theme.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,1
+
+Update Check Mode:Market
+

metadata/jp.sblo.pandora.jota.txt

@@ -19,5 +19,6 @@ Build Version:0.2.07,57,86,buildjni=yes,target=android-11
 Build Version:0.2.13,63,113,buildjni=yes,target=android-11
 
 Update Check Mode:Market
-Current Version:0.2.26
+Current Version:0.2.27
-Current Version Code:76
+Current Version Code:77
+

metadata/net.kervala.comicsreader.txt

@@ -22,7 +22,8 @@ Available in English and French languages (any translators are welcome to contri
 Repo Type:hg
 Repo:https://code.google.com/p/android-comicsreader/
 
-Build Version:1.0,2,7ecb0e,buildjni=yes
+#NDK build fails
+#Build Version:1.0,2,7ecb0e,buildjni=yes
 
 Update Check Mode:Market
 Current Version:1.0.554

metadata/net.osmand.plus.txt

@@ -5,7 +5,7 @@ Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=victor.shcherb%40gmail.com&lc=US&item_name=Osmand%20Donation
 
-Name:OsmAnd+
+Name:OsmAnd~
 Summary:OpenStreetMap navigation & routing
 Description:
 Osmand is a navigation application with access to a wide source of popular open street map data. All map data including vector and raster maps can be stored on the phone memory card for offline usage. Map data packages for many territories are available from Osmand website as well as a desktop application for creating your own.

metadata/net.osmand.txt

@@ -1,26 +0,0 @@
-Category:Navigation
-License:GPLv3
-Web Site:http://osmand.net
-Source Code:https://github.com/osmandapp/Osmand
-Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=victor.shcherb%40gmail.com&lc=US&item_name=Osmand%20Donation
-
-Summary:OpenStreetMap navigation & routing
-Description:
-Osmand is a navigation application with access to a wide source of popular open street map data. All map data including vector and raster maps can be stored on the phone memory card for offline usage. Map data packages for many territories are available from Osmand website as well as a desktop application for creating your own.
-
-Limitations of Osmand compared to Osmand+:
-- number of map downloads
-- no access to Wikipedia offline POIs
-.
-
-Repo Type:git
-Repo:https://github.com/osmandapp/Osmand.git
-
-Build Version:0.5.2,25,efc0e83a,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw
-Build Version:0.5.3,26,8e9d76ea685ea75d6c08,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw
-
-Update Check Mode:Market
-Current Version:0.8.1
-Current Version Code:65
-

metadata/org.dsandler.apps.markers.txt

@@ -6,9 +6,11 @@ Issue Tracker:http://code.google.com/p/markers-for-android/issues/list
 
 Summary:Finger drawing
 Description:
-Uses the multitouch and pressure sensitivity of capactive screens but there are differences in screen technology, so please see the website if you experience problems.
+Uses the multitouch and pressure sensitivity of capactive screens but there
+are differences in screen technology, so please see the website if you
+experience problems.
 
-A tutorial  on the website shows how to simulate layers
+A tutorial on the website shows how to simulate layers
 .
 
 Repo Type:git
@@ -16,7 +18,7 @@ Repo:https://code.google.com/p/markers-for-android/
 
 Build Version:1.0.3,36,eeabdb
 
-Update Check Mode:RepoManifest
+Update Check Mode:Market
 Current Version:1.0.4-beta
 Current Version Code:37
 

metadata/org.gnucash.android.txt

@@ -6,7 +6,10 @@ Issue Tracker:
 
 Summary:Money management
 Description:
-A companion application for the desktop app Gnucash, designed for Android. It allows you to record transactions on-the-go and export them in the OFX format and later import the data into Gnucash for the desktop. You can create multiple accounts for transactions in Gnucash.
+A companion application for the desktop app Gnucash. It allows you to record
+transactions on-the-go and export them in the OFX format and later import the
+data into Gnucash for the desktop. You can create multiple accounts for
+transactions in Gnucash.
 .
 
 Repo Type:git

metadata/org.kde.ministro.config.txt

@@ -13,7 +13,8 @@ Repo Type:git
 Repo:git://anongit.kde.org/ministro.git
 
 #just demands the newest ministro and tries to get it from market
-Build Version:1.0,1,b7f34e,subdir=MinistroConfigurationTool,target=android-10
+#Builds wrong package ID
+#Build Version:1.0,1,b7f34e,subdir=MinistroConfigurationTool,target=android-10
 
 Update Check Mode:Tags
 Current Version:1.0

metadata/org.kde.necessitas.ministro.txt

@@ -6,13 +6,18 @@ Issue Tracker:
 
 Summary:
 Description:
-You do not need to install this unless another app requests it. That app may direct you towards Google Play, but you can install this instead.
+You do not need to install this unless another app requests it. That app may
+direct you towards Google Play, but you can install this instead.
 
-Ministro is a system wide Qt shared libraries installer/provider service. It acts as a bridge between your apps and Qt libraries.
+Ministro is a system wide Qt shared libraries installer/provider service. It
+acts as a bridge between your apps and Qt libraries.
 
-The connection API protocol used by applications to connect and query the service is released under BSD license, it mean that any application (no matter if that application is free or not) can connect and query its services.
+The connection API protocol used by applications to connect and query the
+service is released under BSD license, it mean that any application (no
+matter if that application is free or not) can connect and query its services.
 
-Also, be aware, this service will install/provide the free versions of Qt libraries, licensed under LGPL v2.1/ GPL v3.
+Also, be aware, this service will install/provide the free versions of Qt
+libraries, licensed under LGPL v2.1/ GPL v3.
 .
 
 Repo Type:git

metadata/org.mariotaku.twidere.txt

@@ -22,5 +22,5 @@ Build Version:0.1.6,35,b87d64e197,target=Google Inc.:Google APIs:16
 
 Update Check Mode:Market
 Current Version:0.1.6
-Current Version Code:35
+Current Version Code:36
 

metadata/org.passwordmaker.android.txt

@@ -8,7 +8,9 @@ Summary:Password maker
 Description:
 N.B. Not related to Password Maker
 
-PasswordMaker Pro creates unique, secure passwords that are very easy for you to retrieve but no one else. Nothing is stored anywhere, anytime, so there's nothing to be hacked, lost, or stolen. See http://passwordmaker.org for details.
+PasswordMaker Pro creates unique, secure passwords that are very easy for you
+to retrieve but no one else. Nothing is stored anywhere, anytime, so there's
+nothing to be hacked, lost, or stolen. See http://passwordmaker.org for details.
 .
 
 Repo Type:git

stats/known_apks.txt

@@ -30,6 +30,7 @@ CSipSimple-0.02-03.apk com.csipsimple
 CSipSimple-0.03-00.apk com.csipsimple 2011-11-14
 CSipSimple-0.03-01.apk com.csipsimple 2011-11-17
 CSipSimple-0.04-00.apk com.csipsimple 2012-08-24
+CSipSimple-0.04-01.apk com.csipsimple 2012-08-29
 CSipSimple_0.00-15-06.apk com.csipsimple 2010-10-27
 CSipSimple_0.00-16.apk com.csipsimple
 ConnectBot_1.7.1.apk org.connectbot 2010-10-21
@@ -410,7 +411,7 @@ com.totsp.bookworm_19.apk com.totsp.bookworm 2011-05-04
 com.totsp.crossword.shortyz_30100.apk com.totsp.crossword.shortyz 2012-01-08
 com.tum.yahtzee_1.apk com.tum.yahtzee 2012-08-23
 com.unitedcoders.android.gpodroid_12.apk com.unitedcoders.android.gpodroid 2012-01-08
-com.updater.ota_6.apk com.updater.ota 2012-08-26
+com.updater.ota_6.apk com.updater.ota 2012-08-29
 com.uploadedlobster.PwdHash_9.apk com.uploadedlobster.PwdHash 2012-07-21
 com.voidcode.diasporawebclient_10.apk com.voidcode.diasporawebclient 2012-04-08
 com.voidcode.diasporawebclient_3.apk com.voidcode.diasporawebclient 2011-12-08
@@ -431,6 +432,7 @@ com.zegoggles.smssync_1405.apk com.zegoggles.smssync
 cri.sanity_21100.apk cri.sanity 2012-03-01
 cx.hell.android.pdfview_32000.apk cx.hell.android.pdfview 2012-03-02
 cz.hejl.chesswalk_7.apk cz.hejl.chesswalk 2012-01-12
+cz.hejl.chesswalk_8.apk cz.hejl.chesswalk 2012-08-29
 cz.romario.opensudoku_1104.apk cz.romario.opensudoku 2012-01-12
 cz.romario.opensudoku_1105.apk cz.romario.opensudoku 2012-01-12
 de.antonwolf.agendawidget_22.apk de.antonwolf.agendawidget 2012-08-23
@@ -494,6 +496,7 @@ fennec-10.0.multi.android-arm.apk org.mozilla.firefox 2012-02-01
 fennec-14.0.1.multi.android-arm.apk org.mozilla.firefox 2012-07-28
 fennec-14.0.multi.android-arm.apk org.mozilla.firefox 2012-06-27
 fennec-14.0b1.multi.android-arm.apk org.mozilla.firefox_beta 2012-05-16
+fennec-15.0.multi.android-arm.apk org.mozilla.firefox 2012-08-29
 fennec-15.0b2.multi.android-arm.apk org.mozilla.firefox_beta 2012-07-28
 fennec-5.0.multi.eabi-arm.apk org.mozilla.firefox
 fennec-6.0.multi.eabi-arm.apk org.mozilla.firefox
@@ -622,6 +625,7 @@ net.osmand.plus_36.apk net.osmand.plus 2011-07-12
 net.osmand.plus_37.apk net.osmand.plus 2011-09-26
 net.osmand.plus_39.apk net.osmand.plus 2011-10-07
 net.osmand.plus_42.apk net.osmand.plus 2011-12-08
+net.osmand.plus_65.apk net.osmand.plus 2012-08-29
 net.osmand_25.apk net.osmand 2011-02-11
 net.osmand_26.apk net.osmand 2011-06-24
 net.pierrox.mcompass_10.apk net.pierrox.mcompass 2012-01-21
@@ -775,6 +779,8 @@ org.fdroid.fdroid_16.apk org.fdroid.fdroid 2012-01-12
 org.fdroid.fdroid_17.apk org.fdroid.fdroid 2012-08-26
 org.fdroid.fdroid_18.apk org.fdroid.fdroid 2012-08-26
 org.fdroid.fdroid_19.apk org.fdroid.fdroid 2012-08-26
+org.fdroid.fdroid_20.apk org.fdroid.fdroid 2012-08-28
+org.fdroid.fdroid_21.apk org.fdroid.fdroid 2012-08-29
 org.fdroid.fdroid_8.apk org.fdroid.fdroid 2011-01-17
 org.fdroid.fdroid_9.apk org.fdroid.fdroid 2011-01-30
 org.fdroid.taskstrid_170.apk org.fdroid.taskstrid 2011-01-15

stats/latestapps.txt

@@ -1,5 +1,4 @@
 com.kpz.pomodorotasks.activity
-com.updater.ota
 com.nauj27.android.colorpicker
 com.java.SmokeReducer
 org.andstatus.app
@@ -8,3 +7,4 @@ cc.co.eurdev.urecorder
 org.zakky.memopad
 com.drismo
 net.bible.android.activity
+ru.gelin.android.sendtosd

stats/licenses.txt

@@ -4,7 +4,7 @@ BSD New 1
 GPLv3+ 25
 Unknown 2
 GPLv2 54
-GPLv3 156
+GPLv3 155
 Apache2 85
 EPL 1
 AGPL 3

stats/repotypes.txt

@@ -1,7 +1,7 @@
 svn 54
 srclib 4
 none 31
-git 206
+git 205
 bzr 9
 git-svn 65
 hg 40