[libreoffice] 01/02: use servlet3.1 and actually build-depend on it when using internal hsqldb
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 2ee7cad8f33d93e0630d03ff73150f74135ffff1
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 9 21:08:16 2015 +0200
use servlet3.1 and actually build-depend on it when using internal hsqldb
---
changelog | 4 +++-
patches/fix-internal-hsqldb-build.diff | 4 ++--
rules | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 89c2600..06b7711 100644
--- a/changelog
+++ b/changelog
@@ -15,10 +15,12 @@ libreoffice (1:5.0.3~rc1-1) UNRELEASED; urgency=medium
+ add various dependencies on fallback to the various -style-*
+ suggest -breeze instead of -crystal in common, crystal is disabled
+ depend on -style-default in libreoffice-core
+ * debian/rules, debian/patches/fix-internal-hsqldb-build.diff: use servlet3.1
+ and actually build-depend on it (again) if using internal hsqldb
* debian/control.subsequentcheckbase.in:
- remove hardcoded dependency openjdk-7-jdk; we get default-jdk in anyway
- -- Rene Engelhard <rene@debian.org> Thu, 08 Oct 2015 00:06:31 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 09 Oct 2015 21:08:40 +0200
libreoffice (1:5.0.2-1) unstable; urgency=medium
diff --git a/patches/fix-internal-hsqldb-build.diff b/patches/fix-internal-hsqldb-build.diff
index e44ed86..448269e 100644
--- a/patches/fix-internal-hsqldb-build.diff
+++ b/patches/fix-internal-hsqldb-build.diff
@@ -18,7 +18,7 @@ diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff hsqldb/patches/use-
+ ${src}/org/hsqldb/util/SqlTool.java"
+ destdir="${basedir}/doc/src"
+- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
-++ classpath="/usr/share/java/servlet-api-3.0.jar;${basedir}/lib/junit.jar"
+++ classpath="/usr/share/java/servlet-api-3.1.jar;${basedir}/lib/junit.jar"
+ author="true"
+ version="false"
+ use="true"
@@ -27,7 +27,7 @@ diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff hsqldb/patches/use-
+ sourcepath="${src}"
+ destdir="${basedir}/doc/src"
+- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
-++ classpath="/usr/share/java/servlet-api-3.0.jar;${basedir}/lib/junit.jar"
+++ classpath="/usr/share/java/servlet-api-3.1.jar;${basedir}/lib/junit.jar"
+ author="true"
+ version="false"
+ use="true"
diff --git a/rules b/rules
index 1b80471..e8648d7 100755
--- a/rules
+++ b/rules
@@ -1346,6 +1346,7 @@ ifeq "$(ENABLE_JAVA)" "y"
# hsqldb with jdk7 buildfix from jdk7.diff fails with gcj
$(error hsqldb with jdk7 buildfix from jdk7.diff fails with gcj)
endif
+ BUILD_DEPS += , libservlet3.1-java
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: