Merge branch 'conversations' of https://gitlab.com/krt/fdroiddata

This commit is contained in:
Daniel Martí 2014-04-27 14:11:58 +02:00
commit cd118f0b69
2 changed files with 33 additions and 15 deletions

View file

@ -38,26 +38,29 @@ Build:0.1.3,9
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
Maintainer Notes: Maintainer Notes:
0.1.3,9 uses precompiled open-source jars that have been verified to match
hashes from upstream. An upcomming 0.1.4 should be build according to the
following recipe:
This app uses precompiled open-source jars that have been verified to Build:0.1.4,10
match hashes from upstream. disable=not released, works for 0.1.3
srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50
HASHES MUST BE RE-CHECKED ON CHANGE! commit=0.1.4
submodules=yes
However, we should built thoses jars from sourc asap, like: rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
rm=libs/android-support-v4.jar,libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar prebuild=pushd $$BouncyCastle$$ && \
prebuild=pushd $$BouncyCastle$$ && gradle jar && popd && cp $$BouncyCastle$$/prov/build/libs/* libs/ && \ ant -f ant/jdk15+.xml build-provider && \
cp -r $$Otr4j-jitsi$$/src/main src/ popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \
pushd $$Otr4j-jitsi$$ && \
Commits for otr4j: mvn clean && mvn package && popd && \
otr4j-0.10 33d95bb3710986d048fb4cbe42dc991f9ddd9de2 cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
otr4j-HEAD 6d879761605dba48c80c0d3f44a6555b522d0c2e
Remove notice in the description as well, if 0.1.4 is build from completly from
source. 0.1.3 should be disabled after some time afterwards.
. .
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:0.1.3 Current Version:0.1.3
Current Version Code:9 Current Version Code:9

15
srclibs/SpongyCastle.txt Normal file
View file

@ -0,0 +1,15 @@
# Source details (the only mandatory fields)
Repo Type:git
Repo:https://github.com/rtyley/spongycastle.git
# Comma-separated list of subdirs to use. The first existing subdirectory
# found between those given will be used. If none is found or provided, the
# root of the repo directory will be used instead.
Subdir:
# Any extra commands to prepare the source library
Prepare:
# If given "Yes", "android update project -p ." will be executed
Update Project: