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

This commit is contained in:
Daniel Martí 2014-02-17 09:11:27 +01:00
commit 114bc0b281
2 changed files with 22 additions and 6 deletions

View file

@ -19,6 +19,8 @@ Description:
* Themes
This build doesn't include SILK (Skype) support.
[https://code.google.com/p/csipsimple/wiki/ChangeLog ChangeLog]
.
Repo Type:git-svn

View file

@ -49,7 +49,7 @@ Build:0.5.4,69
Build:0.6.0,72
commit=v0.6.0
srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1
srclibs=ActionBarSherlock@4.2.0,DragSort@0.6.1
prebuild=sed -i 's/make -j4/make -j2/g' scripts/* && \
rm custom_rules.xml && \
chmod +x scripts/build-ffmpeg.sh && \
@ -61,7 +61,7 @@ Build:0.6.0,72
Build:0.6.3,78
commit=v0.6.3
srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2
srclibs=ActionBarSherlock@4.2.0,DragSort@0.6.1,Streamscraper@f01d9ac64629,Jericho@3.2
prebuild=cp $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
rm libs/streamscraper.jar && \
cp -r $$Streamscraper$$/src/net/moraleboost/ src/net/ && \
@ -77,7 +77,7 @@ Build:0.6.3,78
Build:0.6.6,90
commit=v0.6.6
srclibs=1:appcompat@ad5a63f;Streamscraper@f01d9ac64629;Jericho@3.3
srclibs=1:appcompat@ad5a63f,Streamscraper@f01d9ac64629,Jericho@3.3
prebuild=cp $$appcompat$$/libs/android-support-v4.jar libs/ && \
cp $$appcompat$$/libs/android-support-v7-appcompat.jar libs/ && \
rm libs/streamscraper.jar && \
@ -92,7 +92,7 @@ Build:0.6.6,90
Build:0.6.7,97
commit=v0.6.7
srclibs=1:appcompat@ad5a63f;Jericho@3.3
srclibs=1:appcompat@ad5a63f,Jericho@3.3
prebuild=cp $$appcompat$$/libs/android-support-v4.jar libs/ && \
cp $$appcompat$$/libs/android-support-v7-appcompat.jar libs/ && \
cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
@ -103,8 +103,22 @@ Build:0.6.7,97
build=./scripts/build-ffmpeg.sh
buildjni=yes
Build:0.6.8,98
commit=v0.6.8
srclibs=1:appcompat@ad5a63f,Jericho@3.3
prebuild=cp $$appcompat$$/libs/android-support-v4.jar libs/ && \
cp $$appcompat$$/libs/android-support-v7-appcompat.jar libs/ && \
cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
cp $$Jericho$$/compile-time-dependencies/* libs/ && \
sed -i 's/make -j4/make -j2/g' scripts/* && \
rm custom_rules.xml && \
echo ndk.dir=$$NDK$$ >> local.properties && \
chmod +x scripts/build-ffmpeg.sh
build=./scripts/build-ffmpeg.sh
buildjni=yes
Auto Update Mode:Version v%v
Update Check Mode:Tags
Current Version:0.6.7
Current Version Code:97
Current Version:0.6.8
Current Version Code:98