[libreoffice] 04/04: add BUILD_DEPS for ENABLE_EXPORT_VALIDATION_TESTS and patch the scripts to use non-downloaded ones...
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 72210c285689188a30d51fdfea1dcdf718cdfd6b
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 19 07:27:23 2016 +0200
add BUILD_DEPS for ENABLE_EXPORT_VALIDATION_TESTS and patch the scripts to use non-downloaded ones...
---
patches/series | 1 +
patches/system-officeotron-and-odfvalidator.diff | 16 ++++++++++++++++
rules | 2 +-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/patches/series b/patches/series
index d75739c..b4b2b00 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
no-packagekit-per-default.diff
+system-officeotron-and-odfvalidator.diff
diff --git a/patches/system-officeotron-and-odfvalidator.diff b/patches/system-officeotron-and-odfvalidator.diff
new file mode 100644
index 0000000..6d4dd73
--- /dev/null
+++ b/patches/system-officeotron-and-odfvalidator.diff
@@ -0,0 +1,16 @@
+diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in
+index 56e2f29..9415ef6 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 7281f1b..6eab5b5 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 "$@"
diff --git a/rules b/rules
index ecf3e34..0caf827 100755
--- a/rules
+++ b/rules
@@ -914,7 +914,7 @@ endif
CONFIGURE_FLAGS += --without-junit
endif
ifeq "$(ENABLE_EXPORT_VALIDATION_TESTS)" "y"
- # FIXME
+ BUILD_DEPS += , libofficeotron-java, libodfvalidator-java
else
CONFIGURE_FLAGS += --without-export-validation
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: