From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 23 Jul 2018 18:54:04 +0000 (+0100)
Subject: system-officeotron-and-odfvalidator
X-Git-Tag: archive/raspbian/1%6.1.0_rc2-3+rpi1~1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bdc253edcb77d93358f25c268c1d369a047e7712;p=libreoffice.git

system-officeotron-and-odfvalidator


Gbp-Pq: Name system-officeotron-and-odfvalidator.diff
---

diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in
index 56e2f2985f0..451af10a7be 100644
--- a/bin/odfvalidator.sh.in
+++ b/bin/odfvalidator.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ -e "$@"
+java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar /usr/share/java/odfvalidator.jar -e "$@"
diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in
index 7281f1bcd17..6eab5b5cdc6 100644
--- a/bin/officeotron.sh.in
+++ b/bin/officeotron.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@"
+java -jar /usr/share/java/officeotron.jar "$@"