Merge branch 'conversations' into 'master'
Update Conversations to 0.2.2 (13)
This commit is contained in:
commit
4fa16f577a
|
@ -21,9 +21,6 @@ Noteable XEPs:
|
||||||
* XEP-0198: Stream Management
|
* XEP-0198: Stream Management
|
||||||
* XEP-0280: Message Carbons
|
* XEP-0280: Message Carbons
|
||||||
* XEP-0237: Roster Versioning
|
* XEP-0237: Roster Versioning
|
||||||
|
|
||||||
This app uses precompiled binary libraries verified to match their
|
|
||||||
upstream hashes.
|
|
||||||
.
|
.
|
||||||
|
|
||||||
Repo Type:git
|
Repo Type:git
|
||||||
|
@ -37,27 +34,42 @@ Build:0.1.3,9
|
||||||
srclibs=Otr4j-jitsi@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50
|
srclibs=Otr4j-jitsi@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50
|
||||||
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
|
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
|
||||||
|
|
||||||
Maintainer Notes:
|
Build:0.2.1,12
|
||||||
0.1.3,9 uses precompiled open-source jars that have been verified to match
|
commit=0.2.1
|
||||||
hashes from upstream. An upcomming 0.1.4 should be build according to the
|
|
||||||
following recipe:
|
|
||||||
|
|
||||||
Build:0.1.4,10
|
|
||||||
disable=not released, works for 0.1.3
|
|
||||||
srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50
|
|
||||||
commit=0.1.4
|
|
||||||
submodules=yes
|
submodules=yes
|
||||||
rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar
|
rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar
|
||||||
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
|
srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50
|
||||||
prebuild=pushd $$BouncyCastle$$ && \
|
prebuild=pushd $$BouncyCastle$$ && \
|
||||||
ant -f ant/jdk15+.xml build-provider && \
|
ant -f ant/jdk15+.xml build-provider && \
|
||||||
popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \
|
popd && \
|
||||||
|
cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \
|
||||||
pushd $$Otr4j-jitsi$$ && \
|
pushd $$Otr4j-jitsi$$ && \
|
||||||
mvn clean && mvn package && popd && \
|
mvn clean && \
|
||||||
|
mvn package && \
|
||||||
|
popd && \
|
||||||
cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
|
cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
|
||||||
|
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
|
||||||
|
|
||||||
Remove notice in the description as well, if 0.1.4 is build from completly from
|
Build:0.2.2,13
|
||||||
source. 0.1.3 should be disabled after some time afterwards.
|
commit=0.2.2
|
||||||
|
submodules=yes
|
||||||
|
rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar
|
||||||
|
srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50
|
||||||
|
prebuild=pushd $$BouncyCastle$$ && \
|
||||||
|
ant -f ant/jdk15+.xml build-provider && \
|
||||||
|
popd && \
|
||||||
|
cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \
|
||||||
|
pushd $$Otr4j-jitsi$$ && \
|
||||||
|
mvn clean && \
|
||||||
|
mvn package && \
|
||||||
|
popd && \
|
||||||
|
cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
|
||||||
|
scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
|
||||||
|
|
||||||
|
|
||||||
|
Maintainer Notes:
|
||||||
|
0.1.3 should be disabled some time after source-built 0.2.1 is deployed and
|
||||||
|
known-good.
|
||||||
.
|
.
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
|
|
Loading…
Reference in a new issue