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

metadata/com.hobbyone.HashDroid.txt

@@ -1,8 +1,8 @@
 Category:System
 License:GPLv3
 Web Site:
-Source Code:https://github.com/PaulMEdwards/HashDroid
+Source Code:https://gitorious.org/hash_droid/hash_droid
-Issue Tracker:https://github.com/PaulMEdwards/HashDroid/issues
+Issue Tracker:
 
 Auto Name:Hash Droid
 Summary:Verify file integrity
@@ -17,12 +17,10 @@ correctly or that nobody interfered with it in transit.
 .
 
 Repo Type:git
-Repo:https://github.com/PaulMEdwards/HashDroid.git
+Repo:https://git.gitorious.org/hash_droid/hash_droid.git
 
-Build Version:3.2,18,e77c2915f8
+Build Version:3.1,18,3.1
 
-# Betting that there will be no new versions;
-# if there are, use a new repo unless fork owner makes significant improvements
 Auto Update Mode:None
 Update Check Mode:Market
 Current Version:3.1

metadata/com.roguetemple.hydroid.txt

@@ -0,0 +1,39 @@
+Category:Games
+License:GPLv2
+Web Site:http://www.roguetemple.com/z/hydroid.php
+Source Code:https://bitbucket.org/dalb8/hydra-slayer
+Issue Tracker:
+Donate:http://www.roguetemple.com/z/hydroid.php
+
+Auto Name:Hydra Slayer
+Summary:Adventure game
+Description:
+Hydra Slayer is a roguelike (that is, a game where you control a single hero 
+fighting horde of monsters, with a high emphasis on tactics) where combat has 
+been inspired by some mathematical puzzles about brave heroes slaying many 
+headed beasts. 
+This might look like a standard dungeon crawler, but the puzzle element 
+is important, and the later game is meant to be challenging. 
+Be sure to try the tutorial first or visit the website to see the back story 
+and other tips and tricks.
+The character can be controlled by touching part of the screen to indicate
+direction, but bear in mind that walls can't be traversed!
+
+* In most menus, you can touch a menu item (on screen) to activate it; most actions can be also selected by pressing the Menu button.
+* On the race selection screen, click on the top part of the screen (which contains race names) or use D-pad to change race, and then touch the middle of the screen to play the chosen race.
+* On the game screen, touch the corner which contains the list of your weapons to switch weapons (the most common action), and touching the corner which contains the stats and list of enemies opens a single menu including all possible actions (while Menu button shows just five). You can also touch the message box at the bottom to see messages which did not fit on the screen. Touching anywhere else is a move.
+* Since this is based on a desktop game, most common actions can be also executed by pressing hardware buttons. For example, '''in the game, D-Pad moves''', Volume Up and Volume Down switch weapons, Call ("pick up phone") picks up items and climbs down stairs (just like the 'g' key on keyboard), and Search opens your inventory (like 'i').
+* In questions, touching the top of the screen means yes and the bottom of the screen means no.
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/dalb8/hydra-slayer
+
+Build Version:15.0,1500,0,buildjni=yes
+
+Auto Update Mode:None
+# source in archive on website
+Update Check Mode:Market
+Current Version:15.0
+Current Version Code:1500
+

metadata/com.ryanm.minedroid.txt

@@ -1,23 +0,0 @@
-Category:Games
-License:NewBSD
-Web Site:http://code.google.com/p/minedroid/
-Source Code:http://code.google.com/p/minedroid/source/checkout
-Issue Tracker:http://code.google.com/p/minedroid/issues/list
-
-Summary:Experimental Minecraft Client
-Description:
-An experimental Minecraft client.
-.
-
-Repo Type:svn
-Repo:http://minedroid.googlecode.com/svn/trunk/
-
-#Looks to be abandoned and experimental
-#Needs DroidRUGL to build. http://code.google.com/p/rugl
-#Build Version:Multiverse edition - small screen fix,15,52,subdir=MineDroid
-
-#Not in market; last revision 06/11 as of 03/13
-Update Check Mode:Static
-Current Version:Multiverse edition - small screen fix
-Current Version Code:15
-

metadata/eu.vranckaert.worktime.txt

@@ -1,27 +1,43 @@
 Category:Office
 License:Apache2
-Web Site:https://code.google.com/p/worktime/
+Web Site:https://code.google.com/p/worktime
-Source Code:https://code.google.com/p/worktime/source/browse/
+Source Code:https://code.google.com/p/worktime/source/list
 Issue Tracker:https://code.google.com/p/worktime/wiki/Issues?tm=3
 
 Auto Name:WorkTime
 Summary:Tracks your work time
 Description:
-Worktime targets on business people that want to keep track of their time.
+Worktime is for workers that need to keep track of their jobs;
-Weather you are working on different projects for different clients or just
+whether you are working on different projects for different clients or just
-one project for one company, WorkTime is the application that will
+one project for one company.
-track your time.
-It also includes a widget which makes registering time even faster as you can
-do it right from you Android Home-Screen.
 You can generate reports based by filtering your time registrations by date
 (pre-defined date ranges or a custom date range) and by project and task.
+
+* Widget to start/stop a time registration
+* Notifications
+* Backup to SD-card 
+* Detailed reports for your list of time registrations
+* Export those details to the CSV format 
+* Split time registrations
+
+Google analytics was removed; it's likely that future versions will rely on
+proprietary libraries for Google location services so it may not be easy 
+to keep the app up to date.
 .
 
 Repo Type:git-svn
 Repo:http://worktime.googlecode.com/svn/trunk/android-app
 
-Build Version:1.1.15,270,!proprietary google play services (for maps) at 1092
+Build Version:1.1.13.4,260,1035,srclibs=NoAnalytics@533c6c1,prebuild=\
+echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && \
+rm libs/google-analytics*
+Build Version:1.1.15,270,1092,srclibs=NoAnalytics@533c6c1,prebuild=\
+echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && \
+rm libs/google-analytics*
 
 Auto Update Mode:None
-Update Check Mode:Static
+# releases have their own branch
+Update Check Mode:Market
+Current Version:1.1.15
+Current Version Code:270
 

metadata/fr.ybo.transportsbordeaux.txt

@@ -40,6 +40,7 @@ Build Version:2.7.1,271,TB_noGoogleMap_2.7.1,subdir=TransportsBordeaux,\
 target=android-13,srclibs=MobAdMob@2d5736,update=.;../TransportsCommun,prebuild=\
 printf "android.library.reference.2=$$MobAdMob$$" >> project.properties && \
 rm libs/GoogleAdMob*.jar 
+Build Version:2.7.2,272,TB_noGoogleMap_2.7.2,srclibs=MobAdMob@2d5736,target=android-13,update=.;../TransportsCommun,subdir=TransportsBordeaux,prebuild=printf "android.library.reference.2=$$MobAdMob$$" >> project.properties && rm libs/GoogleAdMob*.jar && sed -i '8s/true/false/g' res/xml/preferences.xml
 
 Auto Update Mode:Version TB_noGoogleMap_%v
 # Not working with repo type srclib

metadata/fr.ybo.transportsrennes.txt

@@ -34,11 +34,12 @@ Repo:TransportsRennes
 
 Build Version:3.4.3,343,TR_noGoogleMap_3.4.3,subdir=TransportsRennes,\
 prebuild=rm ../TransportsBordeaux/libs/GoogleAdMob*.jar,update=.;../TransportsCommun
+Build Version:3.4.4,344,TR_noGoogleMap_3.4.4,prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && rm ../TransportsBordeaux/libs/GoogleAdMob*.jar,update=.;../TransportsCommun,subdir=TransportsRennes
 
 Auto Update Mode:Version TR_noGoogleMap_%v
 # Not working
 #Update Check Mode:RepoManifest/noGoogleMap
 Update Check Mode:Market
-Current Version:3.4.3
+Current Version:3.4.4
-Current Version Code:343
+Current Version Code:344
 

metadata/net.sourceforge.servestream.txt

@@ -3,16 +3,14 @@ License:Apache2
 Web Site:http://sourceforge.net/projects/servestream
 Source Code:http://sourceforge.net/p/servestream/code/commit_browser
 Issue Tracker:http://sourceforge.net/tracker/?group_id=361303
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wseemann%40gmail.com&lc=US&item_name=Servestream%20Donation&
+Donate:http://sourceforge.net/p/servestream/donate
 
-Auto Name:
+Auto Name:ServeStream
 Summary:Audio stream player
 Description:
-'''N.B''' v0.6.0 supports ARM and MIPS natively, but not x86.
+HTTP media server browser and stream player. 
-
+Ideal for playing internet radio or streaming podcasts in the background. 
-HTTP media server browser and stream player. Ideal for playing internet radio
+For use with any streaming media servers such as GNUMP3d or icecast.
-or streaming podcasts
-in the background. For use with any streaming media servers such as GNUMP3d.
 
 * Supports http, https, mms (beta), mmsh (beta)
 * Plays mp3/3gp/mp4/m4a/ogg/wav/mid/xmf/mxmf/rtttl/rtx/ota/imy
@@ -22,8 +20,10 @@ in the background. For use with any streaming media servers such as GNUMP3d.
 * Alarm clock support
 * Home screen widget
 * Utilizes HTML parsing to allow navigation of HTTP servers that serve HTML pages e.g. http://listenlive.eu
+* Support x86 and MIPS for ffmpeg playback
 .
 
+# sed -i 's/x86 mips/mips/g' jni/Application.mk && \
 Repo Type:git-svn
 #Repo:https://servestream.svn.sourceforge.net/svnroot/servestream/trunk; old url prior to r1160
 Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags
@@ -56,6 +56,7 @@ sed -i 's/make -j4/make -j1/g' arm-build.sh && \
 sed -i 's/bash/sh/g' arm-build.sh && \
 sed -i '/PIPESTATUS/d' arm-build.sh && \
 NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes
+# build server now doing bash
 Build Version:0.6.0,72,v0.6.0,\
 srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1,prebuild=\
 sed -i 's/make -j4/make -j2/g' scripts/* && \
@@ -65,8 +66,6 @@ echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties &
 echo "android.library.reference.2=$$DragSort$$" >> project.properties,\
 build=./scripts/build-ffmpeg.sh,buildjni=yes
 
-# sed -i 's/x86 mips/mips/g' jni/Application.mk && \
-# Todo: work for x86
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.6.0

metadata/org.dmfs.tasks.txt

@@ -1,3 +1,4 @@
+AntiFeatures:NonFreeAdd
 Category:Office
 License:Apache2
 Web Site:https://github.com/dmfs/tasks#tasks
@@ -5,16 +6,27 @@ Source Code:https://github.com/dmfs/tasks
 Issue Tracker:https://github.com/dmfs/tasks/issues
 
 Auto Name:Tasks
-Summary:Tasks synchronizable with CalDAV
+Summary:Keep track of your list of goals
 Description:
-A simple Task App for Android that can synchronize tasks using CalDAV.
+A simple task manager app, allowing you to categorise your todo list by
+urgency, state, timeframe etc.
+It is supposed to synchronise to a CalDAV server but this only works via
+the author's proprietary app.
+There isn't an option to export the data: therefore you must archive 
+/data/app/org.dmfs.tasks as root; or use adb backup if you are on Android 4.
+
+Anti-feature: Non-free addons. Your data can't be synchronised or exported 
+unless you install another, proprietary app.
+
+Status: Beta.
 .
 
 Repo Type:git
 Repo:https://github.com/dmfs/tasks.git
 
-Build Version:1.0.3,10,!needs further testing f9d88f8280,extlibs=android/android-support-v4.jar,srclibs=task-provider@4b402e7118,\
+Build Version:1.0.3,10,f9d88f8280,extlibs=android/android-support-v4.jar,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$task-provider$$@' project.properties 
+srclibs=task-provider@4b402e7118,prebuild=\
+sed -i 's@\(reference.1=\).*@\1$$task-provider$$@' project.properties 
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest

metadata/org.fdroid.k9.txt

@@ -134,7 +134,22 @@ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
 # use the build-beta script from the master branch instead
-Build Version:4.403,17040,4.403,\
+Build Version:4.403,17040,!4.403,\
+srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
+plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
+sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
+library/project.properties,patch=packageid-temp.patch,prebuild=\
+chmod +x tools/build-beta && ./tools/build-beta && \
+rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+cp -r $$Jutf7$$/src/main/java/com/ src/  && \
+tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
+rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
+$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
+rm -rf HtmlCleaner
+Build Version:4.404,17041,4.404,\
 srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
 plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
@@ -150,7 +165,22 @@ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
 
-Build Version:4.502,18002,4.502,\
+Build Version:4.502,18002,!4.502,\
+srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
+plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
+sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
+library/project.properties,patch=packageid-temp.patch,prebuild=\
+chmod +x tools/build-beta && ./tools/build-beta && \
+rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+cp -r $$Jutf7$$/src/main/java/com/ src/  && \
+tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
+rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
+$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
+rm -rf HtmlCleaner
+Build Version:4.505,18005,4.505,\
 srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
 plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\