[SCM] qtcreator packaging branch, master, updated. 2f8d59a03b952b78cdde814d92060026edcdc2fc

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Wed May 22 22:18:43 UTC 2013


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

The following commit has been merged in the master branch:
commit 2f8d59a03b952b78cdde814d92060026edcdc2fc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 22 19:18:20 2013 -0300

    Use libqt5webkit5-dev, as we need the Qt5 version.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43828b8..8d45a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
     are now using the system botan.
   * Start using Qt5 to compile. Adapt B-Ds:
     - Use qtdeclarative5-private-dev, as described in the README.
+    - Use libqt5webkit5-dev, as we need the Qt5 version.
   * Export CFLAGS, CXXFLAGS, LDFLAGS for hardening and QT_SELECT to choose qt5.
   * Change Depends and Recommends of packages qtcreator and qtcreator-doc.
   * Update 02_use_x-terminal-emulator.diff. The changes seems to come from
diff --git a/debian/control b/debian/control
index 874d03f..28b679b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Uploaders: Adam Majer <adamm at zombino.com>,
 Build-Depends: debhelper (>= 9),
                qtbase5-dev (>= 5.0.2~),
                qtdeclarative5-private-dev,
+               libqt5webkit5-dev,
                libicu-dev,
-               libqtwebkit-dev (>= 2.1.0~2011week13-2),
                libbotan1.10-dev,
                pkg-config
 Standards-Version: 3.9.3

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list