[libreoffice] 01/01: remove obsolete libreoffice-gtk conflicts which makes -core Break: it with bin-NMUs; add (intended) -gtk2/-gtk3 ones...

[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 20145f5113704ce5261028c284ccfc5e26405754
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 13 01:42:27 2016 +0200

    remove obsolete libreoffice-gtk conflicts which makes -core Break: it with bin-NMUs; add (intended) -gtk2/-gtk3 ones...
    
    This reverts commit a5ef8ddd9b64d12ba9e38f20d67b3f850b0a0092. (which was
    incomplete anyway - missed control.in..)
---
 changelog  | 5 ++---
 control    | 4 +++-
 control.in | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 7da2f10..7788afb 100644
--- a/changelog
+++ b/changelog
@@ -21,9 +21,8 @@ libreoffice (1:5.2.1-2) UNRELEASED; urgency=medium
       + make libreoffice only Recommend the fonts. Mention it recommends
         extra stuff like fonts to resemble a upstream install, thanks
         Fabian Greffrath (closes: #836416)
-   - remove obsolete libreoffice-gtk conflicts which makes -core Break: it
-     with bin-NMUs...
-
+    - remove obsolete libreoffice-gtk conflicts which makes -core Break: it
+      with bin-NMUs; add (intended) -gtk2/-gtk3 ones...
   * merge from Ubuntu:
     - uno-libs: Create the libuno_* symlinks in the multiarch libdir
 
diff --git a/control b/control
index 11228cf..bc0ad68 100644
--- a/control
+++ b/control
@@ -189,7 +189,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 3.9.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs: mailto:debian-openoffice at lists.debian.org
+Bugs: 
 Homepage: http://www.libreoffice.org
 
 Package: libreoffice
@@ -375,6 +375,8 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         libreoffice-evolution (<< ${binary:Version}),
         libreoffice-evolution (<< 1:3.4.1~),
         libreoffice-gnome (<< ${binary:Version}),
+        libreoffice-gtk2 (<< ${binary:Version}),
+        libreoffice-gtk3 (<< ${binary:Version}),
         libreoffice-impress (<< ${binary:Version}),
         libreoffice-kab (<< 1:3.4.1~),
         libreoffice-kde (<< ${binary:Version}),
diff --git a/control.in b/control.in
index b3369de..3ca8e8c 100644
--- a/control.in
+++ b/control.in
@@ -212,7 +212,8 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         libreoffice-evolution (<< ${binary:Version}),
         libreoffice-evolution (<< 1:3.4.1~),
         libreoffice-gnome (<< ${binary:Version}),
-        libreoffice-gtk (<< ${binary:Version}),
+        libreoffice-gtk2 (<< ${binary:Version}),
+        libreoffice-gtk3 (<< ${binary:Version}),
         libreoffice-impress (<< ${binary:Version}),
         libreoffice-kab (<< 1:3.4.1~),
         libreoffice-kde (<< ${binary:Version}),

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