[libreoffice] 01/01: Revert "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 f7f46aa4b14e663294d4a76bc633e28368344eab
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 19 00:01:47 2017 +0100

    Revert "build-conflict against fonts-liberation <!nocheck>"
    
    As this doesn't really make a difference...
---
 changelog  | 1 -
 control    | 1 -
 control.in | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 7e4da7c..498ae46 100644
--- a/changelog
+++ b/changelog
@@ -26,7 +26,6 @@ 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 b/control
index 6d71770..352e5c6 100644
--- a/control
+++ b/control
@@ -180,7 +180,6 @@ Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
                      rdfind,
                      symlinks
 Build-Conflicts: amd-libopencl1,
-                 fonts-liberation <!nocheck>,
                  g++-4.6 (= 4.6.1-10),
                  g++-4.6 (= 4.6.1-11),
                  g++-4.7 (<< 4.7.1-3),
diff --git a/control.in b/control.in
index ea473c4..ceb4076 100644
--- a/control.in
+++ b/control.in
@@ -11,8 +11,7 @@ Build-Conflicts: g++-4.6 (= 4.6.1-10),
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
                  amd-libopencl1,
-                 nvidia-libopencl1,
-                 fonts-liberation <!nocheck>
+                 nvidia-libopencl1
 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