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

metadata/com.android2.calculator3.txt

@@ -9,10 +9,6 @@ Summary:Make calculations
 Description:
 A simple calculator that tries to make graphing and matrix math as simple as adding or multiplying 
 two numbers. Slide left and right to access more panels. 
-
-This is the calculator that is bundled with CyanogenMod 9/10. Because this is signed with
-a different key to that, you can't update the app if you are running Cyanogenmod without
-first removing the apk from /system.
 .
 
 Repo Type:git

metadata/com.integralblue.callerid.txt

@@ -15,10 +15,8 @@ Repo:git://gitorious.org/callerid-for-android/mainline.git
 
 #Disabled pending figuring out how to stop it zipaligning....
 #Build Version:1.0,1,e6d5a9ac4bb24a,subdir=application,maven=yes,bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar -Dfile=osmdroid-android-3.0.3.jar
-Build Version:1.6,7,!fdroid can't find apk c54a018930a94d,subdir=application,maven=yes,\
-bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && \
-mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar \
--Dfile=osmdroid-android-3.0.3.jar
+
+Build Version:1.6,7,!can't find apk c54a018930a94d,subdir=application,maven=yes,bindir=application/target
 
 Update Check Mode:Market
 Current Version:1.6

metadata/org.servalproject.maps.txt

@@ -0,0 +1,26 @@
+Category:Navigation
+License:GPLv3
+Web Site:https://github.com/servalproject/ServalMaps
+Source Code:https://github.com/servalproject/ServalMaps
+Issue Tracker:https://github.com/servalproject/ServalMaps/issues
+
+Summary:Peer to peer mapping
+Description:
+The goal of the Serval Maps application is to provide a platform that allows 
+users to collaboratively add information to a map. The Serval Mesh network is 
+used to transfer data between instances of the application, and the map is 
+rendered using data stored on the device. This means that the use of Serval Maps
+ is not dependent on access to the Internet for download map tiles. Requires
+[[org.servalproject]] to be installed, thus root could be necessary. (##for now)
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/servalproject/ServalMaps.git
+
+Build Version:0.3.1,2,!not ready for release by a long way v0.3.1
+
+Update Check Mode:None
+Current Version:0.3.1
+Current Version Code:2

metadata/org.servalproject.txt

@@ -0,0 +1,40 @@
+Category:Phone & SMS
+License:GPLv3
+Web Site:http://developer.servalproject.org/dokuwiki/doku.php
+Source Code:https://github.com/servalproject/batphone
+Issue Tracker:https://github.com/servalproject/batphone/issues
+
+Summary:Robust communication using wifi
+Description:
+Mobile communications are useful, but depend on infrastructure that can be damaged, overwhelmed, 
+or even absent. This app assumes zero infrastructure: the phones talk to each other, 
+relaying calls, and resolving numbers for each other. A cellular commons using the unique 
+Serval Mesh telephony software that allows you to use your existing phone number.
+
+* Can be carried and activated in seconds by those who need it when it is needed
+* Carrier independent
+* Can be distributed during an emergency from only one phone 
+* Distributed nature makes network resilient
+
+Ideal for remote, rural & impoverished communities, and disaster/emergency situations, and the 
+services that support them, the software is making the best of one of the most ubiquitous 
+of devices - the mobile phone. Turn your phone into a true communications device - anytime, anywhere.
+
+This is experimental software and currently requires root access. To avail of the maps feature
+a separate app has to be installed which isn't in the repo yet.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/servalproject/batphone.git
+
+#May need to add version code to manifest.
+Build Version:1.0,1300,!wait for next release 1.0,buildjni=yes,submodules=yes,init=git checkout release
+
+Auto Update Mode:None
+#Tags are incomprehensible 
+Update Check Mode:Market
+Current Version:0.08
+Current Version Code:1214
+