[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-1-30-g9d69752
The following commit has been merged in the debian-experimental-4.2 branch:
commit 9d6975288505964d640a870115efba95178ef220
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 25 21:22:43 2013 +0200
we now need libwpd >= 0.9.5
diff --git a/control b/control
index 28f2999..d2a311c 100644
--- a/control
+++ b/control
@@ -89,7 +89,7 @@ Build-Depends: ant (>= 1.7.0),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
- libwpd-dev (>= 0.9.0),
+ libwpd-dev (>= 0.9.5),
libwpg-dev (>= 0.2.0),
libwps-dev (>= 0.2.0),
libx11-dev,
@@ -4535,7 +4535,7 @@ Depends: ant (>= 1.7.0),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
- libwpd-dev (>= 0.9.0),
+ libwpd-dev (>= 0.9.5),
libwpg-dev (>= 0.2.0),
libwps-dev (>= 0.2.0),
libx11-dev,
diff --git a/rules b/rules
index 02f0c77..460e06f 100755
--- a/rules
+++ b/rules
@@ -545,7 +545,7 @@ endif
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz libatomic-ops, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz libatomic-ops libwpd,$(SYSTEM_STUFF))
PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
@@ -1011,7 +1011,7 @@ endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libwpd-dev (>= 0.9.0)
+ BUILD_DEPS += , libwpd-dev (>= 0.9.5)
endif
ifneq (,$(filter mythes, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmythes-dev (>= 2:1.2)
--
LibreOffice packaging repository
Reply to: