Merge branch 'patch-1' into 'master'

Web Opac: GitHub repository moved to an organization, Update to 4.3.6

The move apparingly broke auto updating.

See merge request !1152
This commit is contained in:
Daniel Martí 2016-01-18 12:44:17 +00:00
commit 83eb011e54

View file

@ -1,8 +1,8 @@
Categories:Reading Categories:Reading
License:MIT License:MIT
Web Site:http://opacapp.de Web Site:https://opacapp.net
Source Code:https://github.com/raphaelm/opacclient Source Code:https://github.com/opacapp/opacclient
Issue Tracker:https://github.com/raphaelm/opacclient/issues Issue Tracker:https://github.com/opacapp/opacclient/issues
Auto Name:Web Opac Auto Name:Web Opac
Summary:German public libraries Summary:German public libraries
@ -675,13 +675,17 @@ Build:4.3.5,134
sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \ sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \
sed -i -e '/fileTree/acompile "org.bouncycastle:bcprov-jdk15on:1.51"' -e '/fileTree/acompile "org.apache.directory.studio:org.apache.commons.codec:1.6"' -e '/fileTree/acompile "commons-logging:commons-logging:1.1.3"' -e '/fileTree/acompile "org.apache.httpcomponents:fluent-hc:4.3.3"' -e '/fileTree/acompile "org.apache.httpcomponents:httpclient:4.3.3"' -e '/fileTree/acompile "org.apache.httpcomponents:httpclient-cache:4.3.3"' -e '/fileTree/acompile "org.apache.httpcomponents:httpcore:4.3.2"' -e '/fileTree/acompile "org.apache.httpcomponents:httpmime:4.3.3"' -e '/fileTree/acompile "org.json:json:20141113"' ../meaningdetector/build.gradle sed -i -e '/fileTree/acompile "org.bouncycastle:bcprov-jdk15on:1.51"' -e '/fileTree/acompile "org.apache.directory.studio:org.apache.commons.codec:1.6"' -e '/fileTree/acompile "commons-logging:commons-logging:1.1.3"' -e '/fileTree/acompile "org.apache.httpcomponents:fluent-hc:4.3.3"' -e '/fileTree/acompile "org.apache.httpcomponents:httpclient:4.3.3"' -e '/fileTree/acompile "org.apache.httpcomponents:httpclient-cache:4.3.3"' -e '/fileTree/acompile "org.apache.httpcomponents:httpcore:4.3.2"' -e '/fileTree/acompile "org.apache.httpcomponents:httpmime:4.3.3"' -e '/fileTree/acompile "org.json:json:20141113"' ../meaningdetector/build.gradle
Maintainer Notes: Build:4.3.6,135
4.0.4+ shouldn't need gradle changes for meaningdetector, see commit=4.3.6-fdroid
https://github.com/raphaelm/opacclient/issues/296 . subdir=opacclient/opacapp
. submodules=yes
gradle=yes
srclibs=Endless@v1.2.3,CWACAdapter@v1.0.1
prebuild=cp -fR $$Endless$$/src/com src/main/java/ && \
cp -fR $$CWACAdapter$$/src/com src/main/java/ && \
sed -i -e '/endless/d' -e '/adapter/d' build.gradle
Auto Update Mode:None Auto Update Mode:Version %v
# Auto Update Mode:Version %v
Update Check Mode:Tags Update Check Mode:Tags
Current Version:4.3.6 Current Version:4.3.6
Current Version Code:135 Current Version Code:135