[libreoffice] 02/02: add add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2) to -ogltrans

[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 de65cee6c7e4406833ec07109023db35ebe415c0
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 13 21:32:24 2016 +0100

    add add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2) to -ogltrans
---
 changelog           | 2 ++
 control             | 1 +
 control.ogltrans.in | 1 +
 3 files changed, 4 insertions(+)

diff --git a/changelog b/changelog
index 7a58fdc..0ec76a4 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:5.2.4~rc2-1) UNRELEASED; urgency=medium
 
   * debian/rules:
     - MYSQL_FLAVOUR=mysql on jessie-backports
+  * debian/control.ogltrans.in:
+    - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
 
  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:31:35 +0100
 
diff --git a/control b/control
index 44d5464..829bfb1 100644
--- a/control
+++ b/control
@@ -4262,6 +4262,7 @@ Depends: libreoffice-common,
          ${shlibs:Depends}
 Enhances: libreoffice-impress
 Breaks: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
 Description: LibreOffice Impress extension for slide transitions using OpenGL
  LibreOffice is a full-featured office productivity suite that provide
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.ogltrans.in b/control.ogltrans.in
index 3e4472c..8db6c77 100644
--- a/control.ogltrans.in
+++ b/control.ogltrans.in
@@ -10,6 +10,7 @@ Depends: libreoffice-common,
          ${shlibs:Depends}
 Enhances: libreoffice-impress
 Breaks: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
 Description: LibreOffice Impress extension for slide transitions using OpenGL
  LibreOffice is a full-featured office productivity suite that provide
  a near drop-in replacement for Microsoft(R) Office.

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