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

Conflicts:
	metadata/fr.ybo.gtfsalert.txt

metadata/dasher.android.txt

@@ -0,0 +1,35 @@
+Category:Office
+License:GPLv3
+Web Site:http://www.inference.phy.cam.ac.uk/dasher/MobileDasher.html
+Source Code:https://github.com/acl33/AndroidDasher
+Issue Tracker:https://github.com/acl33/AndroidDasher/issues
+
+Summary:Text input method (IME)
+Description:
+Dasher is an information-efficient, text-entry interface, driven by a natural 
+continuous steering of the cursor into boxes representing the letter you
+want to input. 
+
+Dasher is especially useful for text-entry wherever a full-size keyboard 
+cannot be used — for example,
+
+* when operating a computer one-handed, by joystick, touchscreen, trackball, or mouse;
+* when operating a computer with zero hands (i.e., by head-mouse or by eyetracker);
+* on a palmtop computer;
+* on a wearable computer.
+.
+
+Repo Type:git
+Repo:https://github.com/acl33/AndroidDasher.git
+
+Build Version:2.5,9,c2be104189,\
+srclibs=TeclaAccess@ee65057ff8,prebuild=rm -rf src/dasher/applet && \
+sed -i 's@\(reference.1=\).*@\1$$TeclaAccess$$@' project.properties && \
+printf 'android.library=true' >> $$TeclaAccess$$/project.properties && \
+sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.5
+Current Version Code:9
+

metadata/fr.ybo.gtfsalert.txt

@@ -1,24 +0,0 @@
-Category:Navigation
-License:GPLv3
-Web Site:
-Source Code:https://github.com/ybonnel/GtfsAlert
-Issue Tracker:https://github.com/ybonnel/GtfsAlert/issues
-
-Auto Name:Gtfs Alert
-Summary:Transit data for Rennes, France
-Description:
-Fetch transit information from data.keolis-rennes.com, via
-the General Transit feed specification.
-.
-
-Repo Type:git
-Repo:https://github.com/ybonnel/GtfsAlert
-
-Build Version:1.0.1,101,!half-baked app at ddd2a62fd445a,prebuild=\
-sed -i 's/debuggable="true"/debuggable="false"/' AndroidManifest.xml
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0.1
-Current Version Code:101
-

metadata/org.mumod.android.txt

@@ -9,8 +9,6 @@ FlattrID:998492
 Auto Name:Mustard {MOD}
 Summary:Microblogging app
 Description:
-N.B. Twitter is disabled in this build.
-
 Client for [http://status.net/wiki/Take_a_tour StatusNet] 
 (now known as [http://www.gnu.org/software/social GNU social]). 
 GNU social is a microblogging platform somewhat like Twitter, 
@@ -18,13 +16,18 @@ but decentralized.
 Some examples are: [https://status.fsf.org fsf.org], 
 [https://sn.jpope.org jpope.org] and [http://bka.li bka.li].
 The latter is in German, as is the website.
+
+Twitter is disabled in this build, but in future versions
+it will be possible to enter oAuth credentials into the app, after
+registering your own client at dev.twitter.com.
+It is already possible to add oAuth credentials for StatusNet sites.
 .
 
 Repo Type:git
 Repo:https://github.com/kromonos/Mustard-Mod.git
 
 # Patch out Twitter button
-Build Version:0.4.0.16,167,2f4beca53,prebuild=\
+Build Version:0.4.0.17,168,05b41e1f17,prebuild=\
 sed -i '53\,60d' res/layout/account_create.xml && \
 sed -i '50\,55d' src/org/mumod/android/activity/Login.java
 

srclibs/TeclaAccess.txt

@@ -0,0 +1,6 @@
+Repo Type:git
+Repo:https://github.com/idrc/TeclaAccess
+
+Subdir:sdk
+
+Update Project:Yes