[libreoffice] 01/01: Archive::Zip usage is removed (except in the hsqldb version check)
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 1a418abb970aee027c64c661dc7f11f51ba747e7
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 4 11:28:57 2016 +0200
Archive::Zip usage is removed (except in the hsqldb version check)
---
control | 2 +-
rules | 3 +--
tests/control | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/control b/control
index 77f7ce4..6bef32a 100644
--- a/control
+++ b/control
@@ -39,7 +39,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
junit4 (>= 4.8.2-2) [!kfreebsd-any],
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
- libarchive-zip-perl,
+ libarchive-zip-perl [!mips64],
libavahi-client-dev,
libbluetooth-dev [linux-any],
libboost-date-time-dev (>= 1.58),
diff --git a/rules b/rules
index ae845eb..039cec6 100755
--- a/rules
+++ b/rules
@@ -92,7 +92,6 @@ BUILD_DEPS=\
fastjar,\
flex (>= 2.3.35), \
gperf,\
- libarchive-zip-perl,\
libc0.1 (>= 2.10.2-7) [kfreebsd-any],\
libcups2-dev,\
libfontconfig1-dev,\
@@ -1384,7 +1383,7 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS += , libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS), libarchive-zip-perl$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb1.8.0-java $(HSQLDB_MINVER)
JAVA_GCJ_DEPENDS += , libhsqldb1.8.0-java-gcj [$(OOO_GCJ_ARCHS)]
CONFIGURE_FLAGS += --with-hsqldb-jar=$(HSQLDB_JAR)
diff --git a/tests/control b/tests/control
index daceace..4b22362 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: