[SCM] qt3d packaging branch, ubuntu, updated. ubuntu/5.5.1-4ubuntu1-2-g07c718d

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=177ea4e

The following commit has been merged in the ubuntu branch:
commit 177ea4e82cc95853b2a35755f4c1b313e2771405
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Dec 7 16:55:02 2015 +0000

    libqt53dquick5: conflict+replace libqt53d5 which provided identically  named library.
---
 debian/changelog | 7 +++++++
 debian/control   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 524c3a0..22e199c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt3d-opensource-src (5.5.1-4ubuntu2) xenial; urgency=medium
+
+  * libqt53dquick5: conflict+replace libqt53d5 which provided identically 
+    named library.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 07 Dec 2015 16:52:54 +0000
+
 qt3d-opensource-src (5.5.1-4ubuntu1) xenial; urgency=medium
 
   * New upstream release of the rewritten Qt 3D 2.0.
diff --git a/debian/control b/debian/control
index 6ad9a65..5f19075 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt53dcore5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Replaces: libqt53d5
+Conflicts: libqt53d5
 Description: Qt 3D Quick module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
qt3d packaging