[libreoffice] 02/02: remove libreoffice-report-builder-bin Conflicts from -core

[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 76a1c8c3f75a09d92300990c02670a81e79e23a9
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 10:23:25 2016 +0200

    remove libreoffice-report-builder-bin Conflicts from -core
---
 changelog  | 3 +++
 control    | 1 -
 control.in | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 5618f28..c29910b 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:5.2.1-2) UNRELEASED; urgency=medium
 
   * debian/rules: install typesizes.h into
     usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
+  * debian/control.in: remove
+    libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64] Conflicts:
+    from -core, thanks Jon Boden (closes: #836887)
 
   * merge from Ubuntu:
     - uno-libs: Create the libuno_* symlinks in the multiarch libdir
diff --git a/control b/control
index afdf251..d9fe230 100644
--- a/control
+++ b/control
@@ -420,7 +420,6 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         myspell-tl (<< 0.4-0-5)
 Conflicts: cacao-oj6-jre,
            libreoffice-filter-binfilter,
-           libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64],
            libreoffice-unbundled
 Provides: libreoffice-bundled
 Replaces: libreoffice-calc (<< 1:3.3.2-5),
diff --git a/control.in b/control.in
index 40630ad..237b1de 100644
--- a/control.in
+++ b/control.in
@@ -255,7 +255,7 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         myspell-sw (<< 1:3.1.0-3),
         myspell-th (<< 1:3.1.0-3),
         myspell-tl (<< 0.4-0-5)
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled, libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
+Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
 Provides: libreoffice-bundled
 Replaces: libreoffice-calc (<< 1:3.3.2-5),
           libreoffice-common (<< 1:4.4.0~rc3-1),

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