[libreoffice] 02/03: remove mediawiki apache commons (build-)depends and close #800992
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 58ed2cb774ae9ef87eb9123f6a50e3c0afa41b57
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 9 20:45:21 2015 +0200
remove mediawiki apache commons (build-)depends and close #800992
---
changelog | 2 ++
control | 6 ------
rules | 7 -------
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/changelog b/changelog
index 32a2f03..f96a72a 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
libreoffice (1:5.1.0~alpha1~git20151009-1) UNRELEASED; urgency=medium
* New upstream snapshot
+ - uses HttpURLConnection etc. of the JDK instead of commons httpclient
+ in the Wiki Publisher (closes: #800992)
* debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
remove again, we need the functionality for liblibreofficekitgtk.so
diff --git a/control b/control
index 50ce266..342e27d 100644
--- a/control
+++ b/control
@@ -149,9 +149,6 @@ Build-Depends-Indep: doxygen (>= 1.8.4),
fontforge,
libbase-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
libbsh-java,
- libcommons-codec-java [!mips64eb],
- libcommons-httpclient-java [!mips64eb],
- libcommons-lang-java [!mips64eb],
libcommons-logging-java [!mips64eb],
libflute-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
libfonts-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
@@ -4458,9 +4455,6 @@ Depends: ant (>= 1.7.0),
libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2),
- libcommons-codec-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
libcommons-logging-java,
libcppunit-dev (>= 1.13.2-2.1),
libcups2-dev,
diff --git a/rules b/rules
index 6769133..8317f32 100755
--- a/rules
+++ b/rules
@@ -1052,12 +1052,6 @@ export JAVA_HOME
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
CONFIGURE_FLAGS += --enable-ext-wiki-publisher
- ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
- MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS), libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS), libcommons-lang-java$(OOO_NO_JAVA_ARCHS), libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
- MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
- BUILD_DEPS_INDEP += $(MEDIAWIKI_BUILD_DEPS)
- CONFIGURE_FLAGS += --with-commons-codec-jar=/usr/share/java/commons-codec.jar --with-commons-lang-jar=/usr/share/java/commons-lang.jar --with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar --with-commons-logging-jar=/usr/share/java/commons-logging.jar
- endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
@@ -3492,7 +3486,6 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -plibreoffice-wiki-publisher -- \
- -V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: