[SCM] qtcreator packaging branch, master, updated. debian/4.1.0-rc1-1-6-gd257db1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d257db1ebab6412ef9f4270916238f01e34a6c37
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 19 11:11:06 2016 -0300

    Import version 4.1.0-1 from packaging.
    
    Agreed with Adam due to some problems.
---
 debian/changelog                |  8 ++++++++
 debian/control                  |  1 +
 debian/patches/disable_qbs.diff | 19 -------------------
 debian/patches/series           |  1 -
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d342e4..6659e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtcreator (4.1.0-1) unstable; urgency=medium
+
+  [ Adam Majer ]
+  * New upstream version
+  * Re-enable QBS plugin
+
+ -- Adam Majer <adamm at zombino.com>  Thu, 08 Sep 2016 00:11:22 +0200
+
 qtcreator (4.1.0~rc1-1) experimental; urgency=medium
 
   [ Adam Majer ]
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

-- 
qtcreator packaging