[libreoffice] 03/06: build-conflict against fonts-liberation <!nocheck>

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit b9251c845d2c8e64a8508fb1f48003b356cfb526
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 18 23:08:14 2017 +0100

    build-conflict against fonts-liberation <!nocheck>
---
 changelog  | 1 +
 control.in | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 498ae46..7e4da7c 100644
--- a/changelog
+++ b/changelog
@@ -26,6 +26,7 @@ libreoffice (1:6.0.0~rc1~git20171218-1) UNRELEASED; urgency=medium
     - remove fonts-noto-unhinted from Recommends: again per
       upstream suggestion
     - recommend both fonts-liberation (LO ships 2 + Narrow from 1)
+    - build-conflict against fonts-liberation <!nocheck>
   * debian/rules, debian/control.in: recommend and build-depend against
     fonts-liberation2 instead of fonts-liberation since that is actually
     what LO upstream ships (see above)
diff --git a/control.in b/control.in
index 5e8db60..84cfe59 100644
--- a/control.in
+++ b/control.in
@@ -11,7 +11,8 @@ Build-Conflicts: g++-4.6 (= 4.6.1-10),
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
                  amd-libopencl1,
-                 nvidia-libopencl1
+                 nvidia-libopencl1,
+                 fonts-liberation <!nocheck>
 Standards-Version: 4.0.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git