[libreoffice] 02/03: git update; relax some Document Libration build-deps as they are optional now and checked in the tests (where they were only needed)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit f0c6e738bc8b17f4fe3af6ce1bfc3eeea7516758
Author: Rene Engelhard <rene@debian.org>
Date: Tue Dec 22 22:42:32 2015 +0100
git update; relax some Document Libration build-deps as they are optional now and checked in the tests (where they were only needed)
---
changelog | 2 +-
control | 16 ++++++++--------
rules | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/changelog b/changelog
index 3c5d3b7..50863d3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.2.0~alpha1~git20151217-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20151221-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/control b/control
index a191744..f29c062 100644
--- a/control
+++ b/control
@@ -58,10 +58,10 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
libdconf-dev,
- libe-book-dev (>= 0.1.1),
+ libe-book-dev,
libebook1.2-dev,
libeot-dev,
- libetonyek-dev (>= 0.1.4),
+ libetonyek-dev,
libexpat1-dev,
libexttextcat-dev (>= 3.4.1),
libfontconfig1-dev,
@@ -91,7 +91,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
liblpsolve55-dev (>= 5.5.0.13-5+b1),
libmdds-dev (>= 1.0),
libmspub-dev (>= 0.1),
- libmwaw-dev (>= 0.3.6),
+ libmwaw-dev (>= 0.3.1),
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.3-7),
libmythes-dev (>= 2:1.2),
@@ -119,7 +119,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libvlc5,
libwpd-dev (>= 0.10),
libwpg-dev (>= 0.3),
- libwps-dev (>= 0.4.2),
+ libwps-dev (>= 0.4),
libx11-dev,
libxaw7-dev,
libxext-dev,
@@ -4472,10 +4472,10 @@ Depends: ant (>= 1.7.0),
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
libdconf-dev,
- libe-book-dev (>= 0.1.1),
+ libe-book-dev,
libebook1.2-dev,
libeot-dev,
- libetonyek-dev (>= 0.1.4),
+ libetonyek-dev,
libexpat1-dev,
libexttextcat-dev (>= 3.4.1),
libfontconfig1-dev,
@@ -4504,7 +4504,7 @@ Depends: ant (>= 1.7.0),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
libmdds-dev (>= 1.0),
libmspub-dev (>= 0.1),
- libmwaw-dev (>= 0.3.6),
+ libmwaw-dev (>= 0.3.1),
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.3-7),
libmythes-dev (>= 2:1.2),
@@ -4533,7 +4533,7 @@ Depends: ant (>= 1.7.0),
libvlc5,
libwpd-dev (>= 0.10),
libwpg-dev (>= 0.3),
- libwps-dev (>= 0.4.2),
+ libwps-dev (>= 0.4),
libx11-dev,
libxaw7-dev,
libxext-dev,
diff --git a/rules b/rules
index 6b8b760..bfe090c 100755
--- a/rules
+++ b/rules
@@ -699,7 +699,7 @@ endif
# Debian Jessie
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "jessie-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds glm libwps libetonyek orcus libgltf,$(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out opencollada collada2gltf libcmis mdds glm orcus libgltf,$(SYSTEM_STUFF))
JESSIE_BACKPORT=y
BUILD_DBG_PACKAGE=y
BUILD_DDEBS=n
@@ -1159,7 +1159,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
BUILD_DEPS += , libmythes-dev (>= 2:1.2)
endif
ifneq (,$(filter libwps, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libwps-dev (>= 0.4.2)
+ BUILD_DEPS += , libwps-dev (>= 0.4)
endif
ifneq (,$(filter libwpg, $(SYSTEM_STUFF)))
BUILD_DEPS += , libwpg-dev (>= 0.3)
@@ -1174,13 +1174,13 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
BUILD_DEPS += , libmspub-dev (>= 0.1)
endif
ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmwaw-dev (>= 0.3.6)
+ BUILD_DEPS += , libmwaw-dev (>= 0.3.1)
endif
ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
BUILD_DEPS += , libodfgen-dev (>= 0.1)
endif
ifneq (,$(filter libetonyek, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libetonyek-dev (>= 0.1.4)
+ BUILD_DEPS += , libetonyek-dev
endif
ifneq (,$(filter libfreehand, $(SYSTEM_STUFF)))
BUILD_DEPS += , libfreehand-dev (>= 0.1)
@@ -1192,7 +1192,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
BUILD_DEPS += , libpagemaker-dev
endif
ifneq (,$(filter libebook, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libe-book-dev (>= 0.1.1)
+ BUILD_DEPS += , libe-book-dev
endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev (>= $(LIBCMIS_MINVER))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: