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

Conflicts:
	metadata/de.danoeh.antennapod.txt
This commit is contained in:
Ciaran Gultnieks 2012-10-24 16:06:46 +01:00
commit 62bfcb4758
2 changed files with 6 additions and 3 deletions

View file

@ -14,11 +14,12 @@ The app downloads binaries from botbrew.com.
Repo Type:git Repo Type:git
Repo:https://github.com/jyio/botbrew-gui.git Repo:https://github.com/jyio/botbrew-gui.git
Build Version:0.0.1.23,23,32698170dd,buildjni=yes,extlibs=acra/acra-4.2.3.jar,\ Build Version:0.0.1.23,23,32698170dd,buildjni=no,target=android-15,extlibs=acra/acra-4.2.3.jar,\
srclibs=ActionBarSherlock@4.0.1;ViewPagerIndicator@2.2.3;EmulatorView@v1.0.43,\ srclibs=ActionBarSherlock@4.0.1;ViewPagerIndicator@2.2.3;EmulatorView@v1.0.43,\
prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \ sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
sed -i 's@\(android.library.reference.3=\).*@\1$$EmulatorView$$@' project.properties,target=android-15 sed -i 's@\(android.library.reference.3=\).*@\1$$EmulatorView$$@' project.properties && \
sed -i 's@~/android-ndk-r8@$$NDK$$@g' mkjni.sh && ./mkjni.sh
Build Version:0.0.1.24,24,!can't find apk 733293d904,buildjni=no,maven=yes,prebuild=\ Build Version:0.0.1.24,24,!can't find apk 733293d904,buildjni=no,maven=yes,prebuild=\
./external.sh && sed -i 's@~/android-ndk-r8b@$$NDK$$@g' mkjni.sh && ./mkjni.sh ./external.sh && sed -i 's@~/android-ndk-r8b@$$NDK$$@g' mkjni.sh && ./mkjni.sh

View file

@ -46,7 +46,9 @@ extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;common
prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \ sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
Build Version:0.9.5.3,20,0.9.5.3,srclibs=ActionBarSherlock@6e3f2bb5;ViewPagerIndicator@65457e,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar Build Version:0.9.5.3,20,0.9.5.3,maven=yes,prebuild=\
cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && \
mvn install:install-file -Dfile=$$SDK$$/tools/support/annotations.jar -DgroupId=android.tools.support -DartifactId=annotations -Dversion=1.0 -Dpackaging=jar
Auto Update Mode:Version %v Auto Update Mode:Version %v
Update Check Mode:Tags Update Check Mode:Tags