From 4c1721ac5ae5409ac58c765ab737e33614c67124 Mon Sep 17 00:00:00 2001
From: F-Droid Builder <admin@f-droid.org>
Date: Mon, 26 Jan 2015 03:11:31 +0000
Subject: [PATCH] Update CV of Lumicall to 1.11.11 (166)

---
 metadata/org.lumicall.android.txt | 72 +++++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/metadata/org.lumicall.android.txt b/metadata/org.lumicall.android.txt
index 06ecd76318..1016e13533 100644
--- a/metadata/org.lumicall.android.txt
+++ b/metadata/org.lumicall.android.txt
@@ -154,35 +154,71 @@ Build:1.11.6,161
 Build:1.11.10,165
     disable=zrtp not building
     commit=1.11.10
-    buildjni=yes
     submodules=yes
-    extlibs=android/android-support-v4.jar
-    srclibs=PBKDF2@v1.1.0,dnsjava@dnsjava-2.1.6,RemoteTea@release-1.1.0,libphonenumber@libphonenumber-7.0.2 
+    srclibs=PBKDF2@v1.1.0,dnsjava@dnsjava-2.1.6,RemoteTea@release-1.1.0,libphonenumber@libphonenumber-7.0.2
     rm=libs/*.jar
+    extlibs=android/android-support-v4.jar
     prebuild=cp assets/app.properties-prod app.properties && \
         echo "project.target.apilevel=8" > ant.properties && \
         sed -i -e '/<dependency/,/\/>/d' custom_rules.xml && \
-        mv zrtp zorg-java && mkdir zrtp && mv zorg-java zrtp/ && \
-        pushd $$PBKDF2$$ && gradle install && popd && cp $$PBKDF2$$/build/libs/PBKDF2-1.1.0.jar libs/ && \
-        pushd $$dnsjava$$ && ant jar && popd && cp $$dnsjava$$/dnsjava-*.jar libs/ && \
-        pushd $$libphonenumber$$/java/ && $$MVN3$$ package && popd && cp $$libphonenumber$$/java/libphonenumber/target/libphonenumber-7.0.2.jar libs/ && \
-        pushd $$RemoteTea$$ && ant -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 jar && popd && cp $$RemoteTea$$/classes/oncrpc*jar libs/oncrpc-1.0.7.jar && cp libs/oncrpc-1.0.7.jar gmetric4j/lib/oncrpc-1.0.7.jar
+        mv zrtp zorg-java && \
+        mkdir zrtp && \
+        mv zorg-java zrtp/ && \
+        pushd $$PBKDF2$$ && \
+        gradle install && \
+        popd && \
+        cp $$PBKDF2$$/build/libs/PBKDF2-1.1.0.jar libs/ && \
+        pushd $$dnsjava$$ && \
+        ant jar && \
+        popd && \
+        cp $$dnsjava$$/dnsjava-*.jar libs/ && \
+        pushd $$libphonenumber$$/java/ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$libphonenumber$$/java/libphonenumber/target/libphonenumber-7.0.2.jar libs/ && \
+        pushd $$RemoteTea$$ && \
+        ant -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 jar && \
+        popd && \
+        cp $$RemoteTea$$/classes/oncrpc*jar libs/oncrpc-1.0.7.jar && \
+        cp libs/oncrpc-1.0.7.jar gmetric4j/lib/oncrpc-1.0.7.jar
+    buildjni=yes
 
 Build:1.11.11,166
     commit=b77763126bbefa70868b17ce2195448dd5334360
-    buildjni=yes
     submodules=yes
-    extlibs=android/android-support-v4.jar
     srclibs=PBKDF2@v1.1.0,dnsjava@dnsjava-2.1.6,RemoteTea@release-1.1.0,libphonenumber@libphonenumber-7.0.2,JUnit@r4.12,weupnp@weupnp-0.1.2
     rm=libs/*.jar,opentelecoms.org-util/lib/*.jar,gmetric4j/lib/*.jar,ice4j/lib/weupnp*.jar,ice4j/libs/junit.jar
+    extlibs=android/android-support-v4.jar
     prebuild=cp assets/app.properties-prod app.properties && \
         echo "project.target.apilevel=8" > ant.properties && \
-        pushd $$PBKDF2$$ && gradle install && popd && cp $$PBKDF2$$/build/libs/PBKDF2-1.1.0.jar libs/ && \
-        pushd $$dnsjava$$ && ant jar && popd && cp $$dnsjava$$/dnsjava-2.1.6.jar libs/ && cp libs/dnsjava-2.1.6.jar opentelecoms.org-util/lib/dnsjava-2.1.1.jar && \
-        pushd $$libphonenumber$$/java/ && $$MVN3$$ package && popd && cp $$libphonenumber$$/java/libphonenumber/target/libphonenumber-7.0.2.jar libs/ && \
-        pushd $$RemoteTea$$ && ant -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 jar && popd && cp $$RemoteTea$$/classes/oncrpc*jar libs/oncrpc-1.0.7.jar && cp libs/oncrpc-1.0.7.jar gmetric4j/lib/ && \
-        pushd $$weupnp$$ && $$MVN3$$ package && popd && cp $$weupnp$$/target/weupnp-0.1.2.jar ice4j/lib/weupnp-0.1.2-SNAPSHOT.jar && \
-        pushd $$JUnit$$ && $$MVN3$$ package && popd && cp $$JUnit$$/target/junit-4.12.jar ice4j/lib/junit.jar && cp ice4j/lib/junit.jar gmetric4j/lib/junit-4.1.jar
+        pushd $$PBKDF2$$ && \
+        gradle install && \
+        popd && \
+        cp $$PBKDF2$$/build/libs/PBKDF2-1.1.0.jar libs/ && \
+        pushd $$dnsjava$$ && \
+        ant jar && \
+        popd && \
+        cp $$dnsjava$$/dnsjava-2.1.6.jar libs/ && \
+        cp libs/dnsjava-2.1.6.jar opentelecoms.org-util/lib/dnsjava-2.1.1.jar && \
+        pushd $$libphonenumber$$/java/ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$libphonenumber$$/java/libphonenumber/target/libphonenumber-7.0.2.jar libs/ && \
+        pushd $$RemoteTea$$ && \
+        ant -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 jar && \
+        popd && \
+        cp $$RemoteTea$$/classes/oncrpc*jar libs/oncrpc-1.0.7.jar && \
+        cp libs/oncrpc-1.0.7.jar gmetric4j/lib/ && \
+        pushd $$weupnp$$ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$weupnp$$/target/weupnp-0.1.2.jar ice4j/lib/weupnp-0.1.2-SNAPSHOT.jar && \
+        pushd $$JUnit$$ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$JUnit$$/target/junit-4.12.jar ice4j/lib/junit.jar && \
+        cp ice4j/lib/junit.jar gmetric4j/lib/junit-4.1.jar
+    buildjni=yes
 
 Maintainer Notes:
 * oncrpc 1.0.7 is 7dda2ba52e7d999c52648ead1e747dd7ca64325c ; last/only tag is release-1.1.0
@@ -195,6 +231,6 @@ Maintainer Notes:
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.11.10
-Current Version Code:165
+Current Version:1.11.11
+Current Version Code:166