[SCM] qtcreator packaging branch, master, updated. debian/3.0.1+dfsg+exp-2

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d7452f0ddebf0cb9bde6348777fdad688bf998b6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Mar 1 18:58:22 2014 -0300

    Change Qt 4 deps, recs and/or suggs to their Qt 5 counterparts.
---
 debian/changelog |  2 ++
 debian/control   | 16 +++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1228574..7d95104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtcreator (3.0.1+dfsg+exp-1) UNRELEASED; urgency=medium
     - Switch to Qt 5 in debian/rules.
     - Remove Qt 4 build dependencies and add the necessary Qt 5 build
       dependencies.
+    - Change Qt 4 dependencies, recommendations or suggestions to their Qt 5
+      counterparts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Feb 2014 16:00:33 -0300
 
diff --git a/debian/control b/debian/control
index a660998..37ae306 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9),
                libjs-jquery,
                libqt5webkit5-dev (>= 5.2.1+dfsg~),
                libsqlite3-dev,
+               libx11-dev,
                libxslt1-dev,
                pkg-config,
                qtbase5-dev (>= 5.2.1+dfsg~),
@@ -23,7 +24,6 @@ Build-Depends: debhelper (>= 9),
                qttools5-dev (>= 5.2.1~),
                qttools5-dev-tools (>= 5.2.1~),
                qttools5-private-dev (>= 5.2.1~),
-               libx11-dev,
                qtxmlpatterns5-dev-tools (>= 5.2.1~)
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/wiki/Category:Tools::QtCreator
@@ -32,18 +32,20 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtcreator.git
 
 Package: qtcreator
 Architecture: any
-Depends: libqt4-sql-sqlite,
+Depends: libqt5sql5-sqlite,
          qtchooser,
          qtcreator-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: gdb,
             make,
-            qt4-demos,
-            qt4-dev-tools,
-            qt4-doc,
-            qt4-qmlviewer,
+            qt5-doc,
+            qtbase5-dev-tools,
             qtcreator-doc,
+            qtdeclarative5-dev-tools,
+            qtquick1-5-dev-tools,
+            qttools5-dev-tools,
+            qtxmlpatterns5-dev-tools,
             xterm | x-terminal-emulator
 Suggests: cmake, g++, git, kdelibs5-data, subversion
 Description: lightweight integrated development environment (IDE) for Qt
@@ -88,7 +90,7 @@ Package: qtcreator-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: qt4-dev-tools, qt4-doc
+Suggests: qt5-doc
 Description: documentation 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