[libreoffice] 02/03: help backports
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 7 19:16:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit fe4b1748be81daf1cfdde1e5fd9c12a69f38e18f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Tue Nov 7 19:03:28 2017 +0000
help backports
---
control | 2 +-
rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/control b/control
index a1e0e75..55cc7a7 100644
--- a/control
+++ b/control
@@ -149,7 +149,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
lp-solve (>= 5.5.0.13-5+b1),
maven-repo-helper,
opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
- openjdk-9-jdk (>= 9.0.1+11-1) [i386],
+ openjdk-9-jdk (>= 9.0.1+11-1~) [i386],
pkg-config,
pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
python3,
diff --git a/rules b/rules
index 88efb1e..872e303 100755
--- a/rules
+++ b/rules
@@ -1050,7 +1050,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq (i386,$(findstring i386,$(OOO_JAVA_ARCHS)))
# BUILD_DEPS += , default-jdk (>= 1:1.9) [i386]
# hack.
- BUILD_DEPS += , openjdk-9-jdk (>= 9.0.1+11-1) [i386]
+ BUILD_DEPS += , openjdk-9-jdk (>= 9.0.1+11-1~) [i386]
endif
ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list