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

Conflicts:
	metadata/com.achep.widget.jellyclock.txt
	metadata/net.sourceforge.servestream.txt
	metadata/org.kwaak3.ext.txt

metadata/com.koushikdutta.superuser.txt

@@ -0,0 +1,26 @@
+Category:System
+License:Unknown
+Web Site:https://github.com/koush/Superuser
+Source Code:https://github.com/koush/Superuser
+Issue Tracker:https://github.com/koush/Superuser/issues
+
+Summary:Manage root access
+Description:
+An app to allow or disallow apps' request to run as root, like the
+Superuser app that comes with custom ROMs. The difference here is
+that the entire app can be built from source with the Android
+SDK, including the '''su''' binary which is bundled within. The app
+also intends to enforce an Android root permission that can be
+managed like any other permission. Should work with both ARM and x86.
+.
+
+Repo Type:git
+Repo:https://github.com/koush/Superuser.git
+
+Build Version:1.0.0.0,1000,!Requires ndk-r8d + some other errors 35d6cbaedf,subdir=Superuser,\
+update=force,srclibs=KoushWidgets@c49ce98624,prebuild=\
+sed -i 's@\(android.library.reference.1=\).*@\1$$KoushWidgets$$@' project.properties,buildjni=yes
+
+Auto Update Mode:None
+Update Check Mode:None
+

metadata/com.seawolfsanctuary.keepingtracks.txt

@@ -23,6 +23,7 @@ Repo Type:git
 Repo:https://bitbucket.org/sea_wolf/keepingtracks.git
 
 Build Version:1.00,20130222,1.00,prebuild=rm -rf sources
+Build Version:1.01,20130223,1.01,prebuild=rm -rf sources
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/net.sourceforge.servestream.txt

@@ -25,7 +25,7 @@ in the background. For use with any streaming media servers such as GNUMP3d.
 * Utilizes HTML parsing to allow navigation of HTTP servers that serve HTML pages e.g. http://listenlive.eu or http://magnatune.com/mobile
 .
 
-Repo Type:svn
+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
 
@@ -57,8 +57,8 @@ 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 Version:0.5.5,70,!Build fails with jni/ffmpeg/Android.mk:avcodec: LOCAL_SRC_FILES points to a missing file (at 1361),srclibs=ActionBarSherlock@4.2.0,prebuild=\
+Build Version:0.5.5,70,1361,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && /bin/dash scripts/build-ffmpeg.sh && \
+rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && ./scripts/build-ffmpeg.sh && \
 echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties,buildjni=yes
 
 Auto Update Mode:None

metadata/org.billthefarmer.tuner.txt

@@ -0,0 +1,22 @@
+Category:Multimedia
+License:GPLv3
+Web Site:https://github.com/billthefarmer/tuner/wiki
+Source Code:https://github.com/billthefarmer/tuner
+Issue Tracker:https://github.com/billthefarmer/tuner/issues
+
+Summary:Tuner optimised for tuning accordions
+Description:
+Accordion tuner with scope, spectrum and strobe. Can show up to eight
+different notes or reeds concurrently.
+.
+
+Repo Type:git
+Repo:https://github.com/billthefarmer/tuner
+
+Build Version:1.0,1,v1.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:Version 1.0
+Current Version Code:1
+