[SCM] qtcreator packaging branch, master, updated. debian/4.1.0-4-5-gedaa719

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 85ca9ac718fea696a71a3c17ee494353c362088f
Author: Adam Majer <adamm at zombino.com>
Date:   Wed Sep 7 19:49:14 2016 +0200

    Re-enable QBS plugin
---
 debian/changelog                |  1 +
 debian/control                  |  1 +
 debian/patches/disable_qbs.diff | 19 -------------------
 debian/patches/series           |  1 -
 debian/patches/temp_disable_qbs | 19 -------------------
 5 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 824aaf0..89425f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtcreator (4.1.0-1) UNRELEASED; urgency=medium
 
   [ Adam Majer ]
   * New upstream version
+  * Re-enable QBS plugin
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Sep 2016 19:40:45 +0200
 
diff --git a/debian/control b/debian/control
index 2590603..857512a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9),
                libx11-dev,
                libxext-dev,
                pkg-config,
+               qbs-dev (>= 1.6.0~),
                qml-module-qtquick2 (>= 5.5.0~),
                qtbase5-dev (>= 5.5.0~),
                qtbase5-private-dev (>= 5.5.0~),
diff --git a/debian/patches/disable_qbs.diff b/debian/patches/disable_qbs.diff
deleted file mode 100644
index 324b136..0000000
--- a/debian/patches/disable_qbs.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: qtcreator/src/plugins/plugins.pro
-===================================================================
---- qtcreator.orig/src/plugins/plugins.pro
-+++ qtcreator/src/plugins/plugins.pro
-@@ -66,10 +66,10 @@ isEmpty(DO_NOT_BUILD_QMLDESIGNER) {
- }
- 
- 
--isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
--exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \
--    SUBDIRS += \
--        qbsprojectmanager
-+#isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
-+#exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \
-+#    SUBDIRS += \
-+#        qbsprojectmanager
- 
- # prefer qmake variable set on command line over env var
- isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
diff --git a/debian/patches/series b/debian/patches/series
index 9e36ac6..b9a9c6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ fix_qt_version_autodetection.diff
 missing_header.diff
 fix_documentation_path.diff
 remove_libexec.diff
-disable_qbs.diff
diff --git a/debian/patches/temp_disable_qbs b/debian/patches/temp_disable_qbs
deleted file mode 100644
index db49407..0000000
--- a/debian/patches/temp_disable_qbs
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: qtcreator/src/plugins/plugins.pro
-===================================================================
---- qtcreator.orig/src/plugins/plugins.pro	2015-05-29 03:23:25.000000000 -0500
-+++ qtcreator/src/plugins/plugins.pro	2015-06-25 10:54:21.731821230 -0500
-@@ -62,10 +62,10 @@
- }
- 
- 
--isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
--exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \
--    SUBDIRS += \
--        qbsprojectmanager
-+#isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
-+#exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \
-+#    SUBDIRS += \
-+#        qbsprojectmanager
- 
- # prefer qmake variable set on command line over env var
- isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)

-- 
qtcreator packaging