[libreoffice] 02/02: Revert "another experimental buildd workaround: Build-Conflict against libmdds-dev (>= 1.0)"
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 a4b8ed48031e8c7d5241285ea17bdfd9d6a610f8
Author: Rene Engelhard <rene@debian.org>
Date: Wed Dec 23 13:09:46 2015 +0100
Revert "another experimental buildd workaround: Build-Conflict against libmdds-dev (>= 1.0)"
This reverts commit 8ecac4d698ce77e62fcfa9b478abf29c958ba174.
---
control | 1 -
rules | 4 ----
2 files changed, 5 deletions(-)
diff --git a/control b/control
index d2acc93..f96c2cf 100644
--- a/control
+++ b/control
@@ -179,7 +179,6 @@ Build-Conflicts: amd-libopencl1,
libc6-dev (= 2.6.1-4) [i386 amd64],
libcairo2 (= 1.4.8-1),
libmariadbclient-dev,
- libmdds-dev (>= 1.0),
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
diff --git a/rules b/rules
index 7c6e8fe..1f9120a 100755
--- a/rules
+++ b/rules
@@ -1829,10 +1829,6 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
perl -pi -e "s/(Build-Conflicts: .*)/\1,firebird-dev (>= 3.0),/" debian/control
endif
-ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- perl -pi -e "s/(Build-Conflicts: .*)/\1,libmdds-dev (>= 1.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: