This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 7e1cef53ef0129593758ff90985e912d6c845028
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 16 05:19:22 2016 +0200
also update libmariadbclient-dev Build-Conflicts:
---
rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules b/rules
index aeb5ab3..ccbeefd 100755
--- a/rules
+++ b/rules
@@ -1870,7 +1870,7 @@ ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
endif
perl -pi -e 's/Package: libreoffice-help-en-us/Package:
libreoffice-help-en-us\nReplaces: libreoffice-common (<< 1:3.0.0~dev300m28)/'
debian/control
-ifneq "$(USE_MARIADB)" "y"
+ifeq "$(MYSQL_FLAVOUR)" "mysql"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/"
debian/control
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
