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

metadata/com.eolwral.osmonitor.txt

@@ -12,6 +12,8 @@ Description:
 * Connection: display every tcp or udp network connection, and query it via WHOIS. There is an option to display the reverse-ip lookup map in OpenStreetMap.
 * Misc: monitor processor, battery and file system.
 * Message: check dmesg or logcat in real-time.
+
+[https://github.com/eolwral/OSMonitor/blob/master/CHANGELOG.md Changelog]
 .
 
 Repo Type:git
@@ -95,6 +97,20 @@ Build:3.0.8.2,53
         mv libs/x86/osmcore assets/osmcore_x86
     buildjni=no
 
+Build:3.0.9.0,54
+    commit=3.0.9.0
+    subdir=OSMonitor
+    target=android-19
+    extlibs=android/android-support-v4.jar
+    srclibs=1:Support/v7/appcompat@android-4.4_r1.1,2:Volley@android-4.4_r1.2,3:ColorPicker-eolwral@788621da0c
+    prebuild=mv libs/android-support-v4.jar $$Support$$/libs/
+    build=$$NDK$$/ndk-build && \
+        mkdir -p assets && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/mips/osmcore assets/osmcore_mips && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
 Maintainer Notes:
 Could support additional CPU architectures and lose the scanignore by building
 the stuff in /jni and moving the three outputs to /assets.

metadata/com.googlecode.gogodroid.txt

@@ -30,8 +30,14 @@ Build:1.3,13
         $$NDK$$/ndk-build && \
         cp libs/armeabi/gogoc ../res/raw
 
+Build:2.0,20
+    commit=2.0
+    build=cd gogoc-android && \
+        $$NDK$$/ndk-build && \
+        cp -a libs/ ../assets
+
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:13
+Current Version:2.0
+Current Version Code:20
 

srclibs/ColorPicker-eolwral.txt

@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/eolwral/android-ColorPickerPreference
+
+

srclibs/Volley.txt

@@ -1,4 +1,4 @@
 Repo Type:git
 Repo:https://android.googlesource.com/platform/frameworks/volley
 
-Prepare:rm -rf tests/
+Prepare:rm -rf tests/ && echo "android.library=true" >> project.properties