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

metadata/com.funambol.androidsync.txt

@@ -1,7 +1,7 @@
 Category:Office
 License:AGPLv3
 Web Site:http://www.funambol.com
-Source Code:https://android-client.forge.funambol.org/source/browse/android-client/
+Source Code:https://funambol.svn.sourceforge.net/viewvc/funambol/android-client/trunk/android-client
 Issue Tracker:
 
 Summary:Funambol (personal cloud/device) sync client
@@ -10,7 +10,6 @@ Funambol sync client.
 .
 
 Repo Type:svn
-#Repo:guest:x@https://android-client.forge.funambol.org/svn/android-client/
 Repo:https://funambol.svn.sourceforge.net/svnroot/funambol/android-client/trunk/android-client
 
 #Build Version:8.7.3,8,1032,subdir=tags/8.7.3,update=no,initfun=yes

metadata/org.hermit.audalyzer.txt

@@ -1,3 +1,4 @@
+Disabled:No repo
 Category:Multimedia
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Audalyzer

metadata/org.hermit.netscramble.txt

@@ -1,3 +1,4 @@
+Disabled:No repo
 Category:Games
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/ScrambledNet

metadata/org.hermit.tricorder.txt

@@ -1,3 +1,4 @@
+Disabled:No repo
 Category:Games
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Tricorder

metadata/org.moparisthebest.appbak.txt

@@ -1,3 +1,4 @@
+Disabled:Source not in any repo
 Category:System
 License:GPL
 Web Site:http://android.moparisthebest.org/index.php/apps/appbak

metadata/org.thialfihar.android.apg.txt

@@ -12,6 +12,14 @@ conjunction with [[com.fsck.k9]], to seamlessly add support for encrypting and d
 emails, as well as adding and verifying digital signatures.
 .
 
+Repo Type:git
+Repo:https://github.com/thialfihar/apg.git
+
+#For when source build is required
+#Build Version:1.0.8,10899,bf6029124,prebuild=\
+#wget http://android-privacy-guard.googlecode.com/files/bc145_reduced_for_apg.zip && \
+#unzip bc145_reduced_for_apg.zip -d src/ && rm bc145_reduced_for_apg.zip
+
 Update Check Mode:None
 Current Version:1.0.8
 Current Version Code:10899