[SCM] qtcreator packaging branch, master, updated. debian/3.3.0+dfsg-1-13-gfcb22e1

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 335b6949c5dc81eed2fb1e560d39bafa9b033b4c
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Jun 25 11:03:32 2015 -0500

    Temporarily disable QBS
    
    QBS is Debian is too old, and worse, it is not always clear which
    version of QBS is used by QtCreator. So temporarily disable QBS plugin
    until QtCreator builds with Debian's version again.
---
 debian/changelog                |  1 +
 debian/control                  |  2 +-
 debian/patches/series           |  1 +
 debian/patches/temp_disable_qbs | 19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9547bcc..64b4f4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtcreator (3.4.1+dfsg-1) UNRELEASED; urgency=medium
   [ Adam Majer ]
   * New upstream release
     + Refresh patches - only positional changes
+  * Temporarily disable QBS plugin
 
  -- Adam Majer <adamm at zombino.com>  Wed, 24 Jun 2015 23:01:01 -0500
 
diff --git a/debian/control b/debian/control
index 28066f4..fd3b897 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.3.4+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 b866d0b..b224696 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ botan_system_lib.diff
 always_autotect_qt_versions
 missing_header.diff
 fix_documentation_path.diff
+temp_disable_qbs
diff --git a/debian/patches/temp_disable_qbs b/debian/patches/temp_disable_qbs
new file mode 100644
index 0000000..db49407
--- /dev/null
+++ b/debian/patches/temp_disable_qbs
@@ -0,0 +1,19 @@
+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