[libreoffice] 01/05: Drop (really) old {Build-,}Conflicts

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 95f4fd268cbd79f02a81da54751e619051adbad3
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sun Aug 6 13:34:08 2017 +0200

    Drop (really) old {Build-,}Conflicts
---
 control         | 15 +--------------
 control.gtk2.in |  1 -
 control.in      | 14 +-------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/control b/control
index 52ab2d4..bdb3eb1 100644
--- a/control
+++ b/control
@@ -178,22 +178,12 @@ Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
                      rdfind,
                      symlinks
 Build-Conflicts: amd-libopencl1,
-                 flex (= 2.5.34-1) [amd64],
                  g++-4.6 (= 4.6.1-10),
                  g++-4.6 (= 4.6.1-11),
                  g++-4.7 (<< 4.7.1-3),
-                 gcj-4.2 (= 4.2.2-6),
-                 gjdoc (= 0.7.8-2),
-                 libboost1.39-dev (<< 1.39.0-2),
-                 libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
-                 libc6-dev (= 2.6.1-3) [i386 amd64],
-                 libc6-dev (= 2.6.1-4) [i386 amd64],
-                 libcairo2 (= 1.4.8-1),
-                 libxul-dev (= 1.8.0.13~pre070720-0etch1),
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
-                 nvidia-libopencl1,
-                 qt3-dev-tools
+                 nvidia-libopencl1
 Standards-Version: 4.0.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
@@ -367,8 +357,6 @@ Breaks: browser-plugin-libreoffice,
         hunspell-sr (<< 1:3.1.0-3),
         hunspell-uz (<< 0.6-3.1),
         hunspell-vi (<< 1:3.1.0-3),
-        libcairo2 (= 1.4.8-1),
-        libicu38 (= 3.8~d01-1),
         libreoffice-base (<< ${binary:Version}),
         libreoffice-calc (<< ${binary:Version}),
         libreoffice-dev (<< ${binary:Version}),
@@ -4276,7 +4264,6 @@ Section: gnome
 Enhances: libreoffice
 Replaces: libreoffice-gtk (<< 1:5.2.0~)
 Breaks: libreoffice-gtk (<< 1:5.2.0~)
-Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
 Description: office productivity suite -- GTK+ 2 integration
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.gtk2.in b/control.gtk2.in
index b415bc8..2a9c392 100644
--- a/control.gtk2.in
+++ b/control.gtk2.in
@@ -8,7 +8,6 @@ Section: gnome
 Enhances: libreoffice
 Replaces: libreoffice-gtk (<< 1:5.2.0~)
 Breaks: libreoffice-gtk (<< 1:5.2.0~)
-Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
 Description: office productivity suite -- GTK+ 2 integration
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index be0ec65..4d6a18a 100644
--- a/control.in
+++ b/control.in
@@ -5,21 +5,11 @@ Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>, Chris Halls <halls at debian.org>
 Build-Depends: %BUILD_DEPS%,
 Build-Depends-Indep: %BUILD_DEPS_INDEP%
-Build-Conflicts: flex (= 2.5.34-1) [amd64],
-                 g++-4.6 (= 4.6.1-10),
+Build-Conflicts: g++-4.6 (= 4.6.1-10),
                  g++-4.6 (= 4.6.1-11),
                  g++-4.7 (<< 4.7.1-3),
-                 gcj-4.2 (= 4.2.2-6),
-                 gjdoc (= 0.7.8-2),
-                 libboost1.39-dev (<< 1.39.0-2),
-                 libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
-                 libc6-dev (= 2.6.1-3) [i386 amd64],
-                 libc6-dev (= 2.6.1-4) [i386 amd64],
-                 libcairo2 (= 1.4.8-1),
-                 libxul-dev (= 1.8.0.13~pre070720-0etch1),
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
-                 qt3-dev-tools,
                  amd-libopencl1,
                  nvidia-libopencl1
 Standards-Version: 4.0.1
@@ -192,8 +182,6 @@ Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
         hunspell-sr (<< 1:3.1.0-3),
         hunspell-uz (<< 0.6-3.1),
         hunspell-vi (<< 1:3.1.0-3),
-        libcairo2 (= 1.4.8-1),
-        libicu38 (= 3.8~d01-1),
         libreoffice-base (<< ${binary:Version}),
         libreoffice-calc (<< ${binary:Version}),
         libreoffice-dev (<< ${binary:Version}),

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