[SCM] qtcreator packaging branch, master, updated. debian/3.4.1+dfsg-2-6-ge3fe5a8

[Adam Majer]

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

The following commit has been merged in the master branch:
commit cdbc56611e46c21f7b25b26ed6c13661e8a99fdf
Author: Adam Majer <adamm at zombino.com>
Date:   Wed Aug 19 16:10:47 2015 -0500

    Remove obsolete version conflict statements
---
 debian/changelog | 4 +++-
 debian/control   | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e499cc4..29a3dfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,9 @@ qtcreator (3.5.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release
     + Added highlights to editor's vertical scrollbar, ala eclipse-style
     + Removed Qt Quick 1 support from Qt Quick Designer
-    + Bump build dependency to minumum of Qt 5.4
+  * debian/control:
+    + Bump build dependency to minumum of Qt 5.4, as per upstream.
+    + Remove conflict resolution statements related to Wheezy (oldstable)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 19 Aug 2015 15:58:02 -0500
 
diff --git a/debian/control b/debian/control
index cba7c68..639ef56 100644
--- a/debian/control
+++ b/debian/control
@@ -74,8 +74,6 @@ Description: lightweight integrated development environment (IDE) for Qt
 Package: qtcreator-data
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}
-Breaks: qtcreator (<< 2.8.0-1~)
-Replaces: qtcreator (<< 2.8.0-1~)
 Description: application data for Qt Creator IDE
  Qt Creator is a new, lightweight, cross-platform integrated development
  environment (IDE) designed to make development with the Qt application

-- 
qtcreator packaging