[libreoffice] 01/01: work around failure on experimental buildds by build-conflicting against firebird-dev (>= 3.0)
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 f526f05eb307a60808c1d41873ef4ab4adb78a18
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 8 10:06:26 2015 +0100
work around failure on experimental buildds by build-conflicting against firebird-dev (>= 3.0)
---
changelog | 9 +++++++++
rules | 6 ++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index a6f4242..80c36b7 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:5.1.0~alpha1-4) experimental; urgency=medium
+
+ * debian/rules:
+ - work around the experimental buildds' resolver bug installing
+ experimental packages per default where they shouldn't and add
+ firebird-dev (>= 3.0) Build-Conflicts:
+
+ -- Rene Engelhard <rene@debian.org> Sun, 08 Nov 2015 10:04:31 +0100
+
libreoffice (1:5.1.0~alpha1-3) experimental; urgency=medium
* debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
diff --git a/rules b/rules
index bd13cbf..804c30c 100755
--- a/rules
+++ b/rules
@@ -1293,8 +1293,6 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS)
- # no FIREBIRD_CFLAGS here. Have no effect as fb_config is there
- # and configure prefers that over our values...
endif
else
CONFIGURE_FLAGS += --disable-firebird-sdbc
@@ -1826,6 +1824,10 @@ ifneq "$(USE_MARIADB)" "y"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
endif
+ifeq "$(ENABLE_FIREBIRD)" "y"
+ perl -pi -e "s/(Build-Conflicts: .*)/\1,firebird-dev (>= 3.0),/" debian/control
+endif
+
ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: