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

Conflicts:
	metadata/apps.droidnotify.txt
	metadata/csh.cryptonite.txt
	metadata/de.kugihan.dictionaryformids.hmi_android.txt
	metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
	metadata/org.yaaic.txt

metadata/com.github.mobile.txt

@@ -0,0 +1,28 @@
+Category:Internet
+License:Apache2
+Web Site:https://github.com/github/android
+Source Code:https://github.com/github/android
+Issue Tracker:https://github.com/github/android/issues
+
+Summary:GitHub Android App
+Description:
+Official client for GitHub.
+
+GitHub is the best way to collaborate with others.
+
+Create, manage, and discuss issues and stay up to date with an integrated news feed for all your organizations, friends, and repositories.
+
+View your issues dashboard to stay connected with all the issues you've reported, been assigned, or participating in the discussion on. You can also view and filter a repository's issue list and bookmark it for quick access.
+
+Discover, share, and discuss code snippets using the integrated GitHub Gists support.
+
+Download the app for free and signup at http://github.com/signup for a free GitHub account.
+
+The GitHub Android app is open source, visit https://github.com/github/android to see the code, connect with the developers, and discuss future features.
+.
+
+Repo Type:git
+Repo:https://github.com/github/android.git
+
+Build Version:1.1,600,1.1,maven=yes
+

metadata/csh.cryptonite.txt

@@ -12,10 +12,11 @@ Cryptonite brings EncFS and TrueCrypt to Android. You can browse, export and ope
 Repo Type:git
 Repo:https://code.google.com/p/cryptonite/
 
-Build Version:0.6.8,59,b13cd6c4d65a,subdir=cryptonite
 
 
 Update Check Mode:Market
 Current Version:0.6.17
 Current Version Code:68
+#Doesn't build, looks like native source dependencies are required
+#Build Version:0.6.8,59,b13cd6c4d65a,subdir=cryptonite,buildjni=yes
 

metadata/de.kugihan.dictionaryformids.hmi_android.txt

@@ -14,11 +14,7 @@ Please note that the dictionaries that are set up for DictionaryForMIDs may have
 .
 
 Repo Type:git-svn
-Repo:http://dictionarymid.svn.sourceforge.net/viewvc/dictionarymid/tags/Android_0_91_1_release/Android
+Repo:https://dictionarymid.svn.sourceforge.net/svnroot/dictionarymid/trunk
-
-Build Version:0.90.1,89,461
-
-Update Check Mode:Market
-Current Version:0.91.1
-Current Version Code:98
 
+#Doesn't build - needs dependencies setting up I think
+#Build Version:0.90.1,89,526,subdir=Android

metadata/de.schildbach.wallet.txt

@@ -47,8 +47,6 @@ cd ../integration-android && mvn3 install && cd ../wallet && \
 mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 
-Build Version:2.20,91,197963d9a457 ## new version of BitcoinJWallet. 
-
 Update Check Mode:RepoManifest
 Current Version:2.20
 Current Version Code:91

metadata/jp.co.kayo.android.localplayer.ds.ampache.txt

@@ -1,20 +0,0 @@
-Category:Multimedia
-License:GPLv2
-Web Site:http://justplayer-dev.blogspot.jp/
-Source Code:https://bitbucket.org/yokmama/just-player-providers/src
-Issue Tracker:https://plus.google.com/101509207997544022048
-
-Summary:Ampache plugin for Just-Player
-Description:
-This app allows you to add remote streaming functionality to Just-Player using Ampache e.g. Owncloud
-.
-
-Repo Type:git
-Repo:https://bitbucket.org/yokmama/just-player-providers.git
-
-Build Version:1.19,0410044,1370e4cfe884,subdir=AmpacheProvider
-
-Update Check Mode:Market
-Current Version:1.19
-Current Version Code:410044
-

metadata/jp.co.kayo.android.localplayer.ds.podcast.txt

@@ -1,16 +0,0 @@
-Category:Multimedia
-License:GPLv2
-Web Site:http://justplayer-dev.blogspot.jp/
-Source Code:https://bitbucket.org/yokmama/just-player-providers/src
-Issue Tracker:https://plus.google.com/101509207997544022048
-Donate:
-
-Summary:Podcast plugin for Just-Player
-Description:
-You can search for podcasts and subscribe to podcast urls in this app. Then choose Podcast as a data source in Just-Player and you can listen to the podcasts in Just-Player
-.
-
-Repo Type:git
-Repo:https://bitbucket.org/yokmama/just-player-providers.git
-
-Build Version:1.1a,1010008,1370e4cfe884,subdir=PodcastProvider

metadata/jp.co.kayo.android.localplayer.txt

@@ -1,16 +0,0 @@
-Category:Multimedia
-License:GPLv2
-Web Site:http://justplayer-dev.blogspot.jp/
-Source Code:https://bitbucket.org/yokmama/just-player/src
-Issue Tracker:https://plus.google.com/101509207997544022048
-Donate:
-
-Summary:Music Player
-Description:
-Comprehensive music player with unusual features such as sharing files over Android Beam, now-playing to Twitter etc. By installing the optional Podcast Provider and/or Ampache Provider (also in the F-droid app repo) you can listen to audio from the internet. For example, you can store your music on an Owncloud instance and stream it to Just-Player
-.
-
-Repo Type:git
-Repo:https://bitbucket.org/yokmama/just-player.git
-
-Build Version:3.12d,141400247,ad3c639598fa

metadata/org.opengpx.txt

@@ -1,4 +1,4 @@
-Anti-feature:Nonfree-dep
+AntiFeatures:NonFreeDep
 Category:Navigation
 License:MIT
 Web Site:https://code.google.com/p/opengpx/

metadata/org.yaaic.txt

@@ -18,7 +18,8 @@ Repo:https://github.com/pocmo/Yaaic.git
 Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant
 Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant
 Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant
-Build Version:1.0,12,v1.0,subdir=application,bindir=builds/ant
+#Complains that the embedded ActionBarSherlock has an invalid build.xml
+#Build Version:1.0,12,db6ed0a1224,subdir=application,bindir=builds/ant
 
 Update Check Mode:Market
 Current Version:1.0