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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

metadata/at.univie.sensorium.o3gm.txt

@@ -0,0 +1,35 @@
+Category:Internet
+License:LGPLv3
+Web Site:
+Source Code:https://github.com/fmetzger/android-sensorium
+Issue Tracker:https://github.com/fmetzger/android-sensorium/issues
+
+Summary:Collect sensor data
+Description:
+Sensorium collects sensor values (such as 3G, GPS, battery charge) that you
+allow it to access. You can control the level of detail of the data collected
+from within the app. The app comes preconfigured so as to collect data for
+upstream's open 3G connectivity map, 
+[https://skylla.fc.univie.ac.at/~puehringer/o3gm_django Open3GMap].
+
+Sensors the app can use include:
+* Device Info 
+* Radio Cell Info Sensor 
+* Network Location
+* GPS Location
+* Battery (or power usage)
+* Wifi Scan result
+* Wifi Connection Details
+* Bluetooth Scan Result
+.
+
+Repo Type:git
+Repo:https://github.com/fmetzger/android-sensorium
+
+Build Version:1.1.3,6,df82f475bd55bedf91d,subdir=Sensorium
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1.3
+Current Version Code:6
+

metadata/cgeo.geocaching.txt

@@ -47,7 +47,7 @@ Build Version:2013.05.13-fdroid,20130513,market_20130513,target=Google Inc.:Goog
 Build Version:2013.05.16-fdroid,20130516,market_20130516,target=Google Inc.:Google APIs:16,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
 Build Version:2013.05.18-fdroid,20130518,!No such tag market_20130518,target=Google Inc.:Google APIs:16,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
 Build Version:2013.05.22-fdroid,20130522,market_20130522,target=Google Inc.:Google APIs:16,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
-Build Version:2013.05.31a-fdroid,20130532,market_20130532,target=Google Inc.:Google APIs:16,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
+Build Version:2013.05.31a-fdroid,20130532,market_20130532,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
 
 Auto Update Mode:Version +-fdroid market_%c
 Update Check Mode:Market

metadata/com.botbrew.basil.txt

@@ -16,11 +16,12 @@ Botbrew release "Basil" uses dpkg, unlike previous release Botbrew "Anise"
 It uses official Debian and Emdebian package repositories, though some bootstrap
 and support packages are downloaded from botbrew.com.
 
-Botbrew Basil is still in the experimental stages, has known issues and didn't
+Before deleting the Botbrew bootstrap directory, open the control/preferences 
-receive updated for some time. It is intended for advanced users with Unix
+window and tap 'exit' to make sure everything has been unmounted properly.
-experience and developers.
 
-Requires root:Yes
+Status: Experimental
+
+Requires root: Yes
 .
 
 Requires Root:Yes

metadata/com.ratebeer.android.txt

@@ -0,0 +1,22 @@
+Category:Internet
+License:GPLv3
+Web Site:http://www.ratebeer.com/
+Source Code:https://code.google.com/p/ratebeerforandroid/source
+Issue Tracker:https://code.google.com/p/ratebeerforandroid/issues/list
+
+Summary:RateBeer.com client
+Description:
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/ratebeerforandroid
+
+Build Version:1.5.5,49,!wip 66bce0845d68,subdir=RateBeerForAndroid,target=android-17,update=.;\
+../JakeWharton-Android-ViewPagerIndicator/library;../JakeWharton-ActionBarSherlock/library;\
+../httpclient-master;../google-play-services_lib
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.5.5
+Current Version Code:49
+

metadata/de.schildbach.wallet.txt

@@ -6,31 +6,26 @@ Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
 
 Summary:Wallet for the Bitcoin currency
 Description:
-Since v2.41 it is able to export private keys to local storage, encrypted
+* No cloud server or web service needed: this wallet works peer to peer
-with a password. It also uses bloom filtering, reducing drastically the
-amount of data that needs to be downloaded to set up the blockchain.
-With v3 a new wallet format is used using a lot less storage but if you
-are upgrading, the blockchain will need reseting. When run for the first
-time, it can happen that the app shows only a white display for some seconds.
-
-* No cloud server or web service needed. This wallet works peer to peer
 * Display of wallet balance in Bitcoin and various other currencies
 * Sending and receiving of Bitcoin via NFC, QR-codes or Bitcoin URLs
 * Address book for regularly used Bitcoin addresses
 * Enter transactions while offline, will be executed when online
 * Manages blockchain on your device
 * System notifications for Bitcoin connectivity and received coins
-* App widget for Bitcoin balance (requirement: app moved from sdcard to phone)
+* App widget for Bitcoin balance 
+* Export private keys to local storage encrypted with a password
+
+A few tens of MiB must be downloaded to set up the blockchain and a couple
+more per month subsequently to keep it updated.
+When run for the first time, it can happen that the app shows only a white 
+display for some seconds.
 
 See the
-[http://bitcoin-wallet.googlecode.com/git/wallet/README Readme] for details.
+[http://bitcoin-wallet.googlecode.com/git/wallet/README Readme] for more 
-Use this at your own risk, and be aware that if you lose access to the data
+details. Use this at your own risk and be wary that if you don't make a
-of this application, you will lose any Bitcoins contained in it. To back up
+backup of the private keys you will no longer be able to acces the Bitcoins 
-the wallet, either;
+contained in the wallet, should the data of the app be lost.
-
-# (From inside the app), export the keys to the sdcard (v2.41+ only). After restoring, the app may download some tens of MiB of data to regenerate the blockchain
-# Use ADB backup from the Android SDK if you have Android 4+ on the phone (root not required, but check that it works properly: since v2 is installed to sdcard by default, the shared storage needs backing up too), or
-# Manually back up the files in /data/data/de.schildbach.wallet/files/: #tar cf /sdcard/wallet.tar /data/data/de.schildbach.wallet/files and you may have to change the ownership of the files that you restore (root required)
 
 There's a separate version of this application that uses a test version of the
 Bitcoin network: [[de.schildbach.wallet_test]].

metadata/de.wikilab.android.friendica01.txt

@@ -23,6 +23,9 @@ Repo:https://github.com/max-weller/friendica-for-android.git
 Build Version:8.0,8,1e7901e380,subdir=mw-android-friendica-01,\
 update=.;../libpulltorefresh,prebuild=rm -rf ../EXPORT && \
 sed -i 's@\(android.library.reference.1=\).*@\1../libpulltorefresh@' project.properties
+Build Version:9.0,9,55d1230abd,subdir=mw-android-friendica-01,\
+update=.;../libpulltorefresh,prebuild=rm -rf ../EXPORT ../.idea ../.DS_Store && \
+sed -i 's@1=.*@1=../libpulltorefresh@' project.properties
 
 Auto Update Mode:None
 #Not in market

metadata/info.guardianproject.browser.txt

@@ -22,6 +22,7 @@ prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@'
 
 Auto Update Mode:None
 Update Check Mode:Tags
+# Beta as of 1st June 2013
 Current Version:0.5.0
 Current Version Code:20
 

metadata/org.adaway.txt

@@ -10,7 +10,7 @@ Summary:Block advertisements
 Description:
 An ad blocker that uses the hosts file. The hosts file
 contains a list of mappings between hostnames and IP addresses. When
-an app requests an ad, that request is directed to localhost which does
+an app requests an ad, that request is directed to 127.0.0.1 which does
 nothing. There are options to run a web server
 to respond to blocked hostnames and to direct requests to the IP
 address of your choosing. You can download hosts files from the

metadata/org.blockinger.game.txt

@@ -25,3 +25,7 @@ Update Check Mode:Tags
 Current Version:1.7
 Current Version Code:11
 
+# Completely free branch disappeared, there are no -nomusic tags for 1.6 and
+# later yet
+No Source Since:1.6
+

metadata/org.bombusmod.txt

@@ -18,6 +18,10 @@ extlibs=antenna/antenna-bin-1.2.1-beta.jar,subdir=android,prebuild=\
 mv libs/antenna*.jar . && ant antenna-preprocess && \
 sed -i 's/${bombus.raw-revision}/-/g' AndroidManifest.xml
 
+# Use this setup next time
+#Build Version:0.8.1312,1312,1312,\
+#extlibs=antenna/antenna-bin-1.2.1-beta.jar,subdir=android,prebuild=\
+#mv libs/antenna*.jar .,antcommand=release-nonb
 Auto Update Mode:None
 # See market for revision
 Update Check Mode:RepoManifest

metadata/org.fdroid.k9.txt

@@ -6,6 +6,11 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
 Summary:Beta version of K-9
 Description:
+4.3xx and 4.5xx are betas for 4.400 and 4.600 respectively. 
+There isn't a huge difference between the two, so better to stick with 4.5xx 
+if you already have it installed even though the stable release 
+will be further away.
+
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
 Packed with features and highly configurable.
 Import of settings from [[com.fsck.k9]] is possible so that all

metadata/org.totschnig.myexpenses.txt

@@ -34,6 +34,7 @@ Build Version:1.6.5,35,e3d51bb02f,prebuild=rm -rf tests
 Build Version:1.6.6,36,f937fd21cc,prebuild=rm -rf tests
 Build Version:1.6.8,38,r38,prebuild=rm -rf tests
 Build Version:1.7.1,40,r40,extlibs=android/android-support-v4.jar,prebuild=rm -rf tests
+Build Version:1.7.3.1,43,r43,extlibs=android/android-support-v4.jar,prebuild=rm -rf tests
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/se.erikofsweden.findmyphone.txt

@@ -8,7 +8,7 @@ Summary:Helps you find a mislaid phone
 Description:
 If you lose your phone having this app installed can help you find it. Upon receipt of an SMS or
 email, FindMyPhone gets your location and communicates the location back to the owner. Note
-that GPS my need be enabled and the phone within view of the sky for an accurate location to
+that GPS may need be enabled and the phone within view of the sky for an accurate location to
 be obtained. The app will fall back to using Google's network location API, but we recommend
 you disable that nonfree software anyway. Currently supports activating by sending a secret
 message via SMS or an email to [[com.fsck.k9]]. The resulting location is sent via SMS.

metadata/template-minimal

@@ -0,0 +1,26 @@
+AntiFeatures:
+Category:
+License:
+Web Site:
+Source Code:
+Issue Tracker:
+Donate:
+FlattrID:
+Bitcoin:
+
+Summary:
+Description:
+.
+
+Requires Root:
+
+Repo Type:
+Repo:
+
+Build Version:
+
+Auto Update Mode:
+Update Check Mode:
+Current Version:
+Current Version Code:
+