[SCM] qtcreator packaging branch, master, updated. debian/3.4.1+dfsg-1-3-g0762c48

[Adam Majer]

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

The following commit has been merged in the master branch:
commit e31d5c6f4a1dbefcda3fd902c89a29f91ad1d744
Author: Adam Majer <adamm at zombino.com>
Date:   Sat Jul 25 22:47:20 2015 -0500

    Re-enable QBS plugin
---
 debian/changelog      | 4 ++--
 debian/control        | 2 +-
 debian/patches/series | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c20fb8..f19a181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qtcreator (3.4.1+dfsg-2) UNRELEASED; urgency=medium
 
-  *
-
+  [ Adam Majer ]
+  * Re-enable QBS plugin and bump its requirements (closes: #792035)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 25 Jul 2015 22:45:14 -0500
 
diff --git a/debian/control b/debian/control
index fd3b897..4c04cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
                libx11-dev,
                libxext-dev,
                pkg-config,
-#               qbs-dev (>= 1.3.4+dfsg~),
+               qbs-dev (>= 1.4.1+dfsg~),
                qml-module-qtquick2 (>= 5.3.2~),
                qtbase5-dev (>= 5.3.2+dfsg~),
                qtbase5-private-dev (>= 5.3.2+dfsg~),
diff --git a/debian/patches/series b/debian/patches/series
index b224696..b866d0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ botan_system_lib.diff
 always_autotect_qt_versions
 missing_header.diff
 fix_documentation_path.diff
-temp_disable_qbs

-- 
qtcreator packaging