[libreoffice] 02/03: bump libwps (test) build-dependency

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.1
in repository libreoffice.

commit 69b87e968198036db58d363e17f47259a6bf7d63
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Nov 29 19:00:40 2017 +0100

    bump libwps (test) build-dependency
---
 control                 |  2 +-
 patches/odk-no-dot.diff | 26 --------------------------
 rules                   |  2 +-
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/control b/control
index 7243d39..f8ebe33 100644
--- a/control
+++ b/control
@@ -130,7 +130,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libwpd-dev (>= 0.10),
                libwpg-dev (>= 0.3),
                libwps-dev (>= 0.4),
-               libwps-dev (>= 0.4.6) <!nocheck>,
+               libwps-dev (>= 0.4.8) <!nocheck>,
                libx11-dev,
                libxaw7-dev,
                libxext-dev,
diff --git a/patches/odk-no-dot.diff b/patches/odk-no-dot.diff
deleted file mode 100644
index ec83515..0000000
--- a/patches/odk-no-dot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
-index 2519f1b..147d59f 100644
---- a/odk/docs/cpp/Doxyfile
-+++ b/odk/docs/cpp/Doxyfile
-@@ -29,6 +29,8 @@ HTML_OUTPUT = .
- 
- GENERATE_LATEX = NO
- 
-+HAVE_DOT = NO
-+
- ALIASES = "derive=\par Derive: \n"
- 
- MACRO_EXPANSION = YES
-diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
-index c065b33..6b415bf 100644
---- a/odk/docs/idl/Doxyfile
-+++ b/odk/docs/idl/Doxyfile
-@@ -17,6 +17,8 @@ GENERATE_HTML = YES
- HTML_TIMESTAMP = NO
- GENERATE_LATEX = NO
- 
-+HAVE_DOT = NO
-+
- QUIET = %
- WARNINGS = YES
- WARN_IF_DOC_ERROR = YES
diff --git a/rules b/rules
index 9f47224..b16dec2 100755
--- a/rules
+++ b/rules
@@ -1191,7 +1191,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
   endif
   ifneq (,$(filter libwps, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libwps-dev (>= 0.4)
-	BUILD_DEPS += , libwps-dev (>= 0.4.6) <!nocheck>
+	BUILD_DEPS += , libwps-dev (>= 0.4.8) <!nocheck>
   endif
   ifneq (,$(filter libwpg, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libwpg-dev (>= 0.3)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git