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

metadata/net.osmand.plus.txt

@@ -23,6 +23,9 @@ Osmand~ is the generic name for builds of Osmand not done by the developers,
 though 
 f-droid.org of course tries to be as faithful as possible to the releases. 
 x86 and MIPS modules are included in the apk.
+
+Status: We don't have the latest version of this app because it is difficult
+to build. Nightly builds by the developer are available via the Donate page.
 .
 
 #Don't use master branch

metadata/org.github.OxygenGuide.txt

@@ -6,9 +6,9 @@ Issue Tracker:https://github.com/nicolas-raoul/OxygenGuide-Android/issues
 
 Summary:Wikivoyage Offline travel guide
 Description:
-World travel guide stored on SD card.
+A world travel guide stored on the SD card.
-Articles are downloaded from Wikivoyage, the travel wiki.
+Articles are downloaded from Wikivoyage.org, the travel wiki.
-Whole world takes less than 1GB.
+The whole world takes less than 1GB.
 .
 
 Repo Type:git
@@ -17,5 +17,7 @@ Repo:https://github.com/nicolas-raoul/OxygenGuide-Android.git
 Build Version:1.3,4,0c9cea72a9
 
 Auto Update Mode:None
-Update Check Mode:Market
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:4
 

metadata/org.hermit.tricorder.txt

@@ -9,13 +9,17 @@ Description:
 Turns your Android device into a functional Tricorder in the style 
 of Star Trek. 
 
-Status: Probably final version.
+Status: Probably the final version, excepting forks.
 .
 
 Repo Type:hg
 Repo:https://bitbucket.org/dalb8/tricorder
 
