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

metadata/com.manor.currentwidget.txt

@@ -36,16 +36,16 @@ Repo:http://currentwidget.googlecode.com/svn/trunk
 Build Version:0.36b,31,236,subdir=CurrentWidget,update=.;../CurrentWidgetLibrary,\
 srclibs=Color-Picker-2@45ee6554a1db,target=android-15,prebuild=\
 printf "android.library.reference.1=../CurrentWidgetLibrary" >> project.properties && \
-rm -rf ../CurrentWidgetLibrary/bin && \
+mkdir -p src/ && rm -rf ../CurrentWidgetLibrary/bin && \
 mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
-printf "android.library=true\nandroid.library.reference.1=$$Color-Picker$$" >> \
+printf "android.library=true\nandroid.library.reference.1=$$Color-Picker-2$$" >> \
 ../CurrentWidgetLibrary/project.properties
 Build Version:0.38a,36,276,subdir=CurrentWidget,update=.;../CurrentWidgetLibrary,\
 srclibs=Color-Picker-2@45ee6554a1db,target=android-17,prebuild=\
 printf "android.library.reference.1=../CurrentWidgetLibrary" >> project.properties && \
 mkdir -p src/ && rm -rf ../CurrentWidgetLibrary/bin && \
 mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
-printf "android.library=true\nandroid.library.reference.1=$$Color-Picker$$" >> \
+printf "android.library=true\nandroid.library.reference.1=$$Color-Picker-2$$" >> \
 ../CurrentWidgetLibrary/project.properties
 
 Auto Update Mode:None

metadata/net.avs234.txt

@@ -14,7 +14,8 @@ are also supported and files are chosen via directories.
 Repo Type:git-svn
 Repo:https://andless.googlecode.com/svn/trunk
 
-# Wordlist error on r8e despite Manifest being in unix format; system libraries in jni/Android/lib
+# Wordlist error on r8e: move AndroidManifest.xml uses-sdk tag higher up 
+# system libraries in jni/Android/lib
 Build Version:1.3.5,16,96,target=android-17,scanignore=build/net.avs234,buildjni=yes
 
 Auto Update Mode:None

metadata/net.nurik.roman.dashclock.txt

@@ -31,7 +31,7 @@ Repo:DashClock
 Build Version:1.3.1,14,v1.3.1,subdir=main
 Build Version:1.4.2,17,v1.4.2,subdir=main
 Build Version:1.4.3,19,v1.4.3,subdir=main
-Build Version:1.5 Beta 2,21,!crashes; wait for next beta at 789143f4ed52,\
+Build Version:1.5 Beta 4,23,!crashy at v1.5b4,\
 forceversion=yes,forcevercode=yes,srclibs=DragSort@0.6.1,\
 subdir=main/src/main,extlibs=android/android-support-v13.jar,target=android-17,\
 prebuild=mkdir -p src && printf 'android.library.reference.1=$$DragSort$$' >> \

metadata/org.beide.droidgain.txt

@@ -13,8 +13,13 @@ Normalizes mp3 files (it makes them all sound equally loud).
 Repo Type:git
 Repo:git://github.com/beide/Droidgain.git
 
-#Disabled build - requires a one line change to the ndk
-Build Version:1.0,1,!needs ndk fix 3cf8be7ebcff4470199c95271537790dc7416063,buildjni=yes
+Build Version:1.0,1,!ndk-build errors at 3cf8be7ebc,build=\
+sed -i '6 i \<uses-sdk android:targetSdkVersion=\"15\"\n\
+android:minSdkVersion=\"10\" \/\>' AndroidManifest.xml && \
+mkdir -p NDK && cp -r $$NDK$$/* NDK/ && \
+sed -i '41\,42s/extern/\/\/extern/g' \
+NDK/platforms/android-4/arch-arm/usr/include/string.h && \
+./NDK/ndk-build && rm -rf NDK/,buildjni=no
 
 Update Check Mode:Static
 

metadata/org.jamienicol.episodes.txt

@@ -7,15 +7,14 @@ Issue Tracker:https://github.com/jamienicol/episodes/issues
 Summary:Track TV shows you have seen
 Description:
 Keep track of which episodes you've watched of your favourite TV shows.
+The data is sourced from [http://thetvdb.com TheTVDB.com], the content of which
+is licensed under CC-BY.
 .
 
 Repo Type:git
 Repo:https://github.com/jamienicol/episodes
 
-Build Version:0.1,1,!further testing needed v0.1,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-rm -rf actionbarsherlock/ && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-sed -i \ 's@\.1=actionbarsherlock@.1=$$ActionBarSherlock$$@' project.properties
+Build Version:0.1,1,!wait a bit at v0.1
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/org.kwaak3.ext.txt

@@ -16,7 +16,7 @@ Repo Type:git-svn
 Repo:http://kwaak3.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,37,subdir=kwaak/project,target=android-10,novcheck=yes,\
-patch=common.patch,prebuild=\
+patch=common.patch,build=\
 pushd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && popd,buildjni=yes
 
 Auto Update Mode:None