Merge commit 'refs/merge-requests/321' of gitorious.org:f-droid/fdroiddata

metadata/de.blinkt.openvpn.txt

@@ -88,6 +88,20 @@ Build:0.6.1,82
     buildjni=no
     type=gradle
 
+Build:0.6.4,85
+    commit=v0.6.4
+    gradle=yes
+    prebuild=sed -i '/google-breakpad/d' jni/Android.mk && \
+        sed -i -e '/+=.*breakpad/d' -e 's/ [^ ]*breakpad[^ ]*//' openvpn/Android.mk && \
+        find openvpn/src -type f -print0 | xargs -0 sed -i '/breakpad/d' && \
+        rm -f openvpn/src/openvpn/breakpad.*
+    scandelete=assets
+    build=echo WITH_BREAKPAD=0 >> jni/Android.mk && \
+        sed -i 's/-j 8/-j 4/g' misc/build-native.sh && \
+        ./misc/build-native.sh
+    buildjni=no
+    type=gradle
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.6.4

metadata/net.wigle.wigleandroid.txt

@@ -25,9 +25,23 @@ to the [http://wigle.net wigle.net] database (read the [https://github.com/wigle
 Repo Type:git
 Repo:https://github.com/wiglenet/wigle-wifi-wardriving.git
 
-Build Version:1.53,53,1.53,rm=dist/wigle-wifi-wardriving.apk,update=force,prebuild=\
+Build:1.53,53
-sed -i '518\,557d' src/net/wigle/wigleandroid/MappingActivity.java
+    commit=1.53
-Build Version:1.55,55,1.55,prebuild=sed -i '518\,557d' src/net/wigle/wigleandroid/MappingActivity.java,rm=dist/wigle-wifi-wardriving.apk,update=force
+    rm=dist/wigle-wifi-wardriving.apk
+    update=force
+    prebuild=sed -i '518,557d' src/net/wigle/wigleandroid/MappingActivity.java
+
+Build:1.55,55
+    commit=1.55
+    rm=dist/wigle-wifi-wardriving.apk
+    update=force
+    prebuild=sed -i '518,557d' src/net/wigle/wigleandroid/MappingActivity.java
+
+Build:1.57,57
+    commit=1.57
+    rm=dist/wigle-wifi-wardriving.apk
+    update=force
+    prebuild=sed -i '559,598d' src/net/wigle/wigleandroid/MappingActivity.java
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/org.mariotaku.twidere.txt

@@ -159,6 +159,18 @@ Build:0.2.9.8-update2,90
         cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
         cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
 
+Build:0.2.9.9,91
+    disable=java problems http://sprunge.us/Zaij
+    commit=8a07f3a809
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.2;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772;4:SmoothProgressBar@v0.3.2;5:HoloAccent@v0.9;6:MenuComponent@ee3d4ac2e2
+    prebuild=rm -rf dist/ art/ && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/ && \
+        cp libs/android-support-v4.jar $$HoloAccent$$/libs/ && \
+        mkdir $$MenuComponent$$/libs/ && cp libs/android-support-v4.jar $$MenuComponent$$/libs/
+
 Maintainer Notes:
 Tags are for the 'dev' branch, not the 'fdroid' branch that we want to use.
 .

metadata/org.mozilla.mozstumbler.txt

@@ -21,12 +21,17 @@ Build:0.8.2,20
     gradle=yes
     prebuild=sed -i -e 's/debuggable true/debuggable false/' -e '/task wrapper/,/^}$/d' build.gradle
 
+Build:0.8.3,21
+    commit=v0.8.3
+    gradle=yes
+    prebuild=sed -i -e 's/debuggable true/debuggable false/' -e '/task wrapper/,/^}$/d' build.gradle
+
 Maintainer Notes:
 We'll put it back to UCM:Tags once we support AndroidManifest.xml.in
 .
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:0.8.2
+Current Version:0.8.3
-Current Version Code:20
+Current Version Code:21
 

metadata/org.pocketworkstation.pckeyboard.txt

@@ -70,10 +70,10 @@ Build:v1.33,1033
     buildjni=yes
 
 Build:v1.37,1037
-    disable=Doesn't build - missing package com.google.android.voiceime
     commit=1.37
     subdir=java
     target=android-19
+    srclibs=1:VoiceIME@5763e36eab31
     prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && \
         ./AutoVersion.sh
     buildjni=yes

srclibs/HoloAccent.txt

@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/negusoft/holoaccent.git
+
+Subdir:HoloAccent
+
+Update Project:Yes
+

srclibs/MenuComponent.txt

@@ -0,0 +1,8 @@
+Repo Type:git
+Repo:https://github.com/mariotaku/Android-MenuComponent.git
+
+Subdir:library
+
+Update Project:Yes
+
+

srclibs/SmoothProgressBar.txt

@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/castorflex/SmoothProgressBar.git
+
+Subdir:library/src/main
+Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\ntarget=android-19' > project.properties
+Update Project:Yes
+

srclibs/VoiceIME.txt

@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://code.google.com/p/google-voice-typing-integration/
+
+Subdir:VoiceImeUtils
+Update Project:Yes
+
+