-Build Version:5.12,41,!crashes 0be272b1cd,prebuild=rm -rf src/*
+Build Version:5.12,41,0,subdir=Tricorder,update=.;../HermitAndroid,prebuild=\
+rm -rf ../HermitAndroid/src/org/hermit/android/utils && \
+cp -r  ../HermitLibrary/src/org/hermit/* ../HermitAndroid/src/org/hermit/android/ && \
+cp -r  ../HermitLibrary/src/net ../HermitAndroid/src/ && \
+cp -r  ../HermitLibrary/src/ca ../HermitAndroid/src/ 
 
 Update Check Mode:None
 Current Version:5.12

metadata/org.servalproject.txt

@@ -1,5 +1,5 @@
 Category:Phone & SMS
-License:GPLv2/GPLv3
+License:GPLv3
 Web Site:http://www.servalproject.org
 Source Code:https://github.com/servalproject/batphone
 Issue Tracker:https://github.com/servalproject/batphone/issues
@@ -37,8 +37,8 @@ The Java/XML part is distributable under the GNU GPLv3 while the serval-dna proj
 Repo Type:git
 Repo:https://github.com/servalproject/batphone.git
 
-#Releases are in master branch, beta in development; version codes are mysterious
+#Releases are in master branch, beta in development; run ant version to get version info
-Build Version:0.90-beta,1877,!needs checking 0.90-beta,buildjni=yes,submodules=yes,prebuild=\
+Build Version:0.90-beta,1877,!need to build ELFs 0.90-beta,buildjni=yes,submodules=yes,prebuild=\
 sed -i 's/android:versionName="\@string\/version"/android:versionName="0.90-beta"/g' AndroidManifest.xml
 
 Auto Update Mode:None

metadata/org.totschnig.myexpenses.txt

@@ -8,8 +8,10 @@ FlattrID:1028216
 
 Summary:Manage finances
 Description:
-MyExpenses is designed to keep track of expenses, and to export these expenses as QIF files 
+MyExpenses is designed to keep track of expenses, and to export these expenses 
-into a finance program (e.g.: Grisbi, GnuCash). There are tutorials on the website.
+as QIF files 
+into a finance program (e.g.: Grisbi, GnuCash). There are tutorials on the 
+website.
 
 Features:
 * multiple accounts with transfers.
@@ -24,9 +26,9 @@ Repo:https://github.com/mtotschnig/MyExpenses.git
 Build Version:1.5.1,33,db50b87307,prebuild=rm -rf tests
 Build Version:1.6.0,34,5fa677d646,prebuild=rm -rf tests
 Build Version:1.6.5,35,e3d51bb02f,prebuild=rm -rf tests
+Build Version:1.6.6,36,f937fd21cc,prebuild=rm -rf tests
 
 Auto Update Mode:None
-#Betas included in tags
 Update Check Mode:Tags
 Current Version:1.6.0
 Current Version Code:34

metadata/org.wheelmap.android.online.txt

@@ -6,23 +6,35 @@ Issue Tracker:https://github.com/sozialhelden/wheelmap-android/issues
 
 Summary:Find wheelchair accessible places
 Description:
-Which underground stations are equipped with a lift? Are there accessible restaurants, cafes or clubs around 
+Which underground stations are equipped with a lift? Are there accessible 
-you? Which museums or libraries are accessible for people with limited mobility and which are not? With 
+restaurants, cafes or clubs around 
-Wheelmap, Android users can find locations and modify descriptions on a virtual map.
+you? Which museums or libraries are accessible for people with limited mobility 
+and which are not? With 
+Wheelmap, you can find locations and modify descriptions on an OpenStreetMap
+(OSM) map.
 
-Wheelmap was developed by the non-profit organisation SOZIALHELDEN.The SOZIALHELDEN’s aim is to adress 
+Wheelmap was developed by the non-profit organisation SOZIALHELDEN.The 
-social challenges with innovative approaches.
+SOZIALHELDEN’s aim is to adress social challenges with innovative approaches.
+
+Google Analytics was removed before building.
 .
 
 Repo Type:git
 Repo:https://github.com/sozialhelden/wheelmap-android.git
 
+Build Version:0.8.3,16,0.8.3_release,subdir=Wheelmap,\
+srclibs=PullToRefresh@v1.3.0;NoAnalytics@158a4a,rm=Wheelmap/libs/libGoogleAnalytics.jar,prebuild=\
+$$SDK$$/tools/android update project -p $$PullToRefresh$$/library && \
+sed -i 's@\(android.library.reference.1=\).*@\1$$PullToRefresh$$/library@' project.properties && \
+echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
+
 #See Readme for using switch to disable Google Analytics, to be run in root directory
-Build Version:0.9.2-SNAPSHOT,16,!error at 1195dc90b6,subdir=wheelmap,maven=yes,\
+#Build Version:0.9.2-SNAPSHOT,16,!error at 1195dc90b6,subdir=wheelmap,maven=yes,\
-srclibs=HoloEverywhere@holoeverywhere-1.2.2;PullToRefresh@v1.4.0;ActionBarSherlock@4.1.0
+#srclibs=HoloEverywhere@holoeverywhere-1.2.2;PullToRefresh@v1.4.0;ActionBarSherlock@4.1.0
 
 Auto Update Mode:None
-Update Check Mode:None
+#Tags and RM don't see AM.xml
-Current Version:0.9.2
+Update Check Mode:Market
+Current Version:0.8.3
 Current Version Code:16
 

metadata/template

@@ -1,3 +1,8 @@
+#See http://f-droid.org/manual for details
+#Delete fields that are not needed 
+Disabled:
+Name:
+AntiFeatures:
 Category:
 License:
 Web Site:
@@ -7,18 +12,25 @@ Donate:
 FlattrID:
 Bitcoin:
 
-Summary:This is a summary
+Summary:What the app is for
 Description:
-This
+A description goes here. It should be fairly future proof, unless you intend to
-is 
+keep it updated, yet not be too short. The maximum line length is 80 chars,
-a 
+unless the basic MediaWiki markup is used.
-description
 .
 
+Requires Root:
+
 Repo Type:
 Repo:
+#Version Names and Codes must be distinct
+Build Version:Version Name,Version Code,Commit/Tag/Revision, etc. (if necessary)
 
-Build Version:name,code,commit/tag/revision
+Auto Update Mode:
-
+#One of Tags, RepoManifest, Market or None (in that order of preference)
+#If None, describe how to obtain Current Version in a comment 
+#The other methods are automatic but check that the mechanism works
 Update Check Mode:
+Current Version:
+Current Version Code